##// END OF EJS Templates
Merge pull request #8231 from minrk/rm-zmq-checks...
Matthias Bussonnier -
r21085:095b3e5a merge
parent child Browse files
Show More
@@ -25,10 +25,6 b' import threading'
25 import webbrowser
25 import webbrowser
26
26
27
27
28 # check for pyzmq
29 from IPython.utils.zmqrelated import check_for_zmq
30 check_for_zmq('13', 'IPython.html')
31
32 from jinja2 import Environment, FileSystemLoader
28 from jinja2 import Environment, FileSystemLoader
33
29
34 # Install the pyzmq ioloop. This has to be done before anything else from
30 # Install the pyzmq ioloop. This has to be done before anything else from
@@ -1,19 +1,8 b''
1 """The IPython ZMQ-based parallel computing interface.
1 """The IPython ZMQ-based parallel computing interface."""
2
2
3 Authors:
3 # Copyright (c) IPython Development Team.
4 # Distributed under the terms of the Modified BSD License.
4
5
5 * MinRK
6 """
7 #-----------------------------------------------------------------------------
8 # Copyright (C) 2011 The IPython Development Team
9 #
10 # Distributed under the terms of the BSD License. The full license is in
11 # the file COPYING, distributed as part of this software.
12 #-----------------------------------------------------------------------------
13
14 #-----------------------------------------------------------------------------
15 # Imports
16 #-----------------------------------------------------------------------------
17
6
18 import os
7 import os
19 import warnings
8 import warnings
@@ -21,11 +10,6 b' import warnings'
21 import zmq
10 import zmq
22
11
23 from IPython.config.configurable import MultipleInstanceError
12 from IPython.config.configurable import MultipleInstanceError
24 from IPython.utils.zmqrelated import check_for_zmq
25
26 min_pyzmq = '2.1.11'
27
28 check_for_zmq(min_pyzmq, 'ipython_parallel')
29
13
30 from IPython.utils.pickleutil import Reference
14 from IPython.utils.pickleutil import Reference
31
15
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