From 83d89e989fa8c59d1aa5ffe5fca22708faa6cd07 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Mon, 2 Dec 2019 02:56:20 -0600 Subject: [PATCH 1/4] enforce 3.6 in setup.py --- setup.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 9b76f5dcba..010025f3e5 100755 --- a/setup.py +++ b/setup.py @@ -19,8 +19,8 @@ name = "jupyter_server" # Minimal Python version sanity check -if sys.version_info < (3,5): - error = "ERROR: %s requires Python version 3.5 or above." % name +if sys.version_info < (3,6): + error = "ERROR: %s requires Python version 3.6 or above." % name print(error, file=sys.stderr) sys.exit(1) @@ -67,7 +67,6 @@ 'License :: OSI Approved :: BSD License', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', ], @@ -95,7 +94,7 @@ 'nbval', 'nose-exclude', 'selenium', 'pytest', 'pytest-cov'], 'test:sys_platform == "win32"': ['nose-exclude'], }, - python_requires = '>=3.5', + python_requires = '>=3.6', entry_points = { 'console_scripts': [ 'jupyter-server = jupyter_server.serverapp:main', From 552368772d85015ca2479d1f5bbf21bee15e3af2 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Mon, 2 Dec 2019 04:06:58 -0600 Subject: [PATCH 2/4] update travis and appveyor to run py 3.6, 3.7. and 3.8 --- .travis.yml | 9 +++++---- appveyor.yml | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 36c465bc67..553c284f62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,6 @@ cache: directories: - $HOME/.cache/bower - $HOME/.cache/pip -python: - - 3.6 - env: global: - PATH=$TRAVIS_BUILD_DIR/pandoc:$PATH @@ -57,7 +54,7 @@ script: matrix: include: - - python: 3.5 + - python: 3.6 env: GROUP=python - python: 3.7 env: GROUP=python @@ -65,6 +62,10 @@ matrix: env: GROUP=python - python: 3.6 env: GROUP=docs + - python: 3.7 + env: GROUP=docs + - python: 3.8 + env: GROUP=docs after_success: - codecov diff --git a/appveyor.yml b/appveyor.yml index 657cb23474..5e016248d6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,6 +6,10 @@ environment: matrix: - CONDA_PY: 36 CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64" + - CONDA_PY: 37 + CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64" + - CONDA_PY: 38 + CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64" platform: - x64 From 747e6141dbb60a6c9d2493692f8f7a19bb04f2d7 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Tue, 3 Dec 2019 03:31:40 -0600 Subject: [PATCH 3/4] trigger build --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 553c284f62..84be52c6cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,6 @@ install: - pip freeze - wget https://github.com/jgm/pandoc/releases/download/1.19.1/pandoc-1.19.1-1-amd64.deb && sudo dpkg -i pandoc-1.19.1-1-amd64.deb - script: - jupyter kernelspec list - | @@ -51,7 +50,6 @@ script: exit $EXIT_STATUS fi - matrix: include: - python: 3.6 From f315576769d4b4fa174e944d9b9636a413913e97 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Tue, 3 Dec 2019 03:48:40 -0600 Subject: [PATCH 4/4] disable coverage to avoid systematic failure --- .travis.yml | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 84be52c6cd..e54bdc53cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ script: else true fi - - 'if [[ $GROUP == python ]]; then nosetests -v --with-coverage --cover-package=jupyter_server jupyter_server; fi' + - 'if [[ $GROUP == python ]]; then nosetests -v jupyter_server; fi' - | if [[ $GROUP == docs ]]; then EXIT_STATUS=0 diff --git a/appveyor.yml b/appveyor.yml index 5e016248d6..e9ffcf425b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,4 +25,4 @@ install: - cmd: pip install .[test] test_script: - - nosetests -v jupyter_server --exclude-dir notebook\tests\selenium + - nosetests -v jupyter_server --exclude-dir jupyter_server\tests\selenium