Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
7c0373a
separate eventloop init/start from webapp init/start
Zsailer Nov 7, 2019
4dcf8b1
allow_none in ssl options
Zsailer Nov 8, 2019
f536109
add docstrings and protect the http_server property
Zsailer Dec 3, 2019
d427e2c
replace old nose tests with pytest tests
Zsailer Dec 4, 2019
61ea0df
remove old tests location
Zsailer Dec 4, 2019
f3b8ae1
Reapply test changes from PR 139 to fix gateway test
kevin-bates Dec 4, 2019
b3f830a
decode json models on 3.5
Zsailer Dec 5, 2019
30d7565
workaround tornado py38 compatibility issue
echarles Dec 5, 2019
0edc1ce
use fixture for asyncio
echarles Dec 5, 2019
cd6902a
try with new_httpserver=True
echarles Dec 5, 2019
1b7a672
reset new httpserver=False
echarles Dec 5, 2019
b44c304
pin nbconvert
Zsailer Dec 5, 2019
dc533db
add fixture for tornado io_loop
echarles Dec 6, 2019
b36452f
trigger build
echarles Dec 6, 2019
22fd9fb
Merge pull request #2 from datalayer-contrib/pytest
Zsailer Dec 6, 2019
639d4a5
polish the windows 3.8 fix and handle nbconvert encoding properly
Zsailer Dec 6, 2019
8f74c5e
try extending request timeout
Zsailer Dec 6, 2019
5c3b85f
make patch dependent on platform
Zsailer Dec 6, 2019
5419444
increase request timeout in ws
Zsailer Dec 6, 2019
2545bbd
increase connection time:
Zsailer Dec 6, 2019
755138f
Address deprecation warnings in gateway tests
kevin-bates Dec 6, 2019
d5a5f54
Merge pull request #3 from kevin-bates/pytest
Zsailer Dec 6, 2019
804ef56
add sleep before connecting to running kernel
Zsailer Dec 6, 2019
ce148f5
missing kernel shutdown in serverapp
Zsailer Dec 6, 2019
c17ac6d
temporarily remove other kernel tests
Zsailer Dec 6, 2019
bfd3b3d
check that patch is applied in windoes 3.8
Zsailer Dec 6, 2019
f89beb3
stop using static method
Zsailer Dec 6, 2019
e1cfe32
increase connection time
Zsailer Dec 6, 2019
d70e94d
update to versions of python appveyor
Zsailer Dec 6, 2019
785b696
add old tests back in
Zsailer Dec 6, 2019
bea65a0
add conda line back to appveyor
Zsailer Dec 6, 2019
17ca448
add python 38
Zsailer Dec 6, 2019
1eda569
Pull ipykernel from GH to fix Windows tests on 3.8
kevin-bates Dec 6, 2019
1d1dfd9
pull ipykernel master to fix Windows 3.8 issue
Zsailer Dec 6, 2019
21d4a1e
Merge pull request #4 from kevin-bates/pytest
Zsailer Dec 6, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI
name: Jupyter Server Tests
on:
push:
branches:
Expand All @@ -24,6 +24,10 @@ jobs:
- name: Install the Python dependencies
run: |
pip install -e .[test]
- name: ipykernel fix on windows 3.8
if: matrix.os == 'windows-latest' && matrix.python-version == '3.8'
run: |
pip install --upgrade git+https://github.com/ipython/ipykernel.git
- name: Run the tests
run: |
nosetests -v jupyter_server
pytest
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ script:
else
true
fi
- 'if [[ $GROUP == python ]]; then nosetests -v jupyter_server; fi'
- 'if [[ $GROUP == python ]]; then pytest; fi'
- |
if [[ $GROUP == docs ]]; then
EXIT_STATUS=0
Expand Down
23 changes: 17 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,18 @@ matrix:
environment:
matrix:
- CONDA_PY: 35
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
CONDA_PY_SPEC: 3.5
CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
- CONDA_PY: 36
CONDA_PY_SPEC: 3.6
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
- CONDA_PY: 37
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
CONDA_PY_SPEC: 3.7
CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
- CONDA_PY: 38
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
CONDA_PY_SPEC: 3.8
# appveyor doesn't come with this directory, so use 37's since we're creating an env anyway
CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"

platform:
- x64
Expand All @@ -20,11 +25,17 @@ build: off

install:
- cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
- cmd: set CONDA_PY=%CONDA_PY%
- cmd: set CONDA_PY_SPEC=%CONDA_PY_SPEC%
- cmd: conda config --set show_channel_urls true
- cmd: conda config --add channels conda-forge
#- cmd: conda update --yes --quiet conda
- cmd: conda install -y pyzmq tornado jupyter_client nbformat nbconvert ipykernel pip nose
- cmd: conda update --yes --quiet conda
- cmd: conda info -a
- cmd: conda create -y -q -n test-env-%CONDA_PY% python=%CONDA_PY_SPEC% pyzmq tornado jupyter_client nbformat nbconvert ipykernel pip nose
- cmd: conda activate test-env-%CONDA_PY%
- cmd: pip install .[test]
# FIXME: Use patch for python 3.8, windows issues (https://github.com/ipython/ipykernel/pull/456) - remove once released
- IF %CONDA_PY% == 38 pip install --upgrade git+https://github.com/ipython/ipykernel.git

test_script:
- nosetests -v jupyter_server --exclude-dir jupyter_server\tests\selenium
- pytest
25 changes: 0 additions & 25 deletions jupyter_server/auth/tests/test_security.py

This file was deleted.

92 changes: 0 additions & 92 deletions jupyter_server/extension/tests/test_extension.py

This file was deleted.

134 changes: 0 additions & 134 deletions jupyter_server/nbconvert/tests/test_nbconvert_handlers.py

This file was deleted.

Loading