From cf28a1fa941542023656a19a5cf308cbe7d93312 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 22 Apr 2017 14:18:12 -0400 Subject: [PATCH] Travis changes for using proper ipykernel for Python2 --- setup.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 91d064f8..1cec5d83 100644 --- a/setup.py +++ b/setup.py @@ -3,6 +3,7 @@ from setuptools import find_packages, setup +PY2 = (sys.version_info[0] == 2) with io.open('metakernel/__init__.py', encoding='utf-8') as fid: for line in fid: @@ -10,6 +11,12 @@ version = line.strip().split()[-1][1:-1] break +if PY2: + ipykernel_requires = "ipykernel (< 6.0)" + ipykernel_install_requires = "ipykernel<6.0" +else: + ipykernel_requires = "ipykernel" + ipykernel_install_requires = "ipykernel" setup(name='metakernel', version=version, @@ -18,8 +25,8 @@ author='Steven Silvester', author_email='steven.silvester@ieee.org', url='https://github.com/Calysto/metakernel', - requires=['ipykernel', 'pexpect (>= 4.2)'], - install_requires=['ipykernel', 'pexpect>=4.2'], + requires=[ipykernel_requires, 'pexpect (>= 4.2)'], + install_requires=[ipykernel_install_requires, 'pexpect>=4.2'], packages=find_packages(include=['metakernel', 'metakernel.*']), package_data={'metakernel': ['images/*.png']}, classifiers=[