Skip to content

Commit c0dd949

Browse files
authored
Clean up CI (#723)
1 parent 5d962d7 commit c0dd949

File tree

9 files changed

+436
-23
lines changed

9 files changed

+436
-23
lines changed

.github/workflows/downstream.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
jobs:
88
tests:
99
runs-on: ubuntu-latest
10-
timeout-minutes: 15
10+
timeout-minutes: 20
1111

1212
steps:
1313
- name: Checkout
@@ -16,22 +16,25 @@ jobs:
1616
- name: Base Setup
1717
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
1818

19+
- name: Test nbclassic
20+
uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
21+
with:
22+
package_name: nbclassic
23+
test_command: pytest --pyargs nbclassic
24+
1925
- name: Test jupyterlab_server
2026
uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
2127
with:
2228
package_name: jupyterlab_server
29+
test_command: pytest --pyargs jupyterlab_server
2330

2431
- name: Test jupyterlab
2532
uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
2633
with:
2734
package_name: jupyterlab
35+
package_spec: '".[test]"'
2836
test_command: "python -m jupyterlab.browser_check --no-browser-test"
2937

30-
- name: Test nbclassic
31-
uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
32-
with:
33-
package_name: nbclassic
34-
3538
- name: Test run nbclassic
3639
run: |
3740
pip install nbclassic

.github/workflows/python-linux.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
3434
build:
3535
runs-on: ${{ matrix.os }}
36+
timeout-minutes: 20
3637
strategy:
3738
fail-fast: false
3839
matrix:
@@ -53,11 +54,11 @@ jobs:
5354
- name: Run the tests
5455
if: ${{ matrix.python-version != 'pypy-3.7' }}
5556
run: |
56-
pytest -vv --cov jupyter_server --cov-branch --cov-report term-missing:skip-covered
57+
pytest -vv --cov jupyter_server --cov-branch --cov-report term-missing:skip-covered || pytest -vv --cov jupyter_server --cov-branch --cov-report term-missing:skip-covered --lf
5758
- name: Run the tests on pypy
5859
if: ${{ matrix.python-version == 'pypy-3.7' }}
5960
run: |
60-
pytest -vv
61+
pytest -vv || pytest -vv -lf
6162
- name: Install the Python dependencies for the examples
6263
run: |
6364
cd examples/simple && pip install -e .
@@ -76,6 +77,7 @@ jobs:
7677
7778
test_miniumum_verisons:
7879
name: Test Minimum Versions
80+
timeout-minutes: 20
7981
runs-on: ubuntu-latest
8082
steps:
8183
- uses: actions/checkout@v2
@@ -86,11 +88,12 @@ jobs:
8688
- name: Install miniumum versions
8789
uses: jupyterlab/maintainer-tools/.github/actions/install-minimums@v1
8890
- name: Run the unit tests
89-
run: pytest -vv
91+
run: pytest -vv|| pytest -vv --lf
9092

9193
test_prereleases:
9294
name: Test Prereleases
9395
runs-on: ubuntu-latest
96+
timeout-minutes: 20
9497
steps:
9598
- name: Checkout
9699
uses: actions/checkout@v2
@@ -105,11 +108,12 @@ jobs:
105108
pip check
106109
- name: Run the tests
107110
run: |
108-
pytest -vv
111+
pytest -vv || pytest -vv --lf
109112
110113
make_sdist:
111114
name: Make SDist
112115
runs-on: ubuntu-latest
116+
timeout-minutes: 20
113117
steps:
114118
- uses: actions/checkout@v2
115119
- name: Base Setup
@@ -127,6 +131,7 @@ jobs:
127131
runs-on: ubuntu-latest
128132
needs: [make_sdist]
129133
name: Install from SDist and Test
134+
timeout-minutes: 20
130135
steps:
131136
- name: Base Setup
132137
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
@@ -144,4 +149,4 @@ jobs:
144149
- name: Run Test
145150
run: |
146151
cd sdist/test
147-
pytest -vv
152+
pytest -vv || pytest -vv --lf

.github/workflows/python-macos.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
jobs:
88
build:
99
runs-on: ${{ matrix.os }}
10+
timeout-minutes: 20
1011
strategy:
1112
fail-fast: false
1213
matrix:
@@ -28,11 +29,11 @@ jobs:
2829
- name: Run the tests
2930
if: ${{ !startsWith( matrix.python-version, 'pypy' ) }}
3031
run: |
31-
pytest -vv --cov jupyter_server --cov-branch --cov-report term-missing:skip-covered
32+
pytest -vv --cov jupyter_server --cov-branch --cov-report term-missing:skip-covered || pytest -vv --cov jupyter_server --cov-branch --cov-report term-missing:skip-covered --lf
3233
- name: Run the tests on pypy
3334
if: ${{ startsWith( matrix.python-version, 'pypy' ) }}
3435
run: |
35-
pytest -vv
36+
pytest -vv || pytest -vv --lf
3637
- name: Install the Python dependencies for the examples
3738
run: |
3839
cd examples/simple && pip install -e .

.github/workflows/python-windows.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
jobs:
88
build:
99
runs-on: ${{ matrix.os }}
10+
timeout-minutes: 20
1011
strategy:
1112
fail-fast: false
1213
matrix:
@@ -32,7 +33,7 @@ jobs:
3233
# the file descriptions opened by the asyncio IOLoop.
3334
# This leads to a nasty, flaky race condition that we haven't
3435
# been able to solve.
35-
pytest -vv -s
36+
pytest -vv -s || pytest -vv -s --lf
3637
- name: Install the Python dependencies for the examples
3738
run: |
3839
cd examples/simple && pip install -e .

0 commit comments

Comments
 (0)