Show More
@@ -258,17 +258,15 b' extras_require = dict(' | |||||
258 | nbconvert = ['pygments', 'jinja2', 'mistune>=0.3.1'] |
|
258 | nbconvert = ['pygments', 'jinja2', 'mistune>=0.3.1'] | |
259 | ) |
|
259 | ) | |
260 |
|
260 | |||
|
261 | if not sys.platform.startswith('win'): | |||
|
262 | extras_require['notebook'].append('terminado>=0.3.3') | |||
|
263 | ||||
261 | if sys.version_info < (3, 3): |
|
264 | if sys.version_info < (3, 3): | |
262 | extras_require['test'].append('mock') |
|
265 | extras_require['test'].append('mock') | |
263 |
|
266 | |||
264 | extras_require['notebook'].extend(extras_require['nbformat']) |
|
267 | extras_require['notebook'].extend(extras_require['nbformat']) | |
265 | extras_require['nbconvert'].extend(extras_require['nbformat']) |
|
268 | extras_require['nbconvert'].extend(extras_require['nbformat']) | |
266 |
|
269 | |||
267 | everything = set() |
|
|||
268 | for deps in extras_require.values(): |
|
|||
269 | everything.update(deps) |
|
|||
270 | extras_require['all'] = everything |
|
|||
271 |
|
||||
272 | install_requires = [] |
|
270 | install_requires = [] | |
273 |
|
271 | |||
274 | # add readline |
|
272 | # add readline | |
@@ -278,6 +276,10 b" if sys.platform == 'darwin':" | |||||
278 | elif sys.platform.startswith('win'): |
|
276 | elif sys.platform.startswith('win'): | |
279 | extras_require['terminal'].append('pyreadline>=2.0') |
|
277 | extras_require['terminal'].append('pyreadline>=2.0') | |
280 |
|
278 | |||
|
279 | everything = set() | |||
|
280 | for deps in extras_require.values(): | |||
|
281 | everything.update(deps) | |||
|
282 | extras_require['all'] = everything | |||
281 |
|
283 | |||
282 | if 'setuptools' in sys.modules: |
|
284 | if 'setuptools' in sys.modules: | |
283 | # setup.py develop should check for submodules |
|
285 | # setup.py develop should check for submodules |
@@ -670,9 +670,11 b' def get_bdist_wheel():' | |||||
670 | if found: |
|
670 | if found: | |
671 | lis.pop(idx) |
|
671 | lis.pop(idx) | |
672 |
|
672 | |||
673 | for pkg in ("gnureadline", "pyreadline", "mock"): |
|
673 | for pkg in ("gnureadline", "pyreadline", "mock", "terminado"): | |
674 | _remove_startswith(requires, pkg) |
|
674 | _remove_startswith(requires, pkg) | |
675 | requires.append("gnureadline; sys.platform == 'darwin' and platform.python_implementation == 'CPython'") |
|
675 | requires.append("gnureadline; sys.platform == 'darwin' and platform.python_implementation == 'CPython'") | |
|
676 | requires.append("terminado (>=0.3.3); extra == 'notebook' and sys.platform != 'win32'") | |||
|
677 | requires.append("terminado (>=0.3.3); extra == 'all' and sys.platform != 'win32'") | |||
676 | requires.append("pyreadline (>=2.0); extra == 'terminal' and sys.platform == 'win32' and platform.python_implementation == 'CPython'") |
|
678 | requires.append("pyreadline (>=2.0); extra == 'terminal' and sys.platform == 'win32' and platform.python_implementation == 'CPython'") | |
677 | requires.append("pyreadline (>=2.0); extra == 'all' and sys.platform == 'win32' and platform.python_implementation == 'CPython'") |
|
679 | requires.append("pyreadline (>=2.0); extra == 'all' and sys.platform == 'win32' and platform.python_implementation == 'CPython'") | |
678 | requires.append("mock; extra == 'test' and python_version < '3.3'") |
|
680 | requires.append("mock; extra == 'test' and python_version < '3.3'") |
General Comments 0
You need to be logged in to leave comments.
Login now