37
37
strategy :
38
38
fail-fast : false
39
39
matrix :
40
+ python-version : ["3.8", "3.11"]
41
+ jupyter_server-version : ["1", "2"]
40
42
jupyterlab-version : ["2", "3"]
41
- python-version : ["3.7", "3.11"]
42
- jupyter-app : [notebook, lab]
43
43
44
44
steps :
45
45
- uses : actions/checkout@v3
@@ -69,16 +69,23 @@ jobs:
69
69
#
70
70
# Pytest options are set in tests/pytest.ini.
71
71
run : |
72
- pip install -vv $(ls ./dist/jupyter_server_proxy-*.whl)\[acceptance\] 'jupyterlab~=${{ matrix.jupyterlab-version }}.0'
72
+ pip install -vv $(ls ./dist/jupyter_server_proxy-*.whl)\[acceptance\] 'jupyterlab~=${{ matrix.jupyterlab-version }}.0' 'jupyter_server~=${{ matrix.jupyter_server-version }}.0'
73
73
74
74
- name : List Python packages
75
75
run : |
76
76
pip freeze
77
77
pip check
78
78
79
- - name : Run tests
79
+ - name : Run tests against jupyter-notebook
80
80
run : |
81
- JUPYTER_TOKEN=secret jupyter-${{ matrix.jupyter-app }} --config=./tests/resources/jupyter_server_config.py &
81
+ JUPYTER_TOKEN=secret jupyter-notebook --config=./tests/resources/jupyter_server_config.py &
82
+ sleep 5
83
+ cd tests
84
+ pytest -k "not acceptance"
85
+
86
+ - name : Run tests against jupyter-lab
87
+ run : |
88
+ JUPYTER_TOKEN=secret jupyter-lab --config=./tests/resources/jupyter_server_config.py &
82
89
sleep 5
83
90
cd tests
84
91
pytest -k "not acceptance"
88
95
uses : actions/upload-artifact@v3
89
96
with :
90
97
name : |-
91
- unit-tests-${{ matrix.python-version }}-${{ matrix.jupyter-app }}-${{ matrix. jupyterlab-version }}-${{ github.run_number }}
98
+ unit-tests-${{ matrix.python-version }}-${{ matrix.jupyterlab-version }}-${{ github.run_number }}
92
99
path : |
93
100
./build/pytest
94
101
./build/coverage
@@ -115,10 +122,9 @@ jobs:
115
122
- name : Check the lab extension
116
123
# We test the labextension thoroughly in the acceptance tests below, so
117
124
# we have conditionally disabled this basic check is to avoid issues in
118
- # jupyterlab.browser_check with jupyterlab 2 and a modern version of
119
- # python (3.11+).
125
+ # jupyterlab.browser_check with jupyterlab 2 and jupyter_server 2+.
120
126
#
121
- if : ${{ !(matrix.jupyterlab-version == '2' && startsWith( matrix.python -version, '3.11') ) }}
127
+ if : ${{ !(matrix.jupyterlab-version == '2' && matrix.jupyter_server -version != '1' ) }}
122
128
run : |
123
129
jupyter labextension list
124
130
jupyter labextension list 2>&1 | grep -iE '@jupyterhub/jupyter-server-proxy.*OK.*'
@@ -133,6 +139,6 @@ jobs:
133
139
uses : actions/upload-artifact@v3
134
140
with :
135
141
name : |-
136
- acceptance-tests-${{ matrix.python-version }}-${{ matrix.jupyter-app }}-${{ matrix. jupyterlab-version }}-${{ github.run_number }}
142
+ acceptance-tests-${{ matrix.python-version }}-${{ matrix.jupyterlab-version }}-${{ github.run_number }}
137
143
path : |
138
144
./build/robot
0 commit comments