Merge branch 'main' into pr/update-pycurl-requirement-handling

.github/dependabot.yaml

@@ -9,10 +9,9 @@ version: 2
 updates:
   # Maintain dependencies in our GitHub Workflows
   - package-ecosystem: github-actions
-    directory: "/" # This should be / rather than .github/workflows
+    directory: /
+    labels: [ci]
     schedule:
-      interval: weekly
+      interval: monthly
       time: "05:00"
-      timezone: "Etc/UTC"
-    labels:
-      - dependencies
+      timezone: Etc/UTC

.github/workflows/test.yml

@@ -138,7 +138,7 @@ jobs:
       - uses: actions/setup-node@v3
         id: setup-node
         with:
-          node-version: "16"
+          node-version: "18"
 
       - name: Cache npm
         uses: actions/cache@v3
@@ -382,7 +382,7 @@ jobs:
       - uses: actions/setup-node@v3
         id: setup-node
         with:
-          node-version: "16"
+          node-version: "18"
 
       - name: Cache npm
         uses: actions/cache@v3
@@ -393,7 +393,7 @@ jobs:
       - uses: actions/setup-python@v4
         id: setup-python
         with:
-          python-version: "3.10"
+          python-version: "3.11"
 
       - name: Cache pip
         uses: actions/cache@v3

.github/workflows/watch-dependencies.yaml

@@ -79,7 +79,7 @@ jobs:
       # ref: https://github.com/peter-evans/create-pull-request
       - name: Create a PR
         if: steps.local.outputs.tag != steps.latest.outputs.tag
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
         with:
           token: "${{ secrets.jupyterhub_bot_pat }}"
           author: JupterHub Bot Account <105740858+jupyterhub-bot@users.noreply.github.com>
@@ -111,7 +111,7 @@ jobs:
 
       # ref: https://github.com/peter-evans/create-pull-request
       - name: Create a PR
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
         with:
           token: "${{ secrets.jupyterhub_bot_pat }}"
           author: JupyterHub Bot Account <105740858+jupyterhub-bot@users.noreply.github.com>

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
 
   # Autoformat: Python code
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 23.3.0
     hooks:
       - id: black
         # args are not passed, but see the config in pyproject.toml

.readthedocs.yaml

@@ -10,7 +10,7 @@ sphinx:
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.10"
+    python: "3.11"
 
 python:
   install:

helm-chart/binderhub/files/binderhub_config.py

@@ -55,6 +55,8 @@ def get_value(key, default=None):
         c.BinderHub.build_docker_host = f"unix://{hostSocketDir}/{socketname}.sock"
 
 if c.BinderHub.auth_enabled:
+    if "hub_url" not in c.BinderHub:
+        c.BinderHub.hub_url = ""
     hub_url = urlparse(c.BinderHub.hub_url)
     c.HubOAuth.hub_host = f"{hub_url.scheme}://{hub_url.netloc}"
     if "base_url" in c.BinderHub:

helm-chart/images/binderhub/Dockerfile

@@ -11,7 +11,7 @@
 FROM python:3.11-bullseye as build-stage
 
 # install node as required to build a binderhub wheel
-RUN echo "deb https://deb.nodesource.com/node_16.x bullseye main" > /etc/apt/sources.list.d/nodesource.list \
+RUN echo "deb https://deb.nodesource.com/node_18.x bullseye main" > /etc/apt/sources.list.d/nodesource.list \
  && curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
 RUN apt-get update \
  && apt-get install --yes \

helm-chart/images/binderhub/requirements.txt

@@ -4,7 +4,7 @@
 #
 #    Use the "Run workflow" button at https://github.com/jupyterhub/binderhub/actions/workflows/watch-dependencies.yaml
 #
-alembic==1.10.2
+alembic==1.10.3
     # via jupyterhub
 async-generator==1.10
     # via jupyterhub
@@ -22,7 +22,7 @@ cffi==1.15.1
     # via cryptography
 charset-normalizer==3.1.0
     # via requests
-cryptography==40.0.0
+cryptography==40.0.1
     # via pyopenssl
 docker==6.0.1
     # via -r helm-chart/images/binderhub/../../../requirements.txt
@@ -33,7 +33,7 @@ google-api-core[grpc]==2.11.0
     #   google-cloud-appengine-logging
     #   google-cloud-core
     #   google-cloud-logging
-google-auth==2.16.3
+google-auth==2.17.2
     # via
     #   google-api-core
     #   google-cloud-core
@@ -56,13 +56,13 @@ greenlet==2.0.2
     # via sqlalchemy
 grpc-google-iam-v1==0.12.6
     # via google-cloud-logging
-grpcio==1.51.3
+grpcio==1.53.0
     # via
     #   google-api-core
     #   googleapis-common-protos
     #   grpc-google-iam-v1
     #   grpcio-status
-grpcio-status==1.51.3
+grpcio-status==1.53.0
     # via google-api-core
 idna==3.4
     # via requests
@@ -130,7 +130,7 @@ pycurl==7.45.2
     # via -r helm-chart/images/binderhub/requirements.in
 pyjwt==2.6.0
     # via -r helm-chart/images/binderhub/../../../requirements.txt
-pyopenssl==23.1.0
+pyopenssl==23.1.1
     # via certipy
 pyrsistent==0.19.3
     # via jsonschema
@@ -162,7 +162,7 @@ six==1.16.0
     #   google-auth
     #   kubernetes
     #   python-dateutil
-sqlalchemy==2.0.7
+sqlalchemy==2.0.9
     # via
     #   alembic
     #   jupyterhub