##// END OF EJS Templates
always construct requirements
MinRK -
Show More
@@ -67,6 +67,7 b' from setupbase import ('
67 update_submodules,
67 update_submodules,
68 require_submodules,
68 require_submodules,
69 UpdateSubmodules,
69 UpdateSubmodules,
70 get_bdist_wheel,
70 CompileCSS,
71 CompileCSS,
71 JavascriptVersion,
72 JavascriptVersion,
72 install_symlinked,
73 install_symlinked,
@@ -242,8 +243,8 b" setup_args['cmdclass'] = {"
242 # For some commands, use setuptools. Note that we do NOT list install here!
243 # For some commands, use setuptools. Note that we do NOT list install here!
243 # If you want a setuptools-enhanced install, just run 'setupegg.py install'
244 # If you want a setuptools-enhanced install, just run 'setupegg.py install'
244 needs_setuptools = set(('develop', 'release', 'bdist_egg', 'bdist_rpm',
245 needs_setuptools = set(('develop', 'release', 'bdist_egg', 'bdist_rpm',
245 'bdist', 'bdist_dumb', 'bdist_wininst', 'install_egg_info',
246 'bdist', 'bdist_dumb', 'bdist_wininst', 'bdist_wheel',
246 'egg_info', 'easy_install', 'upload',
247 'egg_info', 'easy_install', 'upload', 'install_egg_info',
247 ))
248 ))
248 if sys.platform == 'win32':
249 if sys.platform == 'win32':
249 # Depend on setuptools for install on *Windows only*
250 # Depend on setuptools for install on *Windows only*
@@ -259,43 +260,42 b' if len(needs_setuptools.intersection(sys.argv)) > 0:'
259 # specific to setup
260 # specific to setup
260 setuptools_extra_args = {}
261 setuptools_extra_args = {}
261
262
263 # setuptools requirements
264
265 extras_require = dict(
266 parallel = 'pyzmq>=2.1.11',
267 qtconsole = ['pyzmq>=2.1.11', 'pygments'],
268 zmq = 'pyzmq>=2.1.11',
269 doc = ['Sphinx>=1.1', 'numpydoc'],
270 test = 'nose>=0.10.1',
271 notebook = ['tornado>=3.1', 'pyzmq>=2.1.11', 'jinja2'],
272 nbconvert = ['pygments', 'jinja2', 'Sphinx>=0.3']
273 )
274 everything = set()
275 for deps in extras_require.values():
276 if not isinstance(deps, list):
277 deps = [deps]
278 for dep in deps:
279 everything.add(dep)
280 extras_require['all'] = everything
281 install_requires = []
282 if sys.platform == 'darwin':
283 install_requires.append('readline')
284 elif sys.platform.startswith('win'):
285 # Pyreadline has unicode and Python 3 fixes in 2.0
286 install_requires.append('pyreadline>=2.0')
287
288
262 if 'setuptools' in sys.modules:
289 if 'setuptools' in sys.modules:
263 # setup.py develop should check for submodules
290 # setup.py develop should check for submodules
264 from setuptools.command.develop import develop
291 from setuptools.command.develop import develop
265 setup_args['cmdclass']['develop'] = require_submodules(develop)
292 setup_args['cmdclass']['develop'] = require_submodules(develop)
293 setup_args['cmdclass']['bdist_wheel'] = get_bdist_wheel()
266
294
267 setuptools_extra_args['zip_safe'] = False
295 setuptools_extra_args['zip_safe'] = False
268 setuptools_extra_args['entry_points'] = {'console_scripts':find_entry_points()}
296 setuptools_extra_args['entry_points'] = {'console_scripts':find_entry_points()}
269 setup_args['extras_require'] = dict(
297 setup_args['extras_require'] = extras_require
270 parallel = 'pyzmq>=2.1.11',
298 requires = setup_args['install_requires'] = install_requires
271 qtconsole = ['pyzmq>=2.1.11', 'pygments'],
272 zmq = 'pyzmq>=2.1.11',
273 doc = ['Sphinx>=1.1', 'numpydoc'],
274 test = 'nose>=0.10.1',
275 notebook = ['tornado>=3.1', 'pyzmq>=2.1.11', 'jinja2'],
276 nbconvert = ['pygments', 'jinja2', 'Sphinx>=0.3']
277 )
278 everything = set()
279 for deps in setup_args['extras_require'].values():
280 if not isinstance(deps, list):
281 deps = [deps]
282 for dep in deps:
283 everything.add(dep)
284 setup_args['extras_require']['all'] = everything
285
286 requires = setup_args.setdefault('install_requires', [])
287 setupext.display_status = False
288 if not setupext.check_for_readline():
289 if sys.platform == 'darwin':
290 requires.append('readline')
291 elif sys.platform.startswith('win'):
292 # Pyreadline 64 bit windows issue solved in versions >=1.7.1
293 # Also solves issues with some older versions of pyreadline that
294 # satisfy the unconstrained depdendency.
295 requires.append('pyreadline>=1.7.1')
296 else:
297 pass
298 # do we want to install readline here?
299
299
300 # Script to be run by the windows binary installer after the default setup
300 # Script to be run by the windows binary installer after the default setup
301 # routine, to add shortcuts and similar windows-only things. Windows
301 # routine, to add shortcuts and similar windows-only things. Windows
General Comments 0
You need to be logged in to leave comments. Login now