Show More
@@ -267,9 +267,9 b' class ProfileCreate(BaseIPythonApplication):' | |||||
267 | if app is not None: |
|
267 | if app is not None: | |
268 | apps.append(app) |
|
268 | apps.append(app) | |
269 | if self.parallel: |
|
269 | if self.parallel: | |
270 |
from ipy |
|
270 | from ipyparallel.apps.ipcontrollerapp import IPControllerApp | |
271 |
from ipy |
|
271 | from ipyparallel.apps.ipengineapp import IPEngineApp | |
272 |
from ipy |
|
272 | from ipyparallel.apps.ipclusterapp import IPClusterStart | |
273 | apps.extend([ |
|
273 | apps.extend([ | |
274 | IPControllerApp, |
|
274 | IPControllerApp, | |
275 | IPEngineApp, |
|
275 | IPEngineApp, |
@@ -608,7 +608,7 b' class TestModules(unittest.TestCase, tt.TempFileMixin):' | |||||
608 | """ |
|
608 | """ | |
609 | self.mktmp("import sys\n" |
|
609 | self.mktmp("import sys\n" | |
610 | "print('numpy' in sys.modules)\n" |
|
610 | "print('numpy' in sys.modules)\n" | |
611 |
"print('ipy |
|
611 | "print('ipyparallel' in sys.modules)\n" | |
612 | "print('ipython_kernel' in sys.modules)\n" |
|
612 | "print('ipython_kernel' in sys.modules)\n" | |
613 | ) |
|
613 | ) | |
614 | out = "False\nFalse\nFalse\n" |
|
614 | out = "False\nFalse\nFalse\n" |
@@ -8,7 +8,7 b' import sys' | |||||
8 | from warnings import warn |
|
8 | from warnings import warn | |
9 |
|
9 | |||
10 | warn("The `IPython.parallel` package has been deprecated. " |
|
10 | warn("The `IPython.parallel` package has been deprecated. " | |
11 |
"You should import from ipy |
|
11 | "You should import from ipyparallel instead.") | |
12 |
|
12 | |||
13 | from IPython.utils.shimmodule import ShimModule |
|
13 | from IPython.utils.shimmodule import ShimModule | |
14 |
|
14 | |||
@@ -16,5 +16,5 b' from IPython.utils.shimmodule import ShimModule' | |||||
16 | # trigger the custom attribute access above |
|
16 | # trigger the custom attribute access above | |
17 |
|
17 | |||
18 | sys.modules['IPython.parallel'] = ShimModule( |
|
18 | sys.modules['IPython.parallel'] = ShimModule( | |
19 |
src='IPython.parallel', mirror='ipy |
|
19 | src='IPython.parallel', mirror='ipyparallel') | |
20 |
|
20 |
@@ -1,4 +1,4 b'' | |||||
1 | from warnings import warn |
|
1 | from warnings import warn | |
2 |
|
2 | |||
3 |
warn("IPython.utils.daemonize has moved to ipy |
|
3 | warn("IPython.utils.daemonize has moved to ipyparallel.apps.daemonize") | |
4 |
from ipy |
|
4 | from ipyparallel.apps.daemonize import daemonize |
@@ -4,4 +4,4 b'' | |||||
4 | Using IPython for parallel computing |
|
4 | Using IPython for parallel computing | |
5 | ==================================== |
|
5 | ==================================== | |
6 |
|
6 | |||
7 |
IPython.parallel has moved to `ipy |
|
7 | IPython.parallel has moved to `ipyparallel <https://github.com/ipython/ipyparallel>`_. |
@@ -201,7 +201,7 b' setuptools_extra_args = {}' | |||||
201 | pyzmq = 'pyzmq>=13' |
|
201 | pyzmq = 'pyzmq>=13' | |
202 |
|
202 | |||
203 | extras_require = dict( |
|
203 | extras_require = dict( | |
204 |
parallel = ['ipy |
|
204 | parallel = ['ipyparallel'], | |
205 | qtconsole = ['jupyter_qtconsole'], |
|
205 | qtconsole = ['jupyter_qtconsole'], | |
206 | doc = ['Sphinx>=1.1', 'numpydoc'], |
|
206 | doc = ['Sphinx>=1.1', 'numpydoc'], | |
207 | test = ['nose>=0.10.1', 'requests'], |
|
207 | test = ['nose>=0.10.1', 'requests'], |
General Comments 0
You need to be logged in to leave comments.
Login now