##// END OF EJS Templates
depend on pyzmq-2.1dev on Windows...
MinRK -
Show More
@@ -10,9 +10,15 b''
10 # Imports
10 # Imports
11 #-----------------------------------------------------------------------------
11 #-----------------------------------------------------------------------------
12
12
13 import os
13 import zmq
14 import zmq
14
15
15 if zmq.__version__ < '2.1.4':
16
17 if os.name == 'nt':
18 if zmq.__version__ < '2.1dev':
19 raise ImportError("On Windows, IPython.parallel depends on bugfixes only "
20 "in current git master of pyzmq, you appear to have %s"%zmq.__version__)
21 elif zmq.__version__ < '2.1.4':
16 raise ImportError("IPython.parallel requires pyzmq/0MQ >= 2.1.4, you appear to have %s"%zmq.__version__)
22 raise ImportError("IPython.parallel requires pyzmq/0MQ >= 2.1.4, you appear to have %s"%zmq.__version__)
17
23
18 from IPython.utils.pickleutil import Reference
24 from IPython.utils.pickleutil import Reference
@@ -106,7 +106,10 b" have['pexpect'] = test_for('pexpect')"
106 have['pymongo'] = test_for('pymongo')
106 have['pymongo'] = test_for('pymongo')
107 have['wx'] = test_for('wx')
107 have['wx'] = test_for('wx')
108 have['wx.aui'] = test_for('wx.aui')
108 have['wx.aui'] = test_for('wx.aui')
109 have['zmq'] = test_for('zmq', '2.1.4')
109 if os.name == 'nt':
110 have['zmq'] = test_for('zmq', '2.1dev')
111 else:
112 have['zmq'] = test_for('zmq', '2.1.4')
110 have['qt'] = test_for('IPython.external.qt')
113 have['qt'] = test_for('IPython.external.qt')
111
114
112 #-----------------------------------------------------------------------------
115 #-----------------------------------------------------------------------------
General Comments 0
You need to be logged in to leave comments. Login now