##// END OF EJS Templates
Merge pull request #4706 from minrk/irunner...
Thomas Kluyver -
r13859:9a88a54b merge
parent child Browse files
Show More
@@ -0,0 +1,2 b''
1 :mod:`IPython.lib.irunner` and its command-line entry point have been removed.
2 It had fallen out of use long ago. No newline at end of file
@@ -9,7 +9,3 b' def test_import_deepreload():'
9
9
10 def test_import_demo():
10 def test_import_demo():
11 from IPython.lib import demo
11 from IPython.lib import demo
12
13 @dec.skip_win32
14 def test_import_irunner():
15 from IPython.lib import irunner
@@ -201,9 +201,6 b" if not have['matplotlib']:"
201
201
202 # lib:
202 # lib:
203 sec = test_sections['lib']
203 sec = test_sections['lib']
204 if not have['pexpect']:
205 sec.exclude('irunner')
206 sec.exclude('tests.test_irunner')
207 if not have['zmq']:
204 if not have['zmq']:
208 sec.exclude('kernel')
205 sec.exclude('kernel')
209 # We do this unconditionally, so that the test suite doesn't import
206 # We do this unconditionally, so that the test suite doesn't import
@@ -219,8 +216,6 b" sec.exclude('inputhook')"
219
216
220 # testing:
217 # testing:
221 sec = test_sections['testing']
218 sec = test_sections['testing']
222 # This guy is probably attic material
223 sec.exclude('mkdoctests')
224 # These have to be skipped on win32 because they use echo, rm, cd, etc.
219 # These have to be skipped on win32 because they use echo, rm, cd, etc.
225 # See ticket https://github.com/ipython/ipython/issues/87
220 # See ticket https://github.com/ipython/ipython/issues/87
226 if sys.platform == 'win32':
221 if sys.platform == 'win32':
@@ -326,10 +326,8 b' def find_entry_points():'
326 'ipython%s = IPython:start_ipython',
326 'ipython%s = IPython:start_ipython',
327 'ipcontroller%s = IPython.parallel.apps.ipcontrollerapp:launch_new_instance',
327 'ipcontroller%s = IPython.parallel.apps.ipcontrollerapp:launch_new_instance',
328 'ipengine%s = IPython.parallel.apps.ipengineapp:launch_new_instance',
328 'ipengine%s = IPython.parallel.apps.ipengineapp:launch_new_instance',
329 'iplogger%s = IPython.parallel.apps.iploggerapp:launch_new_instance',
330 'ipcluster%s = IPython.parallel.apps.ipclusterapp:launch_new_instance',
329 'ipcluster%s = IPython.parallel.apps.ipclusterapp:launch_new_instance',
331 'iptest%s = IPython.testing.iptestcontroller:main',
330 'iptest%s = IPython.testing.iptestcontroller:main',
332 'irunner%s = IPython.lib.irunner:main',
333 ]
331 ]
334 suffix = str(sys.version_info[0])
332 suffix = str(sys.version_info[0])
335 return [e % '' for e in ep] + [e % suffix for e in ep]
333 return [e % '' for e in ep] + [e % suffix for e in ep]
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now