Skip to content

Commit 97dbadd

Browse files
blink1073blink1073
authored
Merge branch 'main' into metadata-updates
2 parents 395eec3 + f6f8c3f commit 97dbadd

File tree

177 files changed

+4519
-1705
lines changed

Some content is hidden

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

177 files changed

+4519
-1705
lines changed

‎.github/workflows/downstream.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@ name: Test downstream projects
22

33
on:
44
push:
5-
branches: "*"
65
pull_request:
7-
branches: "*"
86

97
jobs:
108
tests:
119
runs-on: ubuntu-latest
12-
timeout-minutes: 15
10+
timeout-minutes: 20
1311

1412
steps:
1513
- name: Checkout
@@ -18,6 +16,11 @@ jobs:
1816
- name: Base Setup
1917
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
2018

19+
- name: Test nbclassic
20+
uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
21+
with:
22+
package_name: nbclassic
23+
2124
- name: Test jupyterlab_server
2225
uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
2326
with:
@@ -29,11 +32,6 @@ jobs:
2932
package_name: jupyterlab
3033
test_command: "python -m jupyterlab.browser_check --no-browser-test"
3134

32-
- name: Test nbclassic
33-
uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
34-
with:
35-
package_name: nbclassic
36-
3735
- name: Test run nbclassic
3836
run: |
3937
pip install nbclassic

‎.github/workflows/integration-tests.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
name: Jupyter Server Integration Tests [Linux]
22
on:
33
push:
4-
branches: "main"
4+
branches: ["main"]
55
pull_request:
6-
branches: "*"
6+
branches: ["*"]
77
jobs:
88
build:
9-
runs-on: ${{ matrix.os }}-latest
9+
runs-on: ${{ matrix.os }}
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
os: [ubuntu]
13+
os: [ubuntu-latest]
1414
python-version: ["3.7", "3.8", "3.9", "3.10", "pypy-3.7"]
1515
steps:
1616
- name: Checkout
@@ -20,10 +20,11 @@ jobs:
2020
- name: Install the Python dependencies
2121
run: |
2222
pip install -e ".[test]"
23+
pip install pytest-github-actions-annotate-failures
2324
- name: List installed packages
2425
run: |
2526
pip freeze
2627
pip check
2728
- name: Run the tests
2829
run: |
29-
pytest -vv --integration_tests=true jupyter_server
30+
pytest -vv --integration_tests=true tests

