Merge pull request #2919 from jupyterhub/yuvipanda-patch-1

Upgrade from python 3.9 to 3.11 in hub and singleuser-sample for performance
jupyterhub · Nov 9, 2022 · 06cc6ef · 06cc6ef
2 parents 16d7e09 + 2c9ae27
commit 06cc6ef
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 35 deletions.
diff --git a/.github/workflows/test-chart.yaml b/.github/workflows/test-chart.yaml
@@ -28,12 +28,12 @@ on:
 
 jobs:
   lint_shell_scripts:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
 
       - name: Install dependencies
         run: pip install pre-commit
@@ -42,12 +42,12 @@ jobs:
         run: pre-commit run --all --config .pre-commit-config-shellcheck.yaml
 
   lint_and_validate_rendered_templates:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
 
       - name: Install dependencies
         run: pip install chartpress yamllint
@@ -60,7 +60,7 @@ jobs:
         continue-on-error: true
 
   lint_and_validate_templates_with_schema:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false
@@ -80,7 +80,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
 
       - name: Install dependencies
         run: |
@@ -114,7 +114,7 @@ jobs:
         continue-on-error: true
 
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
 
     strategy:
@@ -235,7 +235,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
 
       # Install a local ACME server to fill the role of Let's Encrypt (LE). We
       # do this as the HTTP challenge sent out by an ACME server must be able to

diff --git a/.github/workflows/test-docker-build.yaml b/.github/workflows/test-docker-build.yaml
@@ -39,7 +39,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
 
       - name: Install chartpress
         run: pip install chartpress

diff --git a/.github/workflows/test-docs.yaml b/.github/workflows/test-docs.yaml
@@ -34,7 +34,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
 
       - name: Install deps
         run: pip install -r docs/requirements.txt

diff --git a/.github/workflows/vuln-scan.yaml b/.github/workflows/vuln-scan.yaml
@@ -59,7 +59,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
 
       - name: Install chartpress
         run: |

diff --git a/.github/workflows/watch-dependencies.yaml b/.github/workflows/watch-dependencies.yaml
@@ -137,7 +137,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
 
       - name: Install Python dependencies
         run: pip install packaging requests

diff --git a/ci/refreeze b/ci/refreeze
@@ -13,7 +13,7 @@ for img in ${IMAGES}; do
         --volume="$PWD:/io" \
         --workdir=/io \
         --user=root \
-        python:3.9-bullseye \
+        python:3.11-bullseye \
         sh -c 'pip install pip-tools==6.* && pip-compile --upgrade'
     popd
 done
diff --git a/images/hub/Dockerfile b/images/hub/Dockerfile
@@ -7,7 +7,7 @@
 # This stage is building Python wheels for use in later stages by using a base
 # image that has more pre-requisites to do so, such as a C++ compiler.
 #
-FROM python:3.9-bullseye as build-stage
+FROM python:3.11-bullseye as build-stage
 
 # Build wheels
 #
@@ -32,7 +32,7 @@ RUN --mount=type=cache,target=${PIP_CACHE_DIR} \
 # This stage is built and published as jupyterhub/k8s-hub-slim. It is meant to
 # provide no non-essential packages.
 #
-FROM python:3.9-slim-bullseye as slim-stage
+FROM python:3.11-slim-bullseye as slim-stage
 ENV DEBIAN_FRONTEND=noninteractive
 
 ARG NB_USER=jovyan \

diff --git a/images/hub/requirements.txt b/images/hub/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile with python 3.11
 # To update, run:
 #
 #    Use the "Run workflow" button at https://github.com/jupyterhub/zero-to-jupyterhub-k8s/actions/workflows/watch-dependencies.yaml
@@ -50,8 +50,6 @@ idna==3.4
     # via
     #   requests
     #   yarl
-importlib-metadata==5.0.0
-    # via jupyterhub
 jinja2==3.1.2
     # via
     #   jupyterhub
@@ -167,8 +165,6 @@ ruamel-yaml==0.17.21
     # via
     #   jupyter-telemetry
     #   oauthenticator
-ruamel-yaml-clib==0.2.7
-    # via ruamel-yaml
 six==1.16.0
     # via
     #   kubernetes-asyncio
@@ -203,8 +199,6 @@ urllib3==1.26.12
     #   requests
 yarl==1.8.1
     # via aiohttp
-zipp==3.10.0
-    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/images/secret-sync/Dockerfile b/images/secret-sync/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9-alpine
+FROM python:3.11-alpine
 
 # VULN_SCAN_TIME=2022-10-10_06:01:28
 

diff --git a/images/singleuser-sample/Dockerfile b/images/singleuser-sample/Dockerfile
@@ -7,7 +7,7 @@
 # This stage is building Python wheels for use in later stages by using a base
 # image that has more pre-requisites to do so, such as a C++ compiler.
 #
-FROM python:3.9-bullseye as build-stage
+FROM python:3.11-bullseye as build-stage
 
 # Build wheels
 #
@@ -26,7 +26,7 @@ RUN --mount=type=cache,target=${PIP_CACHE_DIR} \
 # The final stage
 # ---------------
 #
-FROM python:3.9-slim-bullseye
+FROM python:3.11-slim-bullseye
 ENV DEBIAN_FRONTEND=noninteractive
 
 ENV NB_USER=jovyan \

diff --git a/images/singleuser-sample/requirements.txt b/images/singleuser-sample/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile with python 3.11
 # To update, run:
 #
 #    Use the "Run workflow" button at https://github.com/jupyterhub/zero-to-jupyterhub-k8s/actions/workflows/watch-dependencies.yaml
@@ -59,11 +59,6 @@ idna==3.4
     # via
     #   anyio
     #   requests
-importlib-metadata==5.0.0
-    # via
-    #   jupyterhub
-    #   jupyterlab-server
-    #   nbconvert
 ipykernel==6.17.0
     # via
     #   nbclassic
@@ -251,8 +246,6 @@ retrolab==0.3.21
     # via -r requirements.in
 ruamel-yaml==0.17.21
     # via jupyter-telemetry
-ruamel-yaml-clib==0.2.7
-    # via ruamel-yaml
 send2trash==1.8.0
     # via
     #   jupyter-server
@@ -319,5 +312,3 @@ webencodings==0.5.1
     #   tinycss2
 websocket-client==1.4.2
     # via jupyter-server
-zipp==3.10.0
-    # via importlib-metadata