##// END OF EJS Templates
Merge pull request #1624 from takluyver/i1470...
Fernando Perez -
r6552:7c0a10bd merge
parent child Browse files
Show More
@@ -1,4 +1,4 b''
1 # encoding: iso-8859-5
1 # coding: iso-8859-5
2 # (Unlikely to be the default encoding for most testers.)
2 # (Unlikely to be the default encoding for most testers.)
3 # ������������������� <- Cyrillic characters
3 # ������������������� <- Cyrillic characters
4 from __future__ import unicode_literals
4 from __future__ import unicode_literals
@@ -237,6 +237,7 b" if 'setuptools' in sys.modules:"
237 from setuptools.command.build_py import build_py
237 from setuptools.command.build_py import build_py
238 setup_args['cmdclass'] = {'build_py': record_commit_info('IPython', build_cmd=build_py)}
238 setup_args['cmdclass'] = {'build_py': record_commit_info('IPython', build_cmd=build_py)}
239 setuptools_extra_args['entry_points'] = find_scripts(True, suffix='3')
239 setuptools_extra_args['entry_points'] = find_scripts(True, suffix='3')
240 setuptools._dont_write_bytecode = True
240 else:
241 else:
241 # If we are running without setuptools, call this function which will
242 # If we are running without setuptools, call this function which will
242 # check for dependencies an inform the user what is needed. This is
243 # check for dependencies an inform the user what is needed. This is
General Comments 0
You need to be logged in to leave comments. Login now