Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Make ipython-qtconsole a GUI script #422

Merged
merged 2 commits into from

2 participants

@epatters

The 'ipython-qtconsole' script is now configured as a GUI script in setuptools.

This only really matters on Windows: it ensures that pythonw is used for the script. This is not a big deal for developers but is a good thing to have for the 0.11 release, I think.

@minrk
Owner

I see no problem with this other than possibly the copying of find_scripts to find_gui_scripts. Our setup code for finding packages and scripts is ludicrously complicated at this point, resulting in the just about every new package or script not being properly installed under some circumstances for weeks or months after being added. Maybe implement this inside one find_scripts method that returns:

if entry_points:
    return {'console_scripts' : [cscripts], 'gui_scripts' : [gscripts]}}
else:
    return [allscripts]

So we can just do:

setuptools_extra_args['entry_points'] = find_scripts(True)
#...
 setup_args['scripts'] = find_scripts(False)
@epatters

Yes, that is better. Will do when I get a chance.

@epatters

@minrk
Look good?

@minrk
Owner

yes, great. Go ahead and merge.

@epatters epatters merged commit c2b156d into ipython:master
@ellisonbg ellisonbg referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@damianavila damianavila referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 9, 2011
  1. @epatters
Commits on May 10, 2011
  1. @epatters
This page is out of date. Refresh to see the latest.
Showing with 7 additions and 8 deletions.
  1. +1 −3 setup.py
  2. +6 −5 setupbase.py
View
4 setup.py
@@ -210,9 +210,7 @@ def cleanup():
if 'setuptools' in sys.modules:
setuptools_extra_args['zip_safe'] = False
- setuptools_extra_args['entry_points'] = {
- 'console_scripts': find_scripts(True)
- }
+ setuptools_extra_args['entry_points'] = find_scripts(True)
setup_args['extras_require'] = dict(
parallel = 'pyzmq>=2.1.4',
zmq = 'pyzmq>=2.0.10.1',
View
11 setupbase.py
@@ -267,12 +267,10 @@ def find_scripts(entry_points=False):
return setuptools entry_point-style definitions
else:
return file paths of plain scripts [default]
-
"""
if entry_points:
- scripts = [
+ console_scripts = [
'ipython = IPython.frontend.terminal.ipapp:launch_new_instance',
- 'ipython-qtconsole = IPython.frontend.qt.console.ipythonqt:main',
'pycolor = IPython.utils.PyColorize:main',
'ipcontroller = IPython.parallel.apps.ipcontrollerapp:launch_new_instance',
'ipengine = IPython.parallel.apps.ipengineapp:launch_new_instance',
@@ -281,6 +279,10 @@ def find_scripts(entry_points=False):
'iptest = IPython.testing.iptest:main',
'irunner = IPython.lib.irunner:main'
]
+ gui_scripts = [
+ 'ipython-qtconsole = IPython.frontend.qt.console.ipythonqt:main',
+ ]
+ scripts = dict(console_scripts=console_scripts, gui_scripts=gui_scripts)
else:
parallel_scripts = pjoin('IPython','parallel','scripts')
main_scripts = pjoin('IPython','scripts')
@@ -294,8 +296,7 @@ def find_scripts(entry_points=False):
pjoin(main_scripts, 'pycolor'),
pjoin(main_scripts, 'irunner'),
pjoin(main_scripts, 'iptest')
- ]
-
+ ]
return scripts
#---------------------------------------------------------------------------
Something went wrong with that request. Please try again.