Skip to content

Commit d1ec492

Browse files
authored
Merge branch 'main' into deprecate-extract-dates
2 parents bbc9559 + 7b4340d commit d1ec492

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+931
-441
lines changed

.github/workflows/downstream.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,6 @@ jobs:
3131
package_name: nbclient
3232
env_values: IPYKERNEL_CELL_NAME=\<IPY-INPUT\>
3333

34-
papermill:
35-
runs-on: ubuntu-latest
36-
timeout-minutes: 15
37-
steps:
38-
- uses: actions/checkout@v4
39-
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
40-
- uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
41-
with:
42-
package_name: papermill
43-
4434
nbconvert:
4535
runs-on: ubuntu-latest
4636
timeout-minutes: 15
@@ -50,7 +40,7 @@ jobs:
5040
- uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
5141
with:
5242
package_name: nbconvert
53-
package_spec: pip install -e ".[test]"
43+
package_spec: -e ".[test]"
5444

5545
jupyter_server:
5646
runs-on: ubuntu-latest

.github/workflows/main.yml

Lines changed: 43 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ defaults:
1313
run:
1414
shell: bash -eux {0}
1515

16+
env:
17+
HATCH_ENV: "cov"
18+
1619
jobs:
1720
check_release:
1821
runs-on: ubuntu-latest
@@ -38,31 +41,44 @@ jobs:
3841
fail-fast: false
3942
matrix:
4043
os: [ubuntu-latest, windows-latest, macos-latest]
41-
python-version: ["3.8", "3.12"]
44+
python-version:
45+
- "3.10"
46+
- "3.14"
47+
- "3.14t"
4248
include:
4349
- os: windows-latest
44-
python-version: "3.11"
50+
python-version: "3.12"
4551
- os: ubuntu-latest
46-
python-version: "pypy-3.9"
52+
python-version: "pypy-3.11"
4753
- os: ubuntu-latest
48-
python-version: "3.10"
54+
python-version: "3.11"
4955
- os: macos-latest
50-
python-version: "3.9"
56+
python-version: "3.10"
5157
steps:
5258
- uses: actions/checkout@v4
5359
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
54-
- name: Run the tests
55-
if: ${{ !startsWith(matrix.python-version, 'pypy') && !startsWith(matrix.os, 'windows') }}
60+
61+
- name: disable warnings on pypy or windows
62+
if: ${{ startsWith(matrix.python-version, 'pypy') || startsWith(matrix.os, 'windows') }}
5663
run: |
57-
hatch run cov:test --cov-fail-under 75 || hatch run test:test --lf
58-
- name: Run the tests on pypy
64+
echo "PYTEST_ADDOPTS=${PYTEST_ADDOPTS:-} -W default" >> $GITHUB_ENV
65+
66+
- name: disable coverage on pypy
5967
if: ${{ startsWith(matrix.python-version, 'pypy') }}
6068
run: |
61-
hatch run test:nowarn || hatch run test:nowarn --lf
62-
- name: Run the tests on windows
63-
if: ${{ startsWith(matrix.os, 'windows') }}
69+
echo "HATCH_ENV=test" >> $GITHUB_ENV
70+
71+
- name: show env
6472
run: |
65-
hatch run cov:nowarn || hatch run test:nowarn --lf
73+
hatch -e ${HATCH_ENV} run python -VV
74+
hatch -e ${HATCH_ENV} run pip freeze
75+
76+
- name: Run the tests
77+
run: |
78+
hatch run ${HATCH_ENV}:test
79+
env:
80+
PYTHONTRACEMALLOC: "10"
81+
6682
- uses: jupyterlab/maintainer-tools/.github/actions/upload-coverage@v1
6783

6884
coverage:
@@ -76,7 +92,7 @@ jobs:
7692
fail_under: 78
7793

