Skip to content

Commit

Permalink
Merge pull request #979 from MSeal/pythonVersionShift
Browse files Browse the repository at this point in the history
Removed python 3.4 support, added 3.7 to tests
  • Loading branch information
takluyver authored Apr 5, 2019
2 parents 1fc3968 + afbc4a8 commit e95597f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
21 changes: 11 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@
# needs these two lines:
sudo: required
dist: trusty

language: python
python:
- "nightly"
- 3.6
- 3.5
- 3.4
- 2.7

matrix:
include:
- python: 2.7
- python: 3.5
- python: 3.6
- python: 3.7
dist: xenial # required for Python 3.7 (travis-ci/travis-ci#9069)
- python: nightly
allow_failures:
- python: nightly
env:
global:
- PATH=$TRAVIS_BUILD_DIR/bin:$PATH
Expand Down Expand Up @@ -38,6 +42,3 @@ script:
- py.test --cov nbconvert -v --pyargs nbconvert
after_success:
- codecov
matrix:
allow_failures:
- python: "nightly"
7 changes: 3 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import sys

v = sys.version_info
if v[:2] < (2,7) or (v[0] >= 3 and v[:2] < (3,4)):
error = "ERROR: %s requires Python version 2.7 or 3.4 or above." % name
if v[:2] < (2,7) or (v[0] >= 3 and v[:2] < (3,5)):
error = "ERROR: %s requires Python version 2.7 or 3.5 or above." % name
print(error, file=sys.stderr)
sys.exit(1)

Expand Down Expand Up @@ -169,7 +169,7 @@ def run(self):
long_description= long_description,
package_data = package_data,
cmdclass = cmdclass,
python_requires = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
python_requires = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
author = 'Jupyter Development Team',
author_email = 'jupyter@googlegroups.com',
url = 'https://jupyter.org',
Expand All @@ -190,7 +190,6 @@ def run(self):
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
Expand Down

0 comments on commit e95597f

Please sign in to comment.