From 2e156406418d277dec34b0d847f729c0232f694a Mon Sep 17 00:00:00 2001 From: Timo Rothenpieler Date: Thu, 30 Jan 2025 01:39:20 +0100 Subject: [PATCH 1/4] Make tljh_extra_hub_pip_packages hook match pyproject.toml --- tljh_repo2docker/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tljh_repo2docker/__init__.py b/tljh_repo2docker/__init__.py index 481cc5e..921b262 100644 --- a/tljh_repo2docker/__init__.py +++ b/tljh_repo2docker/__init__.py @@ -182,7 +182,7 @@ def tljh_custom_jupyterhub_config(c): @hookimpl def tljh_extra_hub_pip_packages(): - return ["dockerspawner~=0.11", "jupyter_client>=6.1,<8", "aiodocker~=0.19"] + return ["dockerspawner~=12.1", "jupyter_client>=6.1,<8", "aiodocker~=0.19"] else: tljh_custom_jupyterhub_config = None From 9cd4d1dec4ba65f19234baefa483cacd59274f5b Mon Sep 17 00:00:00 2001 From: Timo Rothenpieler Date: Thu, 30 Jan 2025 19:48:42 +0100 Subject: [PATCH 2/4] Fix local build tests Docker Engine API renamed ContainerConfig to Config in v1.45 --- tljh_repo2docker/tests/local_build/test_builder.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tljh_repo2docker/tests/local_build/test_builder.py b/tljh_repo2docker/tests/local_build/test_builder.py index 5a7cf13..d504c66 100644 --- a/tljh_repo2docker/tests/local_build/test_builder.py +++ b/tljh_repo2docker/tests/local_build/test_builder.py @@ -10,8 +10,9 @@ async def test_add_environment(app, minimal_repo, image_name): r = await add_environment(app, repo=minimal_repo, name=name, ref=ref) assert r.status_code == 200 image = await wait_for_image(image_name=image_name) + config = image.get("ContainerConfig", image.get("Config", {})) assert ( - image["ContainerConfig"]["Labels"]["tljh_repo2docker.image_name"] == image_name + config["Labels"]["tljh_repo2docker.image_name"] == image_name ) @@ -41,9 +42,9 @@ async def test_uppercase_repo(app, minimal_repo_uppercase, generated_image_name) r = await add_environment(app, repo=minimal_repo_uppercase) assert r.status_code == 200 image = await wait_for_image(image_name=generated_image_name) + config = image.get("ContainerConfig", image.get("Config", {})) assert ( - image["ContainerConfig"]["Labels"]["tljh_repo2docker.image_name"] - == generated_image_name + config["Labels"]["tljh_repo2docker.image_name"] == generated_image_name ) From fecb4682314888dad0d83a148ea371b5b0468964 Mon Sep 17 00:00:00 2001 From: Timo Rothenpieler Date: Thu, 30 Jan 2025 19:56:52 +0100 Subject: [PATCH 3/4] Update workflow actions --- .github/workflows/build.yml | 20 ++++++++++---------- .github/workflows/check-release.yml | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 400b86d..0e83b4d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 @@ -31,7 +31,7 @@ jobs: python -m build . - name: Upload package - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: tljh_repo2docker-artifacts path: | @@ -47,7 +47,7 @@ jobs: - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: tljh_repo2docker-artifacts @@ -74,13 +74,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 - name: Download app package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: tljh_repo2docker-artifacts @@ -114,13 +114,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 - name: Download app package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: tljh_repo2docker-artifacts @@ -138,7 +138,7 @@ jobs: run: npm install - name: Set up browser cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ${{ github.workspace }}/pw-browsers @@ -155,9 +155,9 @@ jobs: - name: Upload Playwright Test report if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: tljh-playwright-tests + name: tljh-playwright-tests-${{ matrix.build-backend }} path: | ui-tests/local-test-results ui-tests/binderhub-test-results diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index e9080c9..b61bc9a 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 @@ -22,7 +22,7 @@ jobs: version_spec: next - name: Upload Distributions - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: tljh_repo2docker-releaser-dist-${{ github.run_number }} - path: .jupyter_releaser_checkout/dist \ No newline at end of file + path: .jupyter_releaser_checkout/dist From fcad428ca851d4b6dfe38468d4ca6be1130ef428 Mon Sep 17 00:00:00 2001 From: Timo Rothenpieler Date: Thu, 30 Jan 2025 21:08:26 +0100 Subject: [PATCH 4/4] Update tested Python versions --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e83b4d..6cee3a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,7 +70,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10'] + python-version: ['3.10', '3.11', '3.12', '3.13'] steps: - name: Checkout