mirror of
https://github.com/jupyter/notebook.git
synced 2025-01-30 12:11:32 +08:00
calculate 'all' dependency set after finishing the rest
some platform-dependent things were excluded from 'all'
This commit is contained in:
parent
7ce360aa6b
commit
fe64986161
9
setup.py
9
setup.py
@ -264,11 +264,6 @@ if sys.version_info < (3, 3):
|
|||||||
extras_require['notebook'].extend(extras_require['nbformat'])
|
extras_require['notebook'].extend(extras_require['nbformat'])
|
||||||
extras_require['nbconvert'].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 = []
|
install_requires = []
|
||||||
|
|
||||||
# add readline
|
# add readline
|
||||||
@ -278,6 +273,10 @@ if sys.platform == 'darwin':
|
|||||||
elif sys.platform.startswith('win'):
|
elif sys.platform.startswith('win'):
|
||||||
extras_require['terminal'].append('pyreadline>=2.0')
|
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:
|
if 'setuptools' in sys.modules:
|
||||||
# setup.py develop should check for submodules
|
# setup.py develop should check for submodules
|
||||||
|
Loading…
Reference in New Issue
Block a user