Skip to content

Commit 2fc14bf

Browse files
authored
Merge pull request #241 from consideRatio/pr/attempt-fix-ci-failures
ci: fix broken tests by not installing pre-releases of jh's dev-requirements.txt
2 parents 09f4ebc + b0a6fa0 commit 2fc14bf

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

.github/workflows/test.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,21 @@ jobs:
6060
python -m pip install --upgrade pip
6161
python -m pip install pytest
6262
pip install -r requirements.txt
63+
pip list
64+
6365
- name: Install nodejs dependencies
6466
run: |
6567
sudo npm install -g configurable-http-proxy
6668
67-
# We need to check compatibility with different versions of the JH
68-
# API, including latest development. For that, we also need to
69-
# pull in the dependencies of that old JH version (but we don't
70-
# need conda/npm for our tests).
69+
# We need to check compatibility with different versions of the JH API,
70+
# including latest development. For that, we also need to pull in the
71+
# development dependencies of that old JH version (but we don't need
72+
# conda/npm for our tests).
7173
- name: install JupyterHub
7274
run: |
73-
git clone --quiet --branch ${{ matrix.JHUB_VER }} https://github.com/jupyterhub/jupyterhub.git jupyterhub
74-
pip install --pre -r jupyterhub/dev-requirements.txt
75-
pip install --upgrade pytest
76-
pip install --pre -e jupyterhub
75+
git clone --quiet --branch ${{ matrix.JHUB_VER }} https://github.com/jupyterhub/jupyterhub.git ./jupyterhub
76+
pip install -r ./jupyterhub/dev-requirements.txt
77+
pip install ./jupyterhub
7778
7879
- name: pytest
7980
run: |

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,7 @@ error messages:
194194
batchspawner-specific, with the one exception below. The error log
195195
would be in the batch script output (same file as above). There may
196196
also be clues in the JupyterHub logfile.
197-
198-
- Are you running on an NFS filesystem? It's possible for Jupyter to
197+
- Are you running on an NFS filesystem? It's possible for Jupyter to
199198
experience issues due to varying implementations of the fcntl() system
200199
call. (See also [Jupyterhub-Notes and Tips: SQLite](https://jupyterhub.readthedocs.io/en/latest/reference/database.html?highlight=NFS#sqlite))
201200

batchspawner/tests/conftest.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1-
"""py.test fixtures imported from Jupyterhub testing"""
1+
"""Relevant pytest fixtures are re-used from JupyterHub's test suite"""
22

3-
from jupyterhub.tests.conftest import *
3+
# We only use "db" and "io_loop", but we also need event_loop which is used by
4+
# io_loop to be available with jupyterhub 1+.
5+
from jupyterhub.tests.conftest import db, io_loop
6+
7+
try:
8+
from jupyterhub.tests.conftest import event_loop
9+
except:
10+
pass

0 commit comments

Comments
 (0)