From 6a87e52df5c57dc11ac8815f88b46d88a76b7d5e Mon Sep 17 00:00:00 2001 From: Prasad Bandarkar Date: Fri, 19 Jan 2024 09:01:33 -0500 Subject: [PATCH 01/11] Added new packages Spring 24 --- .github/workflows/php2650-spring-tag.yml | 18 +++++++++--------- .github/workflows/php2650.yml | 6 +++--- requirements/classes/php2650/requirements.txt | 3 +++ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/php2650-spring-tag.yml b/.github/workflows/php2650-spring-tag.yml index 0cfa0bbf..e3c80967 100644 --- a/.github/workflows/php2650-spring-tag.yml +++ b/.github/workflows/php2650-spring-tag.yml @@ -4,17 +4,17 @@ on: [workflow_dispatch] env: CLASS: php2650 TARGET: r_julia - SQLITE: true + SQLITE: false PYTHON_VERSION: 3.9 jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set Up GCloud - uses: google-github-actions/setup-gcloud@v0.6.0 + uses: google-github-actions/setup-gcloud@v0.6.2 with: project_id: ${{ secrets.GCP_PROJECT_ID_JH_DOCKER }} service_account_key: ${{ secrets.GCP_SA_KEY_JH_DOCKER }} @@ -28,8 +28,8 @@ jobs: - name: Upload Julia Env Files to Google Storage Bucket if: env.TARGET == 'r_julia' run: | - gsutil cp -r requirements/classes/php2650/julia_env gs://jupyterhub-environment-files/spring-2023/php2650/past/${GITHUB_SHA}/julia - gsutil cp -r requirements/classes/php2650/julia_env gs://jupyterhub-environment-files/spring-2023/php2650/latest/julia + gsutil cp -r requirements/classes/php2650/julia_env gs://jupyterhub-environment-files/spring-2024/php2650/past/${GITHUB_SHA}/julia + gsutil cp -r requirements/classes/php2650/julia_env gs://jupyterhub-environment-files/spring-2024/php2650/latest/julia - name: Configure Docker run: gcloud auth configure-docker @@ -40,13 +40,13 @@ jobs: docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/php2650:${GITHUB_REF##*/} docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/php2650:${GITHUB_SHA} docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/php2650:latest - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/php2650:spring-2023 + docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/php2650:spring-2024 docker push gcr.io/jupyterhub-docker-images/php2650:latest - docker push gcr.io/jupyterhub-docker-images/php2650:spring-2023 + docker push gcr.io/jupyterhub-docker-images/php2650:spring-2024 docker push gcr.io/jupyterhub-docker-images/php2650:${GITHUB_REF##*/} docker push gcr.io/jupyterhub-docker-images/php2650:${GITHUB_SHA} - name: Upload Conda Env Files to Google Storage Bucket run: | - gsutil cp -r requirements/out gs://jupyterhub-environment-files/spring-2023/php2650/past/${GITHUB_SHA}/conda - gsutil cp -r requirements/out gs://jupyterhub-environment-files/spring-2023/php2650/latest/conda \ No newline at end of file + gsutil cp -r requirements/out gs://jupyterhub-environment-files/spring-2024/php2650/past/${GITHUB_SHA}/conda + gsutil cp -r requirements/out gs://jupyterhub-environment-files/spring-2024/php2650/latest/conda \ No newline at end of file diff --git a/.github/workflows/php2650.yml b/.github/workflows/php2650.yml index 36d9be61..ca6f00a7 100644 --- a/.github/workflows/php2650.yml +++ b/.github/workflows/php2650.yml @@ -11,17 +11,17 @@ on: env: CLASS: php2650 TARGET: r_julia - SQLITE: true + SQLITE: false PYTHON_VERSION: 3.9 jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set Up GCloud - uses: google-github-actions/setup-gcloud@v0.6.0 + uses: google-github-actions/setup-gcloud@v0.6.2 with: project_id: ${{ secrets.GCP_PROJECT_ID_JH_DOCKER }} service_account_key: ${{ secrets.GCP_SA_KEY_JH_DOCKER }} diff --git a/requirements/classes/php2650/requirements.txt b/requirements/classes/php2650/requirements.txt index e2ae0ffc..4b0e323c 100644 --- a/requirements/classes/php2650/requirements.txt +++ b/requirements/classes/php2650/requirements.txt @@ -68,6 +68,9 @@ r-rtsne=0.* r-deriv=4.1* r-plotly=4.10* r-cluster=2.1* +r-xgboost +r-ranger +r-tensorflow # required for environment and plugins ( DO NOT REMOVE THESE!!! ) ipython From 5ddfbeb7e91b422a0ecf1ca9f40821319076f1a7 Mon Sep 17 00:00:00 2001 From: Prasad Bandarkar Date: Fri, 19 Jan 2024 15:55:29 -0500 Subject: [PATCH 02/11] Added tensorflow --- requirements/classes/php2650/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/classes/php2650/requirements.txt b/requirements/classes/php2650/requirements.txt index 4b0e323c..f60a8e2f 100644 --- a/requirements/classes/php2650/requirements.txt +++ b/requirements/classes/php2650/requirements.txt @@ -26,6 +26,7 @@ protobuf xlrd bottleneck pytables +tensorflow # these are the base r packages in the r-notebook image ( YOU PROBABLY WANT THESE IF YOUR TARGET IN DOCKER IS r_lang OR r_julia ) r-base=4.0.0 From 85b733eb5d250d7af71e83378624e7f820f34f0c Mon Sep 17 00:00:00 2001 From: Prasad Bandarkar Date: Mon, 22 Jan 2024 14:56:27 -0500 Subject: [PATCH 03/11] using pip to install tensorflow --- requirements/classes/php2650/requirements.pip.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/classes/php2650/requirements.pip.txt b/requirements/classes/php2650/requirements.pip.txt index 43719b70..fa33bf28 100644 --- a/requirements/classes/php2650/requirements.pip.txt +++ b/requirements/classes/php2650/requirements.pip.txt @@ -1,2 +1,2 @@ # add class-specific classes here: - +tensorflow==2.9.3 From 3605f43a430431fe56867421456becc9733f0682 Mon Sep 17 00:00:00 2001 From: Prasad Bandarkar Date: Mon, 22 Jan 2024 15:50:35 -0500 Subject: [PATCH 04/11] Removing caching --- .github/workflows/php2650.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/php2650.yml b/.github/workflows/php2650.yml index ca6f00a7..6e14e4ae 100644 --- a/.github/workflows/php2650.yml +++ b/.github/workflows/php2650.yml @@ -34,9 +34,9 @@ jobs: - name: Configure Docker run: gcloud auth configure-docker - - uses: satackey/action-docker-layer-caching@v0.0.11 +# - uses: satackey/action-docker-layer-caching@v0.0.11 # Ignore the failure of a step and avoid terminating the job. - continue-on-error: true +# continue-on-error: true - name: Build and Push JH Image run: | COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image From 97c1f4f967ac82d6050ee805a00582fa4941980e Mon Sep 17 00:00:00 2001 From: Prasad Bandarkar Date: Mon, 22 Jan 2024 16:17:00 -0500 Subject: [PATCH 05/11] Upgrading python version --- .github/workflows/php2650-spring-tag.yml | 2 +- .github/workflows/php2650.yml | 2 +- requirements/classes/php2650/requirements.pip.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/php2650-spring-tag.yml b/.github/workflows/php2650-spring-tag.yml index e3c80967..0267df0a 100644 --- a/.github/workflows/php2650-spring-tag.yml +++ b/.github/workflows/php2650-spring-tag.yml @@ -5,7 +5,7 @@ env: CLASS: php2650 TARGET: r_julia SQLITE: false - PYTHON_VERSION: 3.9 + PYTHON_VERSION: 3.11 jobs: build: diff --git a/.github/workflows/php2650.yml b/.github/workflows/php2650.yml index 6e14e4ae..61a7bb62 100644 --- a/.github/workflows/php2650.yml +++ b/.github/workflows/php2650.yml @@ -12,7 +12,7 @@ env: CLASS: php2650 TARGET: r_julia SQLITE: false - PYTHON_VERSION: 3.9 + PYTHON_VERSION: 3.11 jobs: build: diff --git a/requirements/classes/php2650/requirements.pip.txt b/requirements/classes/php2650/requirements.pip.txt index fa33bf28..3caa5945 100644 --- a/requirements/classes/php2650/requirements.pip.txt +++ b/requirements/classes/php2650/requirements.pip.txt @@ -1,2 +1 @@ # add class-specific classes here: -tensorflow==2.9.3 From e092981755ca9b5a1acfff3207664b7c62aa45be Mon Sep 17 00:00:00 2001 From: Prasad Bandarkar Date: Mon, 22 Jan 2024 16:40:06 -0500 Subject: [PATCH 06/11] tensorflow-cpu --- requirements/classes/php2650/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/classes/php2650/requirements.txt b/requirements/classes/php2650/requirements.txt index f60a8e2f..1df978aa 100644 --- a/requirements/classes/php2650/requirements.txt +++ b/requirements/classes/php2650/requirements.txt @@ -26,7 +26,7 @@ protobuf xlrd bottleneck pytables -tensorflow +tensorflow-cpu # these are the base r packages in the r-notebook image ( YOU PROBABLY WANT THESE IF YOUR TARGET IN DOCKER IS r_lang OR r_julia ) r-base=4.0.0 From fe6f383da6fd23045c267aceb8449912f1ea2bb4 Mon Sep 17 00:00:00 2001 From: Prasad Bandarkar Date: Mon, 22 Jan 2024 17:13:18 -0500 Subject: [PATCH 07/11] python=3.10 target=r_lang --- .github/workflows/php2650-spring-tag.yml | 4 ++-- .github/workflows/php2650.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/php2650-spring-tag.yml b/.github/workflows/php2650-spring-tag.yml index 0267df0a..cf54e73c 100644 --- a/.github/workflows/php2650-spring-tag.yml +++ b/.github/workflows/php2650-spring-tag.yml @@ -3,9 +3,9 @@ on: [workflow_dispatch] env: CLASS: php2650 - TARGET: r_julia + TARGET: r_lang SQLITE: false - PYTHON_VERSION: 3.11 + PYTHON_VERSION: 3.10 jobs: build: diff --git a/.github/workflows/php2650.yml b/.github/workflows/php2650.yml index 61a7bb62..2484ad8f 100644 --- a/.github/workflows/php2650.yml +++ b/.github/workflows/php2650.yml @@ -10,9 +10,9 @@ on: env: CLASS: php2650 - TARGET: r_julia + TARGET: r_lang SQLITE: false - PYTHON_VERSION: 3.11 + PYTHON_VERSION: 3.10 jobs: build: From 6c64cf28feaac8b39d94efa35ba5d9cb90f6a1ac Mon Sep 17 00:00:00 2001 From: Prasad Bandarkar Date: Mon, 22 Jan 2024 17:20:04 -0500 Subject: [PATCH 08/11] Fixed typo --- .github/workflows/php2650-spring-tag.yml | 2 +- .github/workflows/php2650.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/php2650-spring-tag.yml b/.github/workflows/php2650-spring-tag.yml index cf54e73c..145196e9 100644 --- a/.github/workflows/php2650-spring-tag.yml +++ b/.github/workflows/php2650-spring-tag.yml @@ -5,7 +5,7 @@ env: CLASS: php2650 TARGET: r_lang SQLITE: false - PYTHON_VERSION: 3.10 + PYTHON_VERSION: "3.10.*" jobs: build: diff --git a/.github/workflows/php2650.yml b/.github/workflows/php2650.yml index 2484ad8f..4c7101a3 100644 --- a/.github/workflows/php2650.yml +++ b/.github/workflows/php2650.yml @@ -12,7 +12,7 @@ env: CLASS: php2650 TARGET: r_lang SQLITE: false - PYTHON_VERSION: 3.10 + PYTHON_VERSION: "3.10.*" jobs: build: From 17c0194fa52af90828cf7aa8167a5994b2d81cf9 Mon Sep 17 00:00:00 2001 From: Prasad Bandarkar Date: Mon, 22 Jan 2024 17:36:17 -0500 Subject: [PATCH 09/11] R=4.3 Python=3.11 --- .github/workflows/php2650-spring-tag.yml | 2 +- .github/workflows/php2650.yml | 2 +- requirements/classes/php2650/requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/php2650-spring-tag.yml b/.github/workflows/php2650-spring-tag.yml index 145196e9..84f950c3 100644 --- a/.github/workflows/php2650-spring-tag.yml +++ b/.github/workflows/php2650-spring-tag.yml @@ -5,7 +5,7 @@ env: CLASS: php2650 TARGET: r_lang SQLITE: false - PYTHON_VERSION: "3.10.*" + PYTHON_VERSION: 3.11 jobs: build: diff --git a/.github/workflows/php2650.yml b/.github/workflows/php2650.yml index 4c7101a3..f2d4fb81 100644 --- a/.github/workflows/php2650.yml +++ b/.github/workflows/php2650.yml @@ -12,7 +12,7 @@ env: CLASS: php2650 TARGET: r_lang SQLITE: false - PYTHON_VERSION: "3.10.*" + PYTHON_VERSION: 3.11 jobs: build: diff --git a/requirements/classes/php2650/requirements.txt b/requirements/classes/php2650/requirements.txt index 1df978aa..2371be26 100644 --- a/requirements/classes/php2650/requirements.txt +++ b/requirements/classes/php2650/requirements.txt @@ -29,7 +29,7 @@ pytables tensorflow-cpu # these are the base r packages in the r-notebook image ( YOU PROBABLY WANT THESE IF YOUR TARGET IN DOCKER IS r_lang OR r_julia ) -r-base=4.0.0 +r-base=4.3.* r-caret=6.* r-crayon=1.3* r-devtools=2.3* From 5fa581e841573cd465b586f19e213cfcc1ce6bd3 Mon Sep 17 00:00:00 2001 From: Prasad Bandarkar Date: Mon, 22 Jan 2024 20:40:23 -0500 Subject: [PATCH 10/11] No version numbers for R packages --- requirements/classes/php2650/requirements.txt | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/requirements/classes/php2650/requirements.txt b/requirements/classes/php2650/requirements.txt index 2371be26..ad20bf03 100644 --- a/requirements/classes/php2650/requirements.txt +++ b/requirements/classes/php2650/requirements.txt @@ -30,45 +30,45 @@ tensorflow-cpu # these are the base r packages in the r-notebook image ( YOU PROBABLY WANT THESE IF YOUR TARGET IN DOCKER IS r_lang OR r_julia ) r-base=4.3.* -r-caret=6.* -r-crayon=1.3* -r-devtools=2.3* -r-forecast=8.12* -r-hexbin=1.28* -r-htmltools=0.4* -r-htmlwidgets=1.5* -r-irkernel=1.1* -r-nycflights13=1.0* -r-randomforest=4.6* -r-rcurl=1.98* -r-rmarkdown=2.2* -r-rodbc=1.3* -r-rsqlite=2.2* -r-shiny=1.4* -r-tidyverse=1.3* -unixodbc=2.3.* -r-tidymodels=0.1* -r-leaflet=2.0* -r-microbenchmark=1.4* -r-foreach=1.5* -r-doParallel=1.0* -r-kernlab=0.9* -r-e1071=1.7* -r-pROC=1.18* -r-tree=1.0* -r-rpart=4.1* -r-caret=6.0* -r-doMC=1.3* -r-randomForest=4.6* -r-gbm=2.1* -r-Metrics=0.1* -r-keras=2.7 -r-tfdatasets=2.7* -r-arules=1.7* -r-rtsne=0.* -r-deriv=4.1* -r-plotly=4.10* -r-cluster=2.1* +r-caret +r-crayon +r-devtools +r-forecast +r-hexbin +r-htmltools +r-htmlwidgets +r-irkernel +r-nycflights13 +r-randomforest +r-rcurl +r-rmarkdown +r-rodbc +r-rsqlite +r-shiny +r-tidyverse +unixodbc +r-tidymodels +r-leaflet +r-microbenchmark +r-foreach +r-doParallel +r-kernlab +r-e1071 +r-pROC +r-tree +r-rpart +r-caret +r-doMC +r-randomForest +r-gbm +r-Metrics +r-keras +r-tfdatasets +r-arules +r-rtsne +r-deriv +r-plotly +r-cluster r-xgboost r-ranger r-tensorflow From be54c430233ffa2fc15743a10206c2f5b546940a Mon Sep 17 00:00:00 2001 From: Prasad Bandarkar Date: Mon, 22 Jan 2024 20:54:33 -0500 Subject: [PATCH 11/11] change target --- .github/workflows/php2650-spring-tag.yml | 2 +- .github/workflows/php2650.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/php2650-spring-tag.yml b/.github/workflows/php2650-spring-tag.yml index 84f950c3..0267df0a 100644 --- a/.github/workflows/php2650-spring-tag.yml +++ b/.github/workflows/php2650-spring-tag.yml @@ -3,7 +3,7 @@ on: [workflow_dispatch] env: CLASS: php2650 - TARGET: r_lang + TARGET: r_julia SQLITE: false PYTHON_VERSION: 3.11 diff --git a/.github/workflows/php2650.yml b/.github/workflows/php2650.yml index f2d4fb81..61a7bb62 100644 --- a/.github/workflows/php2650.yml +++ b/.github/workflows/php2650.yml @@ -10,7 +10,7 @@ on: env: CLASS: php2650 - TARGET: r_lang + TARGET: r_julia SQLITE: false PYTHON_VERSION: 3.11