Skip to content

Commit 91b7bea

Browse files
authored
fix(jupyter-singleuser): hold down setuptools version so it stops breaking and deploy the next image to the testing slot (#3650)
1 parent 0e41a8e commit 91b7bea

File tree

5 files changed

+20
-193
lines changed

5 files changed

+20
-193
lines changed

images/jupyter-singleuser/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ RUN npm install -g --unsafe-perm=true --allow-root netlify-cli
3434
RUN npm install -g --unsafe-perm=true --allow-root sql-language-server
3535
# gcloud CLI https://cloud.google.com/sdk/docs/install#deb
3636
RUN cd $GCLOUD_HOME \
37-
&& curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-423.0.0-linux-x86_64.tar.gz \
38-
&& tar -zxvf google-cloud-cli-423.0.0-linux-x86_64.tar.gz \
37+
&& curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-506.0.0-linux-x86_64.tar.gz \
38+
&& tar -zxvf google-cloud-cli-506.0.0-linux-x86_64.tar.gz \
3939
&& ./google-cloud-sdk/install.sh
4040
ENV PATH="$GCLOUD_HOME/google-cloud-sdk/bin:$PATH"
4141

images/jupyter-singleuser/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ Take the package versions from the build file and document with the PR. Do a cl
1616

1717
```
1818
docker system prune -a #
19-
docker build . 2>&1 | tee build.log
19+
docker build -t envs-hurt . 2>&1 | tee build.log
2020
```
2121

22-
23-
```bash
24-
docker build -t ghcr.io/cal-itp/data-infra/jupyter-singleuser:[NEW VERSION TAG] .
22+
You can go into the docker image and do tests:
23+
```
24+
docker list
25+
docker exec -it upbeat_bhaskara /bin/bash
2526
```
26-
2727

2828
## Deploying Changes to Production
2929

images/jupyter-singleuser/poetry.lock

+8-181
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

images/jupyter-singleuser/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[tool.poetry]
22
name = "jupyter-singleuser"
3-
version = "2025.1.13"
3+
version = "2025.1.15"
44
description = ""
55
package-mode = false
6-
authors = ["Soren Spicknall <[email protected]>"]
6+
authors = ["Vevetron"]
77

88
[tool.poetry.dependencies]
99
python = "~3.11"
@@ -20,7 +20,6 @@ plotnine = ">=0.8.0"
2020
plotly = "5.5.0"
2121
folium = ">=0.12.1.post1"
2222
branca = "0.4.2"
23-
altair-saver = ">=0.5.0"
2423
vega = "3.5.0"
2524
pygeos = "0.14.0"
2625
Rtree = "0.9.7"
@@ -49,6 +48,7 @@ pendulum = "^2.1.2"
4948
calitp-data-analysis = "2024.12.6"
5049
calitp-map-utils = "2024.5.23"
5150
jupyter-server-proxy = "^4.1.1"
51+
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
5252

5353
[tool.poetry.group.dev.dependencies]
5454
pytest = "^7.2.0"

kubernetes/apps/charts/jupyterhub/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ jupyterhub:
3939
mem_limit: "12G"
4040
mem_guarantee: "10G"
4141
cpu_guarantee: 1.5
42-
- display_name: "Prototype Image 2025.1.13"
42+
- display_name: "Prototype Image 2025.1.15"
4343
description: "This is for testing the next image we will deploy."
4444
kubespawner_override:
45-
image: ghcr.io/cal-itp/data-infra/jupyter-singleuser:2025.1.13
45+
image: ghcr.io/cal-itp/data-infra/jupyter-singleuser:2025.1.15
4646
scheduling:
4747
userPods:
4848
nodeAffinity:

0 commit comments

Comments
 (0)