7894
docs:
79-
runs-on: windows-latest
95+
runs-on: ubuntu-latest
8096
steps:
8197
- uses: actions/checkout@v4
8298
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
@@ -86,8 +102,9 @@ jobs:
86102
# If this fails run `hatch run docs:api` locally
87103
# and commit.
88104
git status --porcelain
89-
git status -s | grep "A" && exit 1
90-
git status -s | grep "M" && exit 1
105+
if git status -s | grep "^\s*[AM]"; then
106+
exit 1
107+
fi
91108
echo "API docs done"
92109
- run: hatch run docs:build
93110

@@ -113,9 +130,16 @@ jobs:
113130
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
114131
with:
115132
dependency_type: minimum
133+
python_version: "3.10"
134+
135+
- name: show env
136+
run: |
137+
hatch -e test run python -VV
138+
hatch -e test run pip freeze
139+
116140
- name: Run the unit tests
117141
run: |
118-
hatch -vv run test:nowarn || hatch run test:nowarn --lf
142+
hatch -vv run test:nowarn
119143
120144
test_prereleases:
121145
name: Test Prereleases
@@ -128,7 +152,7 @@ jobs:
128152
dependency_type: pre
129153
- name: Run the tests
130154
run: |
131-
hatch run test:nowarn || hatch run test:nowarn --lf
155+
hatch run test:nowarn
132156
133157
make_sdist:
134158
name: Make SDist
@@ -148,7 +172,7 @@ jobs:
148172
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
149173
- uses: jupyterlab/maintainer-tools/.github/actions/test-sdist@v1
150174
with:
151-
test_command: pytest -vv || pytest -vv --lf
175+
test_command: pytest -vv
152176

153177
tests_check: # This job does nothing and is only used for the branch protection
154178
if: always()

.github/workflows/prep-release.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ on:
1212
post_version_spec:
1313
description: "Post Version Specifier"
1414
required: false
15+
silent:
16+
description: "Set a placeholder in the changelog and don't publish the release."
17+
required: false
18+
type: boolean
1519
since:
1620
description: "Use PRs with activity since this date or git reference"
1721
required: false
@@ -22,15 +26,18 @@ on:
2226
jobs:
2327
prep_release:
2428
runs-on: ubuntu-latest
29+
permissions:
30+
contents: write
2531
steps:
2632
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
2733

2834
- name: Prep Release
2935
id: prep-release
3036
uses: jupyter-server/jupyter_releaser/.github/actions/prep-release@v2
3137
with:
32-
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
38+
token: ${{ secrets.GITHUB_TOKEN }}
3339
version_spec: ${{ github.event.inputs.version_spec }}
40+
silent: ${{ github.event.inputs.silent }}
3441
post_version_spec: ${{ github.event.inputs.post_version_spec }}
3542
target: ${{ github.event.inputs.target }}
3643
branch: ${{ github.event.inputs.branch }}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: "Publish Changelog"
2+
on:
3+
release:
4+
types: [published]
5+
6+
workflow_dispatch:
7+
inputs:
8+
branch:
9+
description: "The branch to target"
10+
required: false
11+
12+
jobs:
13+
publish_changelog:
14+
runs-on: ubuntu-latest
15+
environment: release
16+
steps:
17+
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
18+
19+
- uses: actions/create-github-app-token@v1
20+
id: app-token
21+
with:
22+
app-id: ${{ vars.APP_ID }}
23+
private-key: ${{ secrets.APP_PRIVATE_KEY }}
24+
25+
- name: Publish changelog
26+
id: publish-changelog
27+
uses: jupyter-server/jupyter_releaser/.github/actions/publish-changelog@v2
28+
with:
29+
token: ${{ steps.app-token.outputs.token }}
30+
branch: ${{ github.event.inputs.branch }}
31+
32+
- name: "** Next Step **"
33+
run: |
34+
echo "Merge the changelog update PR: ${{ steps.publish-changelog.outputs.pr_url }}"

.github/workflows/publish-release.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,32 @@ on:
1515
jobs:
1616
publish_release:
1717
runs-on: ubuntu-latest
18+
environment: release
19+
permissions:
20+
id-token: write
1821
steps:
1922
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
2023

