From b32d62e65aa75a233a81a61d3d1e1619dac5efba Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Wed, 4 Dec 2019 11:10:52 -0600 Subject: [PATCH 1/2] revert back to python 3.5 --- .github/workflows/main.yml | 2 +- .travis.yml | 2 ++ appveyor.yml | 2 ++ setup.py | 5 +++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0ecdb26e3d..d009d1f275 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: [ '3.6', '3.7', '3.8' ] + python-version: [ '3.5', '3.6', '3.7', '3.8' ] steps: - name: Checkout uses: actions/checkout@v1 diff --git a/.travis.yml b/.travis.yml index e54bdc53cd..d2014875b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,6 +52,8 @@ script: matrix: include: + - python: 3.5 + env: GROUP=python - python: 3.6 env: GROUP=python - python: 3.7 diff --git a/appveyor.yml b/appveyor.yml index e9ffcf425b..d3b50146c6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,8 @@ matrix: environment: matrix: + - CONDA_PY: 35 + CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64" - CONDA_PY: 36 CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64" - CONDA_PY: 37 diff --git a/setup.py b/setup.py index 010025f3e5..f78fd6be95 100755 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ # Minimal Python version sanity check if sys.version_info < (3,6): - error = "ERROR: %s requires Python version 3.6 or above." % name + error = "ERROR: %s requires Python version 3.5 or above." % name print(error, file=sys.stderr) sys.exit(1) @@ -67,6 +67,7 @@ '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', ], @@ -94,7 +95,7 @@ 'nbval', 'nose-exclude', 'selenium', 'pytest', 'pytest-cov'], 'test:sys_platform == "win32"': ['nose-exclude'], }, - python_requires = '>=3.6', + python_requires = '>=3.5', entry_points = { 'console_scripts': [ 'jupyter-server = jupyter_server.serverapp:main', From e870a3e3275f96a499fbc7a423c0f6c0ce0c4d6c Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Wed, 4 Dec 2019 12:45:54 -0600 Subject: [PATCH 2/2] set minimal veersion to 3.5 --- .travis.yml | 2 ++ setup.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d2014875b8..85cec18987 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,6 +60,8 @@ matrix: env: GROUP=python - python: 3.8 env: GROUP=python + - python: 3.5 + env: GROUP=docs - python: 3.6 env: GROUP=docs - python: 3.7 diff --git a/setup.py b/setup.py index f78fd6be95..9b76f5dcba 100755 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ name = "jupyter_server" # Minimal Python version sanity check -if sys.version_info < (3,6): +if sys.version_info < (3,5): error = "ERROR: %s requires Python version 3.5 or above." % name print(error, file=sys.stderr) sys.exit(1)