From d786b606ee817d9038d16a5c610b969cb2d0ba5e Mon Sep 17 00:00:00 2001
From: Derek Feichtinger <derek.feichtinger@psi.ch>
Date: Fri, 4 Oct 2024 22:35:30 +0200
Subject: [PATCH] build files for new miniconda base 2024.08

added 2 conda environments
- jupyterhub-4.1.6_lab4_py3.12
- datascience_2024_py3.12
---
 .../datascience_2024_py3.12.yml               | 29 +++++++++++++++++++
 .../jupyterhub-4.1.6_lab4_py3.12.yaml         | 28 ++++++++++++++++++
 Programming/anaconda/2024.08/config.sh        |  6 ++++
 Programming/anaconda/build                    | 28 +++---------------
 Programming/anaconda/files/config.yaml        | 15 ++++++++++
 5 files changed, 82 insertions(+), 24 deletions(-)
 create mode 100644 Programming/anaconda/2024.08/conda-env-defs/datascience_2024_py3.12/datascience_2024_py3.12.yml
 create mode 100644 Programming/anaconda/2024.08/conda-env-defs/jupyterhub-4.1.6_lab4_py3.12/jupyterhub-4.1.6_lab4_py3.12.yaml
 create mode 100644 Programming/anaconda/2024.08/config.sh
 create mode 100644 Programming/anaconda/files/config.yaml

diff --git a/Programming/anaconda/2024.08/conda-env-defs/datascience_2024_py3.12/datascience_2024_py3.12.yml b/Programming/anaconda/2024.08/conda-env-defs/datascience_2024_py3.12/datascience_2024_py3.12.yml
new file mode 100644
index 0000000..0172a3d
--- /dev/null
+++ b/Programming/anaconda/2024.08/conda-env-defs/datascience_2024_py3.12/datascience_2024_py3.12.yml
@@ -0,0 +1,29 @@
+# Clean environment based on pure conda-forge packages
+name: datascience_2024_py3.12
+channels:
+  - conda-forge
+dependencies:
+  - python=3.12
+  - pandas
+  - xlrd
+  - numpy
+  - scipy
+  - scikit-learn
+  - matplotlib
+  - seaborn
+  - tensorflow
+  - keras
+  - pytorch
+  - pytables
+  - ipython
+  # keras 2.1.6 not available from conda-forge for py37
+  #  - keras=2.1.6
+  - nb_conda_kernels
+  - ipywidgets
+  - plotly
+  - dask
+  - dask-jobqueue
+  - python-graphviz
+  - bayesian-optimization
+  - hdf5storage
+  
diff --git a/Programming/anaconda/2024.08/conda-env-defs/jupyterhub-4.1.6_lab4_py3.12/jupyterhub-4.1.6_lab4_py3.12.yaml b/Programming/anaconda/2024.08/conda-env-defs/jupyterhub-4.1.6_lab4_py3.12/jupyterhub-4.1.6_lab4_py3.12.yaml
new file mode 100644
index 0000000..65c2f56
--- /dev/null
+++ b/Programming/anaconda/2024.08/conda-env-defs/jupyterhub-4.1.6_lab4_py3.12/jupyterhub-4.1.6_lab4_py3.12.yaml
@@ -0,0 +1,28 @@
+name: jupyterhub-4.1.6_lab4_py3.12
+channels:
+  - conda-forge
+dependencies:
+  - python=3.12
+  - jupyterhub=4.1.6
+  - jupyterlab>4
+  - nb_conda
+  - nb_conda_kernels
+  - jupyter_contrib_nbextensions
+  - ipywidgets
+  - batchspawner
+  # - jupyter_server<2.11
+  # needed for widgets!
+  - ipympl
+  - pip
+  - jupytext
+  - jupyterlab-git
+  - git
+  - psycopg2
+  - plotly
+  - jupyterlab-plotly-extension
+  - flask
+  #  - sqlalchemy=1.4.39
+  ################# PIP packages
+  # - pip:
+  #  - git+https://github.com/jupyterhub/batchspawner.git@e89bf6a
+
diff --git a/Programming/anaconda/2024.08/config.sh b/Programming/anaconda/2024.08/config.sh
new file mode 100644
index 0000000..afc7cb6
--- /dev/null
+++ b/Programming/anaconda/2024.08/config.sh
@@ -0,0 +1,6 @@
+# version-specific settings
+
+# Miniconda version. Defaults to "latest"
+# Should match the version distributed with anaconda
+CONDA_VERSION="24.5.0-0"
+
diff --git a/Programming/anaconda/build b/Programming/anaconda/build
index 36832c4..8092711 100755
--- a/Programming/anaconda/build
+++ b/Programming/anaconda/build
@@ -1,30 +1,10 @@
 #!/usr/bin/env modbuild
 
-pbuild::add_to_group 'Programming'
+# pbuild::add_to_group 'Programming'
 
-
-source "${BUILDBLOCK_DIR}/${V_PKG}/config.sh"
-if [[ x"$CONDA_VERSION" == x ]]; then
-    echo "ERROR: CONDA_VERSION for this release has not been defined" >&2
-    exit 1
-fi
-
-MINICONDA_EXE="Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh"
-DOWNLOAD_URL="https://repo.anaconda.com/miniconda/$MINICONDA_EXE"
+MINICONDA_EXE="miniconda-${V_PKG}.sh"
 INSTALLER="$PMODULES_DISTFILESDIR/$MINICONDA_EXE"
 
-pbuild::pre_prep() {
-    # Need to implement own downloader since pbuild::set_download_url and pbuild::prep
-    # currently only support tar files
-    std::info "DEBUG: in function %s...\n" "$FUNCNAME: FUNCNAME=${FUNCNAME[*]}" 
-    if [[ -r "$INSTALLER" ]]; then
-	std::info "%s using previously downloaded %s\n"  \
-		  "${module_name}/${module_version}:" "$INSTALLER"
-    else
-	curl -fsSLo "$INSTALLER" "$DOWNLOAD_URL"
-    fi
-}
-
 pbuild::configure() {
     :
 }
@@ -35,9 +15,9 @@ pbuild::compile() {
 
 pbuild::install() {    
     # Install conda
-    bash "$INSTALLER" -b -p "$PREFIX/conda"
+    bash "$INSTALLER" -b -p "$PREFIX/conda" || std::die 3 "Error calling installer!"
 
     #echo "Installing PSI admintools for maintaining conda"
     std::info "%s Installing admintools ...\n" "${module_name}/${module_version}:"
-    cp -r  "${BUILDBLOCK_DIR}/files/admintools" "$PREFIX/admintools"
+    # cp -r  "${BUILDBLOCK_DIR}/files/admintools" "$PREFIX/admintools"
 }
diff --git a/Programming/anaconda/files/config.yaml b/Programming/anaconda/files/config.yaml
new file mode 100644
index 0000000..8784b66
--- /dev/null
+++ b/Programming/anaconda/files/config.yaml
@@ -0,0 +1,15 @@
+format: 1
+anaconda:
+  defaults:
+    group: Programming
+    overlay: base
+    relstage: stable
+
+  versions:
+    2024.08:
+      config:
+        urls:
+          - url: https://repo.anaconda.com/miniconda/Miniconda3-py39_24.5.0-0-Linux-x86_64.sh
+            name: miniconda-2024.08.sh
+            unpacker: none
+        relstage: unstable