mirror of
https://github.com/jupyter/notebook.git
synced 2025-04-24 14:20:54 +08:00
remove ipython_parallel
This commit is contained in:
parent
d8778e4712
commit
1c20a2baae
@ -145,7 +145,7 @@ have['zmq'] = test_for('zmq.pyzmq_version_info', min_zmq, callback=lambda x: x()
|
||||
# Test suite definitions
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
test_group_names = ['parallel', 'config', 'core',
|
||||
test_group_names = ['core',
|
||||
'extensions', 'lib', 'terminal', 'testing', 'utils',
|
||||
'qt', 'html', 'nbconvert'
|
||||
]
|
||||
@ -171,8 +171,6 @@ class TestSection(object):
|
||||
return self.enabled and all(have[p] for p in self.dependencies)
|
||||
|
||||
shims = {
|
||||
'parallel': 'ipython_parallel',
|
||||
'config': 'traitlets',
|
||||
'html': 'jupyter_notebook',
|
||||
}
|
||||
|
||||
@ -219,13 +217,6 @@ if sys.platform == 'win32':
|
||||
if (not have['pexpect']) or (not have['zmq']):
|
||||
test_sections['terminal'].exclude('console')
|
||||
|
||||
# parallel
|
||||
sec = test_sections['parallel']
|
||||
sec.requires('zmq')
|
||||
if not have['pymongo']:
|
||||
sec.exclude('controller.mongodb')
|
||||
sec.exclude('tests.test_mongodb')
|
||||
|
||||
# extensions:
|
||||
sec = test_sections['extensions']
|
||||
# This is deprecated in favour of rpy2
|
||||
|
@ -451,7 +451,6 @@ def prepare_controllers(options):
|
||||
py_testgroups = py_test_group_names
|
||||
if not options.all:
|
||||
js_testgroups = []
|
||||
test_sections['parallel'].enabled = False
|
||||
else:
|
||||
js_testgroups = all_js_groups()
|
||||
|
||||
@ -558,8 +557,7 @@ def run_iptestall(options):
|
||||
is passed, one process is used per CPU core. Default 1 (i.e. sequential)
|
||||
|
||||
inc_slow : bool
|
||||
Include slow tests, like IPython.parallel. By default, these tests aren't
|
||||
run.
|
||||
Include slow tests. By default, these tests aren't run.
|
||||
|
||||
slimerjs : bool
|
||||
Use slimerjs if it's installed instead of phantomjs for casperjs tests.
|
||||
|
21
setup.py
21
setup.py
@ -145,28 +145,9 @@ if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):
|
||||
# List of things to be updated. Each entry is a triplet of args for
|
||||
# target_update()
|
||||
to_update = [
|
||||
# FIXME - Disabled for now: we need to redo an automatic way
|
||||
# of generating the magic info inside the rst.
|
||||
#('docs/magic.tex',
|
||||
#['IPython/Magic.py'],
|
||||
#"cd doc && ./update_magic.sh" ),
|
||||
|
||||
('docs/man/ipcluster.1.gz',
|
||||
['docs/man/ipcluster.1'],
|
||||
'cd docs/man && gzip -9c ipcluster.1 > ipcluster.1.gz'),
|
||||
|
||||
('docs/man/ipcontroller.1.gz',
|
||||
['docs/man/ipcontroller.1'],
|
||||
'cd docs/man && gzip -9c ipcontroller.1 > ipcontroller.1.gz'),
|
||||
|
||||
('docs/man/ipengine.1.gz',
|
||||
['docs/man/ipengine.1'],
|
||||
'cd docs/man && gzip -9c ipengine.1 > ipengine.1.gz'),
|
||||
|
||||
('docs/man/ipython.1.gz',
|
||||
['docs/man/ipython.1'],
|
||||
'cd docs/man && gzip -9c ipython.1 > ipython.1.gz'),
|
||||
|
||||
]
|
||||
|
||||
|
||||
@ -266,7 +247,7 @@ setuptools_extra_args = {}
|
||||
pyzmq = 'pyzmq>=13'
|
||||
|
||||
extras_require = dict(
|
||||
parallel = [pyzmq],
|
||||
parallel = ['ipython_parallel'],
|
||||
qtconsole = [pyzmq, 'pygments'],
|
||||
doc = ['Sphinx>=1.1', 'numpydoc'],
|
||||
test = ['nose>=0.10.1', 'requests'],
|
||||
|
@ -375,9 +375,6 @@ def find_entry_points():
|
||||
"""
|
||||
ep = [
|
||||
'ipython%s = IPython:start_ipython',
|
||||
'ipcontroller%s = IPython.parallel.apps.ipcontrollerapp:launch_new_instance',
|
||||
'ipengine%s = IPython.parallel.apps.ipengineapp:launch_new_instance',
|
||||
'ipcluster%s = IPython.parallel.apps.ipclusterapp:launch_new_instance',
|
||||
'iptest%s = IPython.testing.iptestcontroller:main',
|
||||
]
|
||||
suffix = str(sys.version_info[0])
|
||||
|
Loading…
x
Reference in New Issue
Block a user