Show More
@@ -51,10 +51,6 b" if os.path.exists('MANIFEST'): os.remove('MANIFEST')" | |||||
51 |
|
51 | |||
52 | from distutils.core import setup |
|
52 | from distutils.core import setup | |
53 |
|
53 | |||
54 | # On Python 3, we need distribute (new setuptools) to do the 2to3 conversion |
|
|||
55 | if PY3: |
|
|||
56 | import setuptools |
|
|||
57 |
|
||||
58 | # Our own imports |
|
54 | # Our own imports | |
59 | from setupbase import target_update |
|
55 | from setupbase import target_update | |
60 |
|
56 | |||
@@ -266,7 +262,7 b" if 'setuptools' in sys.modules:" | |||||
266 | setup_args['cmdclass']['develop'] = require_submodules(develop) |
|
262 | setup_args['cmdclass']['develop'] = require_submodules(develop) | |
267 |
|
263 | |||
268 | setuptools_extra_args['zip_safe'] = False |
|
264 | setuptools_extra_args['zip_safe'] = False | |
269 | setuptools_extra_args['entry_points'] = find_scripts(True) |
|
265 | setuptools_extra_args['entry_points'] = find_scripts(True, suffix = '3' if PY3 else '') | |
270 | setup_args['extras_require'] = dict( |
|
266 | setup_args['extras_require'] = dict( | |
271 | parallel = 'pyzmq>=2.1.11', |
|
267 | parallel = 'pyzmq>=2.1.11', | |
272 | qtconsole = ['pyzmq>=2.1.11', 'pygments'], |
|
268 | qtconsole = ['pyzmq>=2.1.11', 'pygments'], | |
@@ -314,29 +310,12 b" if 'setuptools' in sys.modules:" | |||||
314 | {"install_script": |
|
310 | {"install_script": | |
315 | "ipython_win_post_install.py"}} |
|
311 | "ipython_win_post_install.py"}} | |
316 |
|
312 | |||
317 | if PY3: |
|
|||
318 | setuptools_extra_args['use_2to3'] = True |
|
|||
319 | # we try to make a 2.6, 2.7, and 3.1 to 3.3 python compatible code |
|
|||
320 | # so we explicitly disable some 2to3 fixes to be sure we aren't forgetting |
|
|||
321 | # anything. |
|
|||
322 | setuptools_extra_args['use_2to3_exclude_fixers'] = [ |
|
|||
323 | 'lib2to3.fixes.fix_apply', |
|
|||
324 | 'lib2to3.fixes.fix_except', |
|
|||
325 | 'lib2to3.fixes.fix_has_key', |
|
|||
326 | 'lib2to3.fixes.fix_next', |
|
|||
327 | 'lib2to3.fixes.fix_repr', |
|
|||
328 | 'lib2to3.fixes.fix_tuple_params', |
|
|||
329 | ] |
|
|||
330 | from setuptools.command.build_py import build_py |
|
|||
331 | setup_args['cmdclass'] = {'build_py': git_prebuild('IPython', build_cmd=build_py)} |
|
|||
332 | setuptools_extra_args['entry_points'] = find_scripts(True, suffix='3') |
|
|||
333 | setuptools._dont_write_bytecode = True |
|
|||
334 | else: |
|
313 | else: | |
335 | # If we are running without setuptools, call this function which will |
|
314 | # If we are running without setuptools, call this function which will | |
336 | # check for dependencies an inform the user what is needed. This is |
|
315 | # check for dependencies an inform the user what is needed. This is | |
337 | # just to make life easy for users. |
|
316 | # just to make life easy for users. | |
338 | check_for_dependencies() |
|
317 | check_for_dependencies() | |
339 | setup_args['scripts'] = find_scripts(False) |
|
318 | setup_args['scripts'] = find_scripts(False, suffix = '3' if PY3 else '') | |
340 |
|
319 | |||
341 | #--------------------------------------------------------------------------- |
|
320 | #--------------------------------------------------------------------------- | |
342 | # Do the actual setup now |
|
321 | # Do the actual setup now |
General Comments 0
You need to be logged in to leave comments.
Login now