Merge pull request #4706 from minrk/irunner

remove irunner, iplogger
Thomas Kluyver 12 years ago
commit d5d3cdb4e4

@ -201,9 +201,6 @@ if not have['matplotlib']:
# lib:
sec = test_sections['lib']
if not have['pexpect']:
sec.exclude('irunner')
sec.exclude('tests.test_irunner')
if not have['zmq']:
sec.exclude('kernel')
# We do this unconditionally, so that the test suite doesn't import
@ -219,8 +216,6 @@ sec.exclude('inputhook')
# testing:
sec = test_sections['testing']
# This guy is probably attic material
sec.exclude('mkdoctests')
# These have to be skipped on win32 because they use echo, rm, cd, etc.
# See ticket https://github.com/ipython/ipython/issues/87
if sys.platform == 'win32':

@ -326,10 +326,8 @@ def find_entry_points():
'ipython%s = IPython:start_ipython',
'ipcontroller%s = IPython.parallel.apps.ipcontrollerapp:launch_new_instance',
'ipengine%s = IPython.parallel.apps.ipengineapp:launch_new_instance',
'iplogger%s = IPython.parallel.apps.iploggerapp:launch_new_instance',
'ipcluster%s = IPython.parallel.apps.ipclusterapp:launch_new_instance',
'iptest%s = IPython.testing.iptestcontroller:main',
'irunner%s = IPython.lib.irunner:main',
]
suffix = str(sys.version_info[0])
return [e % '' for e in ep] + [e % suffix for e in ep]

Loading…
Cancel
Save