diff --git a/.github/actions/build-dist/action.yml b/.github/actions/build-dist/action.yml index 3b840d621a..4747b69545 100644 --- a/.github/actions/build-dist/action.yml +++ b/.github/actions/build-dist/action.yml @@ -1,7 +1,5 @@ name: 'Build Jupyter Notebook' - description: 'Build Jupyter Notebook from source' - runs: using: 'composite' steps: @@ -11,7 +9,7 @@ runs: - name: Install dependencies shell: bash run: | - python -m pip install hatch "click<8.3.0" + python -m pip install hatch - name: Build pypi distributions shell: bash diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f90f6ab50f..127476bc59 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,9 +46,6 @@ 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 @@ -82,8 +79,6 @@ 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 @@ -102,8 +97,6 @@ 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 @@ -117,8 +110,6 @@ 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 @@ -181,8 +172,6 @@ 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/[^/]+/?$' @@ -194,8 +183,6 @@ 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 87d6b7c8de..7ef303d024 100644 --- a/.github/workflows/buildutils.yml +++ b/.github/workflows/buildutils.yml @@ -16,7 +16,6 @@ concurrency: permissions: contents: read - jobs: versioning: runs-on: ubuntu-latest @@ -28,12 +27,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: Install dependencies run: | - python -m pip install -U "jupyterlab>=4.5.0a0,<4.6" + python -m pip install -U "jupyterlab>=4.5.0a0,<4.6" hatch jlpm jlpm run build diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index 301c9731a5..ab931d8fc6 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -11,7 +11,6 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} cancel-in-progress: true - jobs: check_release: runs-on: ubuntu-latest @@ -19,13 +18,8 @@ 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 1b6dcf4be8..85a255a0c0 100644 --- a/.github/workflows/playwright-update.yml +++ b/.github/workflows/playwright-update.yml @@ -7,7 +7,6 @@ on: permissions: contents: read - jobs: update-snapshots: if: > @@ -84,9 +83,6 @@ 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 7e22796c1d..396330bb97 100644 --- a/.github/workflows/prep-release.yml +++ b/.github/workflows/prep-release.yml @@ -23,8 +23,6 @@ on: description: "Use PRs with activity since the last stable git tag" required: false type: boolean - - jobs: prep_release: runs-on: ubuntu-latest @@ -33,9 +31,6 @@ 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 76a99b9a60..c576a54877 100644 --- a/.github/workflows/publish-changelog.yml +++ b/.github/workflows/publish-changelog.yml @@ -9,7 +9,6 @@ on: description: "The branch to target" required: false - jobs: publish_changelog: runs-on: ubuntu-latest @@ -17,9 +16,6 @@ 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 e1d90b12bb..d5dc89c8be 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -12,7 +12,6 @@ on: description: "Comma separated list of steps to skip" required: false - jobs: publish_release: runs-on: ubuntu-latest @@ -22,12 +21,6 @@ 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 b6fdc2e20b..12108731a8 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -12,7 +12,6 @@ concurrency: permissions: contents: read - jobs: build: name: Build @@ -40,9 +39,6 @@ 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 24e2a7991a..b91a2ac965 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,6 @@ requires = [ "hatchling>=1.11", "jupyterlab>=4.5.0a3,<4.6", - "click<8.3.0", ] build-backend = "hatchling.build" @@ -64,7 +63,6 @@ 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", @@ -76,8 +74,7 @@ docs = [ ] dev = [ "pre-commit", - "hatch", - "click<8.3.0", + "hatch" ] [tool.hatch.version]