mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-03-13 13:17:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update setup.py to not use 2to3

Browse Source
This commit is contained in:
Thomas Kluyver 2013-08-19 13:14:54 -07:00
parent f65b3a1495
commit 27c8c81c05
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
setup.py
View File

@ -51,10 +51,6 @@ if os.path.exists('MANIFEST'): os.remove('MANIFEST')
from distutils.core import setup
# On Python 3, we need distribute (new setuptools) to do the 2to3 conversion
if PY3:
import setuptools
# Our own imports
from setupbase import target_update
@ -266,7 +262,7 @@ if 'setuptools' in sys.modules:
setup_args['cmdclass']['develop'] = require_submodules(develop)
setuptools_extra_args['zip_safe'] = False
setuptools_extra_args['entry_points'] = find_scripts(True)
setuptools_extra_args['entry_points'] = find_scripts(True, suffix = '3' if PY3 else '')
setup_args['extras_require'] = dict(
parallel = 'pyzmq>=2.1.11',
qtconsole = ['pyzmq>=2.1.11', 'pygments'],
@ -314,29 +310,12 @@ if 'setuptools' in sys.modules:
{"install_script":
"ipython_win_post_install.py"}}
if PY3:
setuptools_extra_args['use_2to3'] = True
# we try to make a 2.6, 2.7, and 3.1 to 3.3 python compatible code
# so we explicitly disable some 2to3 fixes to be sure we aren't forgetting
# anything.
setuptools_extra_args['use_2to3_exclude_fixers'] = [
'lib2to3.fixes.fix_apply',
'lib2to3.fixes.fix_except',
'lib2to3.fixes.fix_has_key',
'lib2to3.fixes.fix_next',
'lib2to3.fixes.fix_repr',
'lib2to3.fixes.fix_tuple_params',
]
from setuptools.command.build_py import build_py
setup_args['cmdclass'] = {'build_py': git_prebuild('IPython', build_cmd=build_py)}
setuptools_extra_args['entry_points'] = find_scripts(True, suffix='3')
setuptools._dont_write_bytecode = True
else:
# If we are running without setuptools, call this function which will
# check for dependencies an inform the user what is needed. This is
# just to make life easy for users.
check_for_dependencies()
setup_args['scripts'] = find_scripts(False)
setup_args['scripts'] = find_scripts(False, suffix = '3' if PY3 else '')
#---------------------------------------------------------------------------
# Do the actual setup now