Permalink
Browse files

depend on pyzmq-2.1dev on Windows

This is a temporary dependency, and should be changed to the next release of pyzmq when it arrives.
  • Loading branch information...
1 parent 1a93dba commit 877366d218974bbfcbce93e7c1fa1c43538f952b @minrk committed Apr 21, 2011
Showing with 11 additions and 2 deletions.
  1. +7 −1 IPython/parallel/__init__.py
  2. +4 −1 IPython/testing/iptest.py
@@ -10,9 +10,15 @@
# Imports
#-----------------------------------------------------------------------------
+import os
import zmq
-if zmq.__version__ < '2.1.4':
+
+if os.name == 'nt':
+ if zmq.__version__ < '2.1dev':
+ raise ImportError("On Windows, IPython.parallel depends on bugfixes only "
+ "in current git master of pyzmq, you appear to have %s"%zmq.__version__)
+elif zmq.__version__ < '2.1.4':
raise ImportError("IPython.parallel requires pyzmq/0MQ >= 2.1.4, you appear to have %s"%zmq.__version__)
from IPython.utils.pickleutil import Reference
@@ -106,7 +106,10 @@ def test_for(mod, min_version=None):
have['pymongo'] = test_for('pymongo')
have['wx'] = test_for('wx')
have['wx.aui'] = test_for('wx.aui')
-have['zmq'] = test_for('zmq', '2.1.4')
+if os.name == 'nt':
+ have['zmq'] = test_for('zmq', '2.1dev')
+else:
+ have['zmq'] = test_for('zmq', '2.1.4')
have['qt'] = test_for('IPython.external.qt')
#-----------------------------------------------------------------------------

0 comments on commit 877366d

Please sign in to comment.