From fe6498616160f0c4f4777e3d8758aa32a9248646 Mon Sep 17 00:00:00 2001 From: Min RK Date: Thu, 29 Jan 2015 16:47:35 -0800 Subject: [PATCH 1/3] calculate 'all' dependency set after finishing the rest some platform-dependent things were excluded from 'all' --- setup.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index ebee37b28..32d7bf386 100755 --- a/setup.py +++ b/setup.py @@ -264,11 +264,6 @@ if sys.version_info < (3, 3): extras_require['notebook'].extend(extras_require['nbformat']) extras_require['nbconvert'].extend(extras_require['nbformat']) -everything = set() -for deps in extras_require.values(): - everything.update(deps) -extras_require['all'] = everything - install_requires = [] # add readline @@ -278,6 +273,10 @@ if sys.platform == 'darwin': elif sys.platform.startswith('win'): extras_require['terminal'].append('pyreadline>=2.0') +everything = set() +for deps in extras_require.values(): + everything.update(deps) +extras_require['all'] = everything if 'setuptools' in sys.modules: # setup.py develop should check for submodules From 6d9b7c918cabd851ec4b2625a60c47622d783671 Mon Sep 17 00:00:00 2001 From: Min RK Date: Thu, 29 Jan 2015 16:47:55 -0800 Subject: [PATCH 2/3] add terminado as [notebook] dep on non-Windows --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index 32d7bf386..f682fd13f 100755 --- a/setup.py +++ b/setup.py @@ -258,6 +258,9 @@ extras_require = dict( nbconvert = ['pygments', 'jinja2', 'mistune>=0.3.1'] ) +if not sys.platform.startswith('win'): + extras_require['notebook'].append('terminado>=0.3.3') + if sys.version_info < (3, 3): extras_require['test'].append('mock') From f979c3c48ab07ec08fa48ef78768a9a80a1e9592 Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 3 Feb 2015 10:56:26 -0800 Subject: [PATCH 3/3] add terminado to wheel dependencies --- setupbase.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setupbase.py b/setupbase.py index c8c0f62ab..8dff57c4f 100644 --- a/setupbase.py +++ b/setupbase.py @@ -670,9 +670,11 @@ def get_bdist_wheel(): if found: lis.pop(idx) - for pkg in ("gnureadline", "pyreadline", "mock"): + for pkg in ("gnureadline", "pyreadline", "mock", "terminado"): _remove_startswith(requires, pkg) requires.append("gnureadline; sys.platform == 'darwin' and platform.python_implementation == 'CPython'") + requires.append("terminado (>=0.3.3); extra == 'notebook' and sys.platform != 'win32'") + requires.append("terminado (>=0.3.3); extra == 'all' and sys.platform != 'win32'") requires.append("pyreadline (>=2.0); extra == 'terminal' and sys.platform == 'win32' and platform.python_implementation == 'CPython'") requires.append("pyreadline (>=2.0); extra == 'all' and sys.platform == 'win32' and platform.python_implementation == 'CPython'") requires.append("mock; extra == 'test' and python_version < '3.3'")