Skip to content

Commit 659330f

Browse files
authored
Merge pull request #731 from blink1073/downstream-test
2 parents 3082366 + 527a3e3 commit 659330f

File tree

3 files changed

+23
-62
lines changed

3 files changed

+23
-62
lines changed

.github/workflows/check-release.yml

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,8 @@ jobs:
1717
steps:
1818
- name: Checkout
1919
uses: actions/checkout@v2
20-
- name: Install Python
21-
uses: actions/setup-python@v2
22-
with:
23-
python-version: 3.9
24-
architecture: "x64"
25-
- name: Install node
26-
uses: actions/setup-node@v2
27-
with:
28-
node-version: "14.x"
29-
- name: Get pip cache dir
30-
id: pip-cache
31-
run: |
32-
echo "::set-output name=dir::$(pip cache dir)"
33-
- name: Cache pip
34-
uses: actions/cache@v1
35-
with:
36-
path: ${{ steps.pip-cache.outputs.dir }}
37-
key: ${{ runner.os }}-pip-${{ hashFiles('setup.cfg') }}
38-
restore-keys: |
39-
${{ runner.os }}-pip-
40-
${{ runner.os }}-pip-
41-
- name: Cache checked links
42-
if: ${{ matrix.group == 'link_check' }}
43-
uses: actions/cache@v2
44-
with:
45-
path: ~/.cache/pytest-link-check
46-
key: ${{ runner.os }}-linkcheck-${{ hashFiles('**/*.md', '**/*.rst') }}-md-links
47-
restore-keys: |
48-
${{ runner.os }}-linkcheck-
49-
- name: Upgrade packaging dependencies
50-
run: |
51-
pip install --upgrade pip setuptools wheel --user
20+
- name: Base Setup
21+
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
5222
- name: Install Dependencies
5323
run: |
5424
pip install -e .

.github/workflows/downstream.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99
jobs:
1010
tests:
1111
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
python-version: ["3.9"]
1215

1316
steps:
1417
- name: Checkout
@@ -45,9 +48,22 @@ jobs:
4548
with:
4649
package_name: jupyter_server
4750

51+
# Test using jupyter_kernel_test
52+
53+
- name: Setup conda ${{ matrix.python-version }}
54+
uses: conda-incubator/setup-miniconda@v2
55+
with:
56+
auto-update-conda: true
57+
activate-environment: jupyter_kernel_test
58+
miniforge-variant: Mambaforge
59+
python-version: ${{ matrix.python-version }}
60+
4861
- name: Test jupyter_kernel_test
62+
shell: bash -l {0}
4963
run: |
5064
git clone https://github.com/jupyter/jupyter_kernel_test.git
5165
cd jupyter_kernel_test
66+
conda env update --name jupyter_kernel_test --file environment.yml
67+
conda install -c conda-forge xeus-cling
5268
pip install -e ".[test]"
53-
python test_ipykernel.py
69+
python -m unittest -v

.github/workflows/main.yml

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
fail-fast: false
7070
matrix:
7171
os: [ubuntu-latest, macos-latest, windows-latest]
72-
python-version: [3.6, 3.7, 3.8, 3.9]
72+
python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
7373

7474
env:
7575
OS: ${{ matrix.os }}
@@ -78,33 +78,8 @@ jobs:
7878
- name: Checkout
7979
uses: actions/checkout@v2
8080

81-
- name: Set up Python ${{ matrix.python-version }}
82-
uses: actions/setup-python@v2
83-
with:
84-
python-version: ${{ matrix.python-version }}
85-
86-
- name: Update pip
87-
run: |
88-
pip install --upgrade pip
89-
pip install --upgrade wheel setuptools
90-
91-
- name: Get pip cache dir
92-
id: pip-cache
93-
run: |
94-
echo "::set-output name=dir::$(pip cache dir)"
95-
96-
- name: Cache pip
97-
uses: actions/cache@v2
98-
with:
99-
path: |
100-
${{ steps.pip-cache.outputs.dir }}
101-
.mypy_cache
102-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ hashFiles('**/requirements*.txt') }}-git-${{ github.sha }}
103-
restore-keys: |
104-
${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ hashFiles('**/requirements*.txt') }}
105-
${{ runner.os }}-python-${{ matrix.python-version }}-pip-
106-
${{ runner.os }}-python
107-
${{ runner.os }}-
81+
- name: Base Setup
82+
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
10883

10984
- name: Install dependencies
11085
run: |
@@ -114,7 +89,7 @@ jobs:
11489
- name: Check types
11590
run: mypy jupyter_client --exclude '\/tests|kernelspecapp|ioloop|runapp' --install-types --non-interactive
11691

117-
- name: Run the tests
92+
- name: Run the tests with coverage
11893
run: pytest --cov jupyter_client -v jupyter_client
11994

12095
- name: Build the docs

0 commit comments

Comments
 (0)