Skip to content

Commit

Permalink
require Python 3.4 for asyncio
Browse files Browse the repository at this point in the history
always use setuptools in setup
  • Loading branch information
minrk committed Sep 5, 2018
1 parent d8abd56 commit 91c780f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ python:
- 3.6
- 3.5
- 3.4
- 2.7
sudo: false
install:
- |
pip install --upgrade setuptools pip
pip install --pre .
pip install ipykernel[test] codecov
- |
if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" || "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then
pip install matplotlib
fi
- pip freeze
Expand Down
11 changes: 5 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@
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] < (3, 4):
error = "ERROR: %s requires Python version 3.4 or above." % name
print(error, file=sys.stderr)
sys.exit(1)

PY3 = (sys.version_info[0] >= 3)

#-----------------------------------------------------------------------------
# get on with it
#-----------------------------------------------------------------------------
Expand Down Expand Up @@ -81,12 +79,12 @@ def run(self):
long_description="The IPython kernel for Jupyter",
platforms="Linux, Mac OS X, Windows",
keywords=['Interactive', 'Interpreter', 'Shell', 'Web'],
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
python_requires='>=3.4',
install_requires=[
'ipython>=4.0.0',
'traitlets>=4.1.0',
'jupyter_client',
'tornado>=4.0',
'tornado>=4.2',
],
extras_require={
'test:python_version=="2.7"': ['mock'],
Expand All @@ -107,6 +105,7 @@ def run(self):
],
)


if any(a.startswith(('bdist', 'build', 'install')) for a in sys.argv):
from ipykernel.kernelspec import write_kernel_spec, make_ipkernel_cmd, KERNEL_NAME

Expand Down

0 comments on commit 91c780f

Please sign in to comment.