##// END OF EJS Templates
fix pyzmq check in setupext to handle 2.1.10...
MinRK -
Show More
@@ -136,13 +136,25 b' def check_for_pyzmq():'
136 try:
136 try:
137 import zmq
137 import zmq
138 except ImportError:
138 except ImportError:
139 print_status('pyzmq', "no (required for qtconsole and parallel computing capabilities)")
139 print_status('pyzmq', "no (required for qtconsole, notebook, and parallel computing capabilities)")
140 return False
140 return False
141 else:
141 else:
142 # pyzmq 2.1.10 adds pyzmq_version_info funtion for returning
143 # version as a tuple
144 if hasattr(zmq, 'pyzmq_version_info'):
145 if zmq.pyzmq_version_info() >= (2,1,4):
146 print_status("pyzmq", zmq.__version__)
147 return True
148 else:
149 # this branch can never occur, at least until we update our
150 # pyzmq dependency beyond 2.1.10
151 return False
152 # this is necessarily earlier than 2.1.10, so string comparison is
153 # okay
142 if zmq.__version__ < '2.1.4':
154 if zmq.__version__ < '2.1.4':
143 print_status('pyzmq', "no (have %s, but require >= 2.1.4 for"
155 print_status('pyzmq', "no (have %s, but require >= 2.1.4 for"
144 " qtconsole and parallel computing capabilities)"%zmq.__version__)
156 " qtconsole and parallel computing capabilities)"%zmq.__version__)
145
157 return False
146 else:
158 else:
147 print_status("pyzmq", zmq.__version__)
159 print_status("pyzmq", zmq.__version__)
148 return True
160 return True
General Comments 0
You need to be logged in to leave comments. Login now