diff --git a/.github/actions/build-dist/action.yml b/.github/actions/build-dist/action.yml index 4747b69545..3b840d621a 100644 --- a/.github/actions/build-dist/action.yml +++ b/.github/actions/build-dist/action.yml @@ -1,5 +1,7 @@ name: 'Build Jupyter Notebook' + description: 'Build Jupyter Notebook from source' + runs: using: 'composite' steps: @@ -9,7 +11,7 @@ runs: - name: Install dependencies shell: bash run: | - python -m pip install hatch + python -m pip install hatch "click<8.3.0" - name: Build pypi distributions shell: bash diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 127476bc59..f90f6ab50f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,6 +46,9 @@ jobs: - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + - name: Pin click to avoid 8.3.0 issues + run: pipx inject --force hatch "click<8.3.0" + - name: Test the package run: hatch run cov:test @@ -79,6 +82,8 @@ jobs: steps: - uses: actions/checkout@v5 - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + - name: Pin click to avoid 8.3.0 issues + run: pipx inject --force hatch "click<8.3.0" - run: | sudo apt-get update sudo apt install enchant-2 # for spelling @@ -97,6 +102,8 @@ jobs: with: dependency_type: minimum python_version: '3.10' + - name: Pin click to avoid 8.3.0 issues + run: pipx inject --force hatch "click<8.3.0" - name: Run the unit tests run: | hatch run test:nowarn || hatch run test:nowarn --lf @@ -110,6 +117,8 @@ jobs: - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 with: dependency_type: pre + - name: Pin click to avoid 8.3.0 issues + run: pipx inject --force hatch "click<8.3.0" - name: Run the tests run: | hatch run test:nowarn || hatch run test:nowarn --lf @@ -172,6 +181,8 @@ jobs: steps: - uses: actions/checkout@v5 - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + - name: Pin click to avoid 8.3.0 issues + run: pipx inject --force hatch "click<8.3.0" - uses: jupyterlab/maintainer-tools/.github/actions/check-links@v1 with: ignore_links: 'https://playwright.dev/docs/test-cli/ https://blog.jupyter.org/the-big-split-9d7b88a031a7 https://blog.jupyter.org/jupyter-ascending-1bf5b362d97e https://mybinder.org/v2/gh/jupyter/notebook/main https://nbviewer.jupyter.org https://stackoverflow.com https://github.com/[^/]+/?$' @@ -183,6 +194,8 @@ jobs: steps: - uses: actions/checkout@v5 - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + - name: Pin click to avoid 8.3.0 issues + run: pipx inject --force hatch "click<8.3.0" - name: Run Linters run: | hatch run typing:test diff --git a/.github/workflows/buildutils.yml b/.github/workflows/buildutils.yml index 7ef303d024..87d6b7c8de 100644 --- a/.github/workflows/buildutils.yml +++ b/.github/workflows/buildutils.yml @@ -16,6 +16,7 @@ concurrency: permissions: contents: read + jobs: versioning: runs-on: ubuntu-latest @@ -27,9 +28,12 @@ jobs: - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + - name: Pin click to avoid 8.3.0 issues + run: pipx inject --force hatch "click<8.3.0" + - name: Install dependencies run: | - python -m pip install -U "jupyterlab>=4.5.0a0,<4.6" hatch + python -m pip install -U "jupyterlab>=4.5.0a0,<4.6" jlpm jlpm run build diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index ab931d8fc6..301c9731a5 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -11,6 +11,7 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} cancel-in-progress: true + jobs: check_release: runs-on: ubuntu-latest @@ -18,8 +19,13 @@ jobs: steps: - name: Checkout uses: actions/checkout@v5 + - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + + - name: Pin click to avoid 8.3.0 issues + run: pipx inject --force hatch "click<8.3.0" + - name: Check Release uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2 with: diff --git a/.github/workflows/playwright-update.yml b/.github/workflows/playwright-update.yml index 85a255a0c0..1b6dcf4be8 100644 --- a/.github/workflows/playwright-update.yml +++ b/.github/workflows/playwright-update.yml @@ -7,6 +7,7 @@ on: permissions: contents: read + jobs: update-snapshots: if: > @@ -83,6 +84,9 @@ jobs: - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + - name: Pin click to avoid 8.3.0 issues + run: pipx inject --force hatch "click<8.3.0" + - name: Build uses: ./.github/actions/build-dist diff --git a/.github/workflows/prep-release.yml b/.github/workflows/prep-release.yml index 396330bb97..7e22796c1d 100644 --- a/.github/workflows/prep-release.yml +++ b/.github/workflows/prep-release.yml @@ -23,6 +23,8 @@ on: description: "Use PRs with activity since the last stable git tag" required: false type: boolean + + jobs: prep_release: runs-on: ubuntu-latest @@ -31,6 +33,9 @@ jobs: steps: - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + - name: Pin click to avoid 8.3.0 issues + run: pipx inject --force hatch "click<8.3.0" + - name: Prep Release id: prep-release uses: jupyter-server/jupyter_releaser/.github/actions/prep-release@v2 diff --git a/.github/workflows/publish-changelog.yml b/.github/workflows/publish-changelog.yml index c576a54877..76a99b9a60 100644 --- a/.github/workflows/publish-changelog.yml +++ b/.github/workflows/publish-changelog.yml @@ -9,6 +9,7 @@ on: description: "The branch to target" required: false + jobs: publish_changelog: runs-on: ubuntu-latest @@ -16,6 +17,9 @@ jobs: steps: - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + - name: Pin click to avoid 8.3.0 issues + run: pipx inject --force hatch "click<8.3.0" + - uses: actions/create-github-app-token@v2 id: app-token with: diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index d5dc89c8be..e1d90b12bb 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -12,6 +12,7 @@ on: description: "Comma separated list of steps to skip" required: false + jobs: publish_release: runs-on: ubuntu-latest @@ -21,6 +22,12 @@ jobs: steps: - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + - name: Install jupyter-releaser + run: pipx install jupyter-releaser + + - name: Pin click to avoid 8.3.0 issues + run: pipx inject --force hatch "click<8.3.0" + - uses: actions/create-github-app-token@v2 id: app-token with: diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 12108731a8..b6fdc2e20b 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -12,6 +12,7 @@ concurrency: permissions: contents: read + jobs: build: name: Build @@ -39,6 +40,9 @@ jobs: - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + - name: Pin click to avoid 8.3.0 issues + run: pipx inject --force hatch "click<8.3.0" + - uses: actions/download-artifact@v5 with: name: notebook-dist-${{ github.run_number }} diff --git a/pyproject.toml b/pyproject.toml index b91a2ac965..24e2a7991a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,6 +2,7 @@ requires = [ "hatchling>=1.11", "jupyterlab>=4.5.0a3,<4.6", + "click<8.3.0", ] build-backend = "hatchling.build" @@ -63,6 +64,7 @@ test = [ "jupyter_server[test]>=2.4.0,<3", "jupyterlab_server[test]>=2.27.1,<3", "importlib-resources>=5.0;python_version<\"3.10\"", + "click<8.3.0", ] docs = [ "myst_parser", @@ -74,7 +76,8 @@ docs = [ ] dev = [ "pre-commit", - "hatch" + "hatch", + "click<8.3.0", ] [tool.hatch.version]