Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make tljh_extra_hub_pip_packages hook match pyproject.toml #88

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Make tljh_extra_hub_pip_packages hook match pyproject.toml #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e15640
Make tljh_extra_hub_pip_packages hook match pyproject.toml
TimoRoth Jan 30, 2025
9cd4d1d
Fix local build tests
TimoRoth Jan 30, 2025
fecb468
Update workflow actions
TimoRoth Jan 30, 2025
fcad428
Update tested Python versions
TimoRoth Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand All @@ -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

Expand All @@ -70,17 +70,17 @@ 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
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

Expand Down Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
path: .jupyter_releaser_checkout/dist
2 changes: 1 addition & 1 deletion tljh_repo2docker/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions tljh_repo2docker/tests/local_build/test_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)


Expand Down Expand Up @@ -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
)


Expand Down