‎.github/workflows/python-linux.yml

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎.github/workflows/python-macos.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎.github/workflows/python-tests.yml

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
name: Jupyter Server Tests
2+
on:
3+
push:
4+
branches: ["main"]
5+
pull_request:
6+
schedule:
7+
- cron: "0 8 * * *"
8+
9+
jobs:
10+
build:
11+
runs-on: ${{ matrix.os }}
12+
timeout-minutes: 20
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
os: [ubuntu-latest, windows-latest, macos-latest]
17+
python-version: ["3.7", "3.10"]
18+
include:
19+
- os: windows-latest
20+
python-version: "3.9"
21+
- os: ubuntu-latest
22+
python-version: "pypy-3.7"
23+
- os: macos-latest
24+
python-version: "3.8"
25+
steps:
26+
- name: Checkout
27+
uses: actions/checkout@v2
28+
- name: Base Setup
29+
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
30+
- name: Install the Python dependencies
31+
run: |
32+
pip install -e ".[test]" codecov
33+
- name: Run the tests
34+
if: ${{ !startsWith(matrix.python-version, 'pypy') && !startsWith(matrix.os, 'windows') }}
35+
run: |
36+
args="-vv --cov jupyter_server --cov-branch --cov-report term-missing:skip-covered"
37+
python -m pytest $args --cov-fail-under 70 || python -m pytest $args --lf
38+
- name: Run the tests on pypy and windows
39+
if: ${{ startsWith(matrix.python-version, 'pypy') || startsWith(matrix.os, 'windows') }}
40+
run: |
41+
python -m pytest -vv || python -m pytest -vv --lf
42+
- name: Coverage
43+
run: |
44+
codecov
45+
46+
test_docs_and_examples:
47+
name: Test Docs and Examples
48+
timeout-minutes: 10
49+
runs-on: ubuntu-latest
50+
steps:
51+
- uses: actions/checkout@v2
52+
- name: Base Setup
53+
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
54+
- name: Install the Python dependencies for the examples
55+
run: |
56+
pip install -e ".[test]"
57+
cd examples/simple && pip install -e .
58+
- name: Run the tests for the examples
59+
run: |
60+
python -m pytest examples/simple
61+
- name: Test the docs
62+
run: |
63+
cd docs
64+
pip install -r doc-requirements.txt
65+
make html SPHINXOPTS="-W"
66+
67+
test_minimum_versions:
68+
name: Test Minimum Versions
69+
timeout-minutes: 20
70+
runs-on: ubuntu-latest
71+
steps:
72+
- uses: actions/checkout@v2
73+
- name: Base Setup
74+
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
75+
with:
76+
python_version: "3.7"
77+
- name: Install miniumum versions
78+
uses: jupyterlab/maintainer-tools/.github/actions/install-minimums@v1
79+
- name: Run the unit tests
80+
run: |
81+
pytest -vv -W default || pytest -vv -W default --lf
82+
83+
test_prereleases:
84+
name: Test Prereleases
85+
runs-on: ubuntu-latest
86+
timeout-minutes: 20
87+
steps:
88+
- name: Checkout
89+
uses: actions/checkout@v2
90+
- name: Base Setup
91+
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
92+
- name: Install the Python dependencies
93+
run: |
94+
pip install --pre -e ".[test]"
95+
- name: List installed packages
96+
run: |
97+
pip freeze
98+
pip check
99+
- name: Run the tests
100+
run: |
101+
pytest -vv || pytest -vv --lf
102+
103+
make_sdist:
104+
name: Make SDist
105+
runs-on: ubuntu-latest
106+
timeout-minutes: 10
107+
steps:
108+
- uses: actions/checkout@v2
109+
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
110+
- uses: jupyterlab/maintainer-tools/.github/actions/make-sdist@v1
111+
112+
test_sdist:
113+
runs-on: ubuntu-latest
114+
needs: [make_sdist]
115+
name: Install from SDist and Test
116+
timeout-minutes: 20
117+
steps:
118+
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
119+
- uses: jupyterlab/maintainer-tools/.github/actions/test-sdist@v1

‎.github/workflows/python-windows.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎.github/workflows/trigger_precommit.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Trigger Pre-Commit on a PR
2+
on:
3+
issue_comment:
4+
types: [created]
5+
6+
permissions:
7+
contents: write
8+
pull-requests: write
9+
10+
jobs:
11+
pr-script:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: khan/[email protected]
15+
id: check
16+
with:
17+
trigger: "auto run pre-commit"
18+
- if: steps.check.outputs.triggered == 'true'
19+
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
20+
- if: steps.check.outputs.triggered == 'true'
21+
uses: jupyterlab/maintainer-tools/.github/actions/pr-script@v1
22+
with:
23+
github_token: ${{ secrets.GITHUB_TOKEN }}
24+
pre_commit: true
25+
commit_message: "auto run pre-commit"
26+
target: ${{ github.event.issue.html_url }}
27+
association: ${{ github.event.comment.author_association }}

‎.mailmap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ David Hirschfeld <[email protected]> dhirschfeld <david.hirschfeld
2626
David P. Sanders <[email protected]> David P. Sanders <[email protected]>
2727
David Warde-Farley <[email protected]> David Warde-Farley <>
2828
Doug Blank <[email protected]> Doug Blank <[email protected]>
29-
Eugene Van den Bulke <[email protected]> Eugene Van den Bulke <[email protected]>
29+
Eugene Van den Bulke <[email protected]> Eugene Van den Bulke <[email protected]>
3030
Evan Patterson <[email protected]> <[email protected]>
3131
Evan Patterson <[email protected]> <[email protected]>
3232
Evan Patterson <[email protected]> <[email protected]>

0 commit comments

Comments
 (0)