24+
- uses: actions/create-github-app-token@v1
25+
id: app-token
26+
with:
27+
app-id: ${{ vars.APP_ID }}
28+
private-key: ${{ secrets.APP_PRIVATE_KEY }}
29+
2130
- name: Populate Release
2231
id: populate-release
2332
uses: jupyter-server/jupyter_releaser/.github/actions/populate-release@v2
2433
with:
25-
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
26-
target: ${{ github.event.inputs.target }}
34+
token: ${{ steps.app-token.outputs.token }}
2735
branch: ${{ github.event.inputs.branch }}
2836
release_url: ${{ github.event.inputs.release_url }}
2937
steps_to_skip: ${{ github.event.inputs.steps_to_skip }}
3038

3139
- name: Finalize Release
3240
id: finalize-release
33-
env:
34-
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
35-
PYPI_TOKEN_MAP: ${{ secrets.PYPI_TOKEN_MAP }}
36-
TWINE_USERNAME: __token__
37-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
38-
uses: jupyter-server/jupyter-releaser/.github/actions/finalize-release@v2
41+
uses: jupyter-server/jupyter_releaser/.github/actions/finalize-release@v2
3942
with:
40-
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
41-
target: ${{ github.event.inputs.target }}
43+
token: ${{ steps.app-token.outputs.token }}
4244
release_url: ${{ steps.populate-release.outputs.release_url }}
4345

4446
- name: "** Next Step **"

.pre-commit-config.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ci:
44

55
repos:
66
- repo: https://github.com/pre-commit/pre-commit-hooks
7-
rev: v4.5.0
7+
rev: v6.0.0
88
hooks:
99
- id: check-case-conflict
1010
- id: check-ast
@@ -21,12 +21,12 @@ repos:
2121
- id: trailing-whitespace
2222

2323
- repo: https://github.com/python-jsonschema/check-jsonschema
24-
rev: 0.27.4
24+
rev: 0.34.0
2525
hooks:
2626
- id: check-github-workflows
2727

28-
- repo: https://github.com/executablebooks/mdformat
29-
rev: 0.7.17
28+
- repo: https://github.com/hukkin/mdformat
29+
rev: 0.7.22
3030
hooks:
3131
- id: mdformat
3232

@@ -37,7 +37,7 @@ repos:
3737
types_or: [yaml, html, json]
3838

3939
- repo: https://github.com/pre-commit/mirrors-mypy
40-
rev: "v1.8.0"
40+
rev: "v1.18.2"
4141
hooks:
4242
- id: mypy
4343
files: jupyter_client
@@ -47,13 +47,13 @@ repos:
4747
["traitlets>=5.13", "ipykernel>=6.26", "jupyter_core>=5.3.2"]
4848

4949
- repo: https://github.com/adamchainz/blacken-docs
50-
rev: "1.16.0"
50+
rev: "1.20.0"
5151
hooks:
5252
- id: blacken-docs
5353
additional_dependencies: [black==23.7.0]
5454

5555
- repo: https://github.com/codespell-project/codespell
56-
rev: "v2.2.6"
56+
rev: "v2.4.1"
5757
hooks:
5858
- id: codespell
5959
args: ["-L", "sur,nd"]
@@ -66,16 +66,16 @@ repos:
6666
- id: rst-inline-touching-normal
6767

6868
- repo: https://github.com/astral-sh/ruff-pre-commit
69-
rev: v0.2.0
69+
rev: v0.14.0
7070
hooks:
71-
- id: ruff
71+
- id: ruff-check
7272
types_or: [python, jupyter]
7373
args: ["--fix", "--show-fixes"]
7474
- id: ruff-format
7575
types_or: [python, jupyter]
7676

7777
- repo: https://github.com/scientific-python/cookie
78-
rev: "2024.01.24"
78+
rev: "2025.10.01"
7979
hooks:
8080
- id: sp-repo-review
8181
additional_dependencies: ["repo-review[cli]"]

0 commit comments

Comments
 (0)