diff --git a/.github/workflows/php2650-spring-tag.yml b/.github/workflows/php2650-spring-tag.yml index 0cfa0bbf..0267df0a 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 - PYTHON_VERSION: 3.9 + SQLITE: false + PYTHON_VERSION: 3.11 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..61a7bb62 100644 --- a/.github/workflows/php2650.yml +++ b/.github/workflows/php2650.yml @@ -11,17 +11,17 @@ on: env: CLASS: php2650 TARGET: r_julia - SQLITE: true - PYTHON_VERSION: 3.9 + SQLITE: false + PYTHON_VERSION: 3.11 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 }} @@ -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 diff --git a/requirements/classes/php2650/requirements.pip.txt b/requirements/classes/php2650/requirements.pip.txt index 43719b70..3caa5945 100644 --- a/requirements/classes/php2650/requirements.pip.txt +++ b/requirements/classes/php2650/requirements.pip.txt @@ -1,2 +1 @@ # add class-specific classes here: - diff --git a/requirements/classes/php2650/requirements.txt b/requirements/classes/php2650/requirements.txt index e2ae0ffc..ad20bf03 100644 --- a/requirements/classes/php2650/requirements.txt +++ b/requirements/classes/php2650/requirements.txt @@ -26,48 +26,52 @@ protobuf xlrd bottleneck 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-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-base=4.3.* +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 # required for environment and plugins ( DO NOT REMOVE THESE!!! ) ipython