##// END OF EJS Templates
Make ipython-qtconsole a GUI script in setuptools.
Evan Patterson -
Show More
@@ -58,6 +58,7 b' from setupbase import ('
58 find_packages,
58 find_packages,
59 find_package_data,
59 find_package_data,
60 find_scripts,
60 find_scripts,
61 find_gui_scripts,
61 find_data_files,
62 find_data_files,
62 check_for_dependencies,
63 check_for_dependencies,
63 record_commit_info,
64 record_commit_info,
@@ -211,7 +212,8 b' setuptools_extra_args = {}'
211 if 'setuptools' in sys.modules:
212 if 'setuptools' in sys.modules:
212 setuptools_extra_args['zip_safe'] = False
213 setuptools_extra_args['zip_safe'] = False
213 setuptools_extra_args['entry_points'] = {
214 setuptools_extra_args['entry_points'] = {
214 'console_scripts': find_scripts(True)
215 'console_scripts': find_scripts(True),
216 'gui_scripts': find_gui_scripts(True),
215 }
217 }
216 setup_args['extras_require'] = dict(
218 setup_args['extras_require'] = dict(
217 parallel = 'pyzmq>=2.1.4',
219 parallel = 'pyzmq>=2.1.4',
@@ -245,7 +247,7 b' else:'
245 # check for dependencies an inform the user what is needed. This is
247 # check for dependencies an inform the user what is needed. This is
246 # just to make life easy for users.
248 # just to make life easy for users.
247 check_for_dependencies()
249 check_for_dependencies()
248 setup_args['scripts'] = find_scripts(False)
250 setup_args['scripts'] = find_scripts(False) + find_gui_scripts(False)
249
251
250 #---------------------------------------------------------------------------
252 #---------------------------------------------------------------------------
251 # Do the actual setup now
253 # Do the actual setup now
@@ -267,12 +267,10 b' def find_scripts(entry_points=False):'
267 return setuptools entry_point-style definitions
267 return setuptools entry_point-style definitions
268 else:
268 else:
269 return file paths of plain scripts [default]
269 return file paths of plain scripts [default]
270
271 """
270 """
272 if entry_points:
271 if entry_points:
273 scripts = [
272 scripts = [
274 'ipython = IPython.frontend.terminal.ipapp:launch_new_instance',
273 'ipython = IPython.frontend.terminal.ipapp:launch_new_instance',
275 'ipython-qtconsole = IPython.frontend.qt.console.ipythonqt:main',
276 'pycolor = IPython.utils.PyColorize:main',
274 'pycolor = IPython.utils.PyColorize:main',
277 'ipcontroller = IPython.parallel.apps.ipcontrollerapp:launch_new_instance',
275 'ipcontroller = IPython.parallel.apps.ipcontrollerapp:launch_new_instance',
278 'ipengine = IPython.parallel.apps.ipengineapp:launch_new_instance',
276 'ipengine = IPython.parallel.apps.ipengineapp:launch_new_instance',
@@ -290,12 +288,30 b' def find_scripts(entry_points=False):'
290 pjoin(parallel_scripts, 'ipcluster'),
288 pjoin(parallel_scripts, 'ipcluster'),
291 pjoin(parallel_scripts, 'iplogger'),
289 pjoin(parallel_scripts, 'iplogger'),
292 pjoin(main_scripts, 'ipython'),
290 pjoin(main_scripts, 'ipython'),
293 pjoin(main_scripts, 'ipython-qtconsole'),
294 pjoin(main_scripts, 'pycolor'),
291 pjoin(main_scripts, 'pycolor'),
295 pjoin(main_scripts, 'irunner'),
292 pjoin(main_scripts, 'irunner'),
296 pjoin(main_scripts, 'iptest')
293 pjoin(main_scripts, 'iptest')
297 ]
294 ]
295 return scripts
296
297 def find_gui_scripts(entry_points=False):
298 """Find IPython's GUI scripts.
298
299
300 if entry_points is True:
301 return setuptools entry_point-style definitions
302 else:
303 return file paths of plain scripts [default]
304 """
305 if entry_points:
306 scripts = [
307 'ipython-qtconsole = IPython.frontend.qt.console.ipythonqt:main',
308 ]
309 else:
310 parallel_scripts = pjoin('IPython','parallel','scripts')
311 main_scripts = pjoin('IPython','scripts')
312 scripts = [
313 pjoin(main_scripts, 'ipython-qtconsole'),
314 ]
299 return scripts
315 return scripts
300
316
301 #---------------------------------------------------------------------------
317 #---------------------------------------------------------------------------
General Comments 0
You need to be logged in to leave comments. Login now