Skip to content

Commit

Permalink
Merge pull request #150 from datalayer-contrib/revert-to-py35
Browse files Browse the repository at this point in the history
Revert back to python 3.5 support
  • Loading branch information
Zsailer authored Dec 4, 2019
2 parents 8880ccb + e870a3e commit fac5035
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,16 @@ script:
matrix:
include:
- python: 3.5
env: GROUP=python
- python: 3.6
env: GROUP=python
- python: 3.7
env: GROUP=python
- python: 3.8
env: GROUP=python
- python: 3.5
env: GROUP=docs
- python: 3.6
env: GROUP=docs
- python: 3.7
Expand Down
2 changes: 2 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
name = "jupyter_server"

# Minimal Python version sanity check
if sys.version_info < (3,6):
error = "ERROR: %s requires Python version 3.6 or above." % name
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)

Expand Down Expand Up @@ -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',
],
Expand Down Expand Up @@ -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',
Expand Down

0 comments on commit fac5035

Please sign in to comment.