fix(jupyter-singleuser): hold down setuptools version so it stops bre…

…aking and deploy the next image to the testing slot (#3650)
cal-itp · Jan 15, 2025 · 91b7bea · 91b7bea
1 parent 0e41a8e
commit 91b7bea
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 193 deletions.
diff --git a/images/jupyter-singleuser/Dockerfile b/images/jupyter-singleuser/Dockerfile
@@ -34,8 +34,8 @@ RUN npm install -g --unsafe-perm=true --allow-root netlify-cli
 RUN npm install -g --unsafe-perm=true --allow-root sql-language-server
 # gcloud CLI https://cloud.google.com/sdk/docs/install#deb
 RUN cd $GCLOUD_HOME \
-    && curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-423.0.0-linux-x86_64.tar.gz \
-    && tar -zxvf google-cloud-cli-423.0.0-linux-x86_64.tar.gz \
+    && curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-506.0.0-linux-x86_64.tar.gz \
+    && tar -zxvf google-cloud-cli-506.0.0-linux-x86_64.tar.gz \
     && ./google-cloud-sdk/install.sh
 ENV PATH="$GCLOUD_HOME/google-cloud-sdk/bin:$PATH"
 

diff --git a/images/jupyter-singleuser/README.md b/images/jupyter-singleuser/README.md
@@ -16,14 +16,14 @@ Take the package versions from the build file and document with the PR.  Do a cl
 
 ```
 docker system prune -a #
-docker build . 2>&1 | tee build.log
+docker build  -t envs-hurt . 2>&1 | tee build.log
 ```
 
-
-```bash
-docker build -t ghcr.io/cal-itp/data-infra/jupyter-singleuser:[NEW VERSION TAG] .
+You can go into the docker image and do tests:
+```
+docker list
+docker exec -it upbeat_bhaskara /bin/bash
 ```
-
 
 ## Deploying Changes to Production
 

diff --git a/images/jupyter-singleuser/poetry.lock b/images/jupyter-singleuser/poetry.lock
diff --git a/images/jupyter-singleuser/pyproject.toml b/images/jupyter-singleuser/pyproject.toml
@@ -1,9 +1,9 @@
 [tool.poetry]
 name = "jupyter-singleuser"
-version = "2025.1.13"
+version = "2025.1.15"
 description = ""
 package-mode = false
-authors = ["Soren Spicknall <soren.s@jarv.us>"]
+authors = ["Vevetron"]
 
 [tool.poetry.dependencies]
 python = "~3.11"
@@ -20,7 +20,6 @@ plotnine = ">=0.8.0"
 plotly = "5.5.0"
 folium = ">=0.12.1.post1"
 branca = "0.4.2"
-altair-saver = ">=0.5.0"
 vega = "3.5.0"
 pygeos = "0.14.0"
 Rtree = "0.9.7"
@@ -49,6 +48,7 @@ pendulum = "^2.1.2"
 calitp-data-analysis = "2024.12.6"
 calitp-map-utils = "2024.5.23"
 jupyter-server-proxy = "^4.1.1"
+setuptools = "68.2.2" # For some reason, poetry/pip installs setuptools 75 then it starts to break.  Probably be a conda backports related issue.  Update later and test
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.2.0"

diff --git a/kubernetes/apps/charts/jupyterhub/values.yaml b/kubernetes/apps/charts/jupyterhub/values.yaml
@@ -39,10 +39,10 @@ jupyterhub:
           mem_limit: "12G"
           mem_guarantee: "10G"
           cpu_guarantee: 1.5
-      - display_name: "Prototype Image 2025.1.13"
+      - display_name: "Prototype Image 2025.1.15"
         description: "This is for testing the next image we will deploy."
         kubespawner_override:
-          image: ghcr.io/cal-itp/data-infra/jupyter-singleuser:2025.1.13
+          image: ghcr.io/cal-itp/data-infra/jupyter-singleuser:2025.1.15
   scheduling:
     userPods:
       nodeAffinity: