Merge pull request #1611 from consideRatio/pr/misc-updates

breaking: test and use Python 3.11 in Helm chart image, up from Python 3.9

Author: manics

.github/workflows/diff.yml

@@ -20,7 +20,7 @@ on:
 
 jobs:
   diff-rendered-templates:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
         with:
@@ -35,7 +35,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
 
       - name: Install helm diff plugin, update local chart dependencies
         run: |

.github/workflows/publish.yml

@@ -41,7 +41,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
 
       - name: Set up QEMU (for docker buildx)
         uses: docker/setup-qemu-action@v2
@@ -109,7 +109,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
       - name: Install pypa/build
         run: python -mpip install build
       - name: Build a sdist, and a binary wheel from the sdist

.github/workflows/test-docker-build.yaml

@@ -28,7 +28,7 @@ jobs:
   # - https://github.com/docker/build-push-action/blob/v2.3.0/docs/advanced/local-registry.md
   # - https://github.com/docker/build-push-action/blob/v2.3.0/docs/advanced/multi-platform.md
   build_images:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
         with:
@@ -38,7 +38,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
 
       - name: Install chartpress
         run: pip install chartpress

.github/workflows/test.yml

@@ -28,7 +28,7 @@ on:
 
 jobs:
   lint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
 
@@ -42,7 +42,7 @@ jobs:
   # in small things. Unfortunately there is no easy way to share steps between
   # jobs or have "template" jobs, so we use `if` conditions on steps
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 10
 
     permissions:
@@ -154,7 +154,7 @@ jobs:
       - uses: actions/setup-python@v4
         id: setup-python
         with:
-          python-version: "3.9"
+          python-version: "3.11"
 
       - name: Cache pip
         uses: actions/cache@v3
@@ -349,7 +349,7 @@ jobs:
         if: ${{ always() }}
 
   test-local:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 5
 
     permissions:

.github/workflows/watch-dependencies.yaml

@@ -19,7 +19,7 @@ jobs:
   update-image-dependencies:
     # Don't run this job on forks
     if: github.repository == 'jupyterhub/binderhub'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false

ci/refreeze

@@ -10,5 +10,5 @@ docker run --rm \
     --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 helm-chart/images/binderhub/requirements.in'

helm-chart/images/binderhub/Dockerfile

@@ -6,7 +6,7 @@
 #
 # NOTE: If the image version is updated, also update it in ci/refreeze!
 #
-FROM python:3.9-bullseye as build-stage
+FROM python:3.11-bullseye as build-stage
 WORKDIR /build-stage
 
 # install node as required to build a binderhub wheel
@@ -23,14 +23,14 @@ COPY . .
 RUN --mount=type=cache,target=${PIP_CACHE_DIR} \
     pip install build \
  && pip wheel \
-       . \
-       pycurl \
-       -r helm-chart/images/binderhub/requirements.txt
+        . \
+        pycurl \
+        -r helm-chart/images/binderhub/requirements.txt
 
 
 # The final stage
 # ---------------
-FROM python:3.9-slim-bullseye
+FROM python:3.11-slim-bullseye
 
 ENV PYTHONUNBUFFERED=1
 ENV DEBIAN_FRONTEND=noninteractive

helm-chart/images/binderhub/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
 # by the following command:
 #
 #    Use the "Run workflow" button at https://github.com/jupyterhub/binderhub/actions/workflows/watch-dependencies.yaml
@@ -66,8 +66,6 @@ grpcio-status==1.51.1
     # via google-api-core
 idna==3.4
     # via requests
-importlib-metadata==6.0.0
-    # via jupyterhub
 jinja2==3.1.2
     # via
     #   -r helm-chart/images/binderhub/../../../requirements.txt
@@ -156,14 +154,12 @@ rsa==4.9
     # via google-auth
 ruamel-yaml==0.17.21
     # via jupyter-telemetry
-ruamel-yaml-clib==0.2.7
-    # via ruamel-yaml
 six==1.16.0
     # via
     #   google-auth
     #   kubernetes
     #   python-dateutil
-sqlalchemy==1.4.45
+sqlalchemy==1.4.46
     # via
     #   alembic
     #   jupyterhub
@@ -185,8 +181,6 @@ websocket-client==1.4.2
     # via
     #   docker
     #   kubernetes
-zipp==3.11.0
-    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools