Show More
@@ -263,20 +263,17 b' setuptools_extra_args = {}' | |||||
263 | # setuptools requirements |
|
263 | # setuptools requirements | |
264 |
|
264 | |||
265 | extras_require = dict( |
|
265 | extras_require = dict( | |
266 | parallel = 'pyzmq>=2.1.11', |
|
266 | parallel = ['pyzmq>=2.1.11'], | |
267 | qtconsole = ['pyzmq>=2.1.11', 'pygments'], |
|
267 | qtconsole = ['pyzmq>=2.1.11', 'pygments'], | |
268 | zmq = 'pyzmq>=2.1.11', |
|
268 | zmq = ['pyzmq>=2.1.11'], | |
269 | doc = ['Sphinx>=1.1', 'numpydoc'], |
|
269 | doc = ['Sphinx>=1.1', 'numpydoc'], | |
270 | test = 'nose>=0.10.1', |
|
270 | test = ['nose>=0.10.1'], | |
271 | notebook = ['tornado>=3.1', 'pyzmq>=2.1.11', 'jinja2'], |
|
271 | notebook = ['tornado>=3.1', 'pyzmq>=2.1.11', 'jinja2'], | |
272 | nbconvert = ['pygments', 'jinja2', 'Sphinx>=0.3'] |
|
272 | nbconvert = ['pygments', 'jinja2', 'Sphinx>=0.3'] | |
273 | ) |
|
273 | ) | |
274 | everything = set() |
|
274 | everything = set() | |
275 | for deps in extras_require.values(): |
|
275 | for deps in extras_require.values(): | |
276 | if not isinstance(deps, list): |
|
276 | everything.update(deps) | |
277 | deps = [deps] |
|
|||
278 | for dep in deps: |
|
|||
279 | everything.add(dep) |
|
|||
280 | extras_require['all'] = everything |
|
277 | extras_require['all'] = everything | |
281 | install_requires = [] |
|
278 | install_requires = [] | |
282 | if sys.platform == 'darwin': |
|
279 | if sys.platform == 'darwin': | |
@@ -284,7 +281,6 b" if sys.platform == 'darwin':" | |||||
284 | elif sys.platform.startswith('win'): |
|
281 | elif sys.platform.startswith('win'): | |
285 | # Pyreadline has unicode and Python 3 fixes in 2.0 |
|
282 | # Pyreadline has unicode and Python 3 fixes in 2.0 | |
286 | install_requires.append('pyreadline>=2.0') |
|
283 | install_requires.append('pyreadline>=2.0') | |
287 |
|
||||
288 |
|
284 | |||
289 | if 'setuptools' in sys.modules: |
|
285 | if 'setuptools' in sys.modules: | |
290 | # setup.py develop should check for submodules |
|
286 | # setup.py develop should check for submodules |
General Comments 0
You need to be logged in to leave comments.
Login now