Skip to content

Commit 1bb2690

Browse files
authored
Merge pull request #387 from consideRatio/pr/req-py38
Drop support for Python 3.7
2 parents bc49c6e + 1d9e037 commit 1bb2690

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

.github/workflows/test.yaml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ jobs:
3737
strategy:
3838
fail-fast: false
3939
matrix:
40+
python-version: ["3.8", "3.11"]
41+
jupyter_server-version: ["1", "2"]
4042
jupyterlab-version: ["2", "3"]
41-
python-version: ["3.7", "3.11"]
42-
jupyter-app: [notebook, lab]
4343

4444
steps:
4545
- uses: actions/checkout@v3
@@ -69,16 +69,23 @@ jobs:
6969
#
7070
# Pytest options are set in tests/pytest.ini.
7171
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'
7373
7474
- name: List Python packages
7575
run: |
7676
pip freeze
7777
pip check
7878
79-
- name: Run tests
79+
- name: Run tests against jupyter-notebook
8080
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 &
8289
sleep 5
8390
cd tests
8491
pytest -k "not acceptance"
@@ -88,7 +95,7 @@ jobs:
8895
uses: actions/upload-artifact@v3
8996
with:
9097
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 }}
9299
path: |
93100
./build/pytest
94101
./build/coverage
@@ -115,10 +122,9 @@ jobs:
115122
- name: Check the lab extension
116123
# We test the labextension thoroughly in the acceptance tests below, so
117124
# 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+.
120126
#
121-
if: ${{ !(matrix.jupyterlab-version == '2' && startsWith(matrix.python-version, '3.11')) }}
127+
if: ${{ !(matrix.jupyterlab-version == '2' && matrix.jupyter_server-version != '1') }}
122128
run: |
123129
jupyter labextension list
124130
jupyter labextension list 2>&1 | grep -iE '@jupyterhub/jupyter-server-proxy.*OK.*'
@@ -133,6 +139,6 @@ jobs:
133139
uses: actions/upload-artifact@v3
134140
with:
135141
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 }}
137143
path: |
138144
./build/robot

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dynamic = [
1818
]
1919
readme = "README.md"
2020
license = { file = "LICENSE" }
21-
requires-python = ">=3.7"
21+
requires-python = ">=3.8"
2222
classifiers = [
2323
"Framework :: Jupyter",
2424
"Framework :: Jupyter :: JupyterLab",
@@ -32,7 +32,6 @@ classifiers = [
3232
"Operating System :: POSIX :: Linux",
3333
"Programming Language :: Python",
3434
"Programming Language :: Python :: 3",
35-
"Programming Language :: Python :: 3.7",
3635
"Programming Language :: Python :: 3.8",
3736
"Programming Language :: Python :: 3.9",
3837
"Programming Language :: Python :: 3.10",

0 commit comments

Comments
 (0)