From 60c800a6ae4a3792207d818efe56ac6937603a7a 2011-04-08 00:38:21
From: MinRK <benjaminrk@gmail.com>
Date: 2011-04-08 00:38:21
Subject: [PATCH] add zmq checking in iptest

---

diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
index ecbb64b..6fa4211 100644
--- a/IPython/testing/iptest.py
+++ b/IPython/testing/iptest.py
@@ -82,7 +82,7 @@ warnings.filterwarnings('ignore', 'wxPython/wxWidgets release number mismatch',
 # Logic for skipping doctests
 #-----------------------------------------------------------------------------
 
-def test_for(mod):
+def test_for(mod, min_version=None):
     """Test to see if mod is importable."""
     try:
         __import__(mod)
@@ -91,7 +91,10 @@ def test_for(mod):
         # importable.
         return False
     else:
-        return True
+        if min_version:
+            return sys.modules[mod].__version__ >= min_version
+        else:
+            return True
 
 # Global dict where we can store information on what we have and what we don't
 # have available at test run time
@@ -101,6 +104,7 @@ have['curses'] = test_for('_curses')
 have['wx'] = test_for('wx')
 have['wx.aui'] = test_for('wx.aui')
 have['pexpect'] = test_for('pexpect')
+have['zmq'] = test_for('zmq', '2.0.10')
 
 #-----------------------------------------------------------------------------
 # Functions and classes
@@ -179,6 +183,9 @@ def make_exclude():
         exclusions.extend([ipjoin('scripts', 'irunner'),
                            ipjoin('lib', 'irunner')])
 
+    if not have['zmq']:
+        exclusions.append(ipjoin('zmq'))
+
     # This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
     if sys.platform == 'win32':
         exclusions = [s.replace('\\','\\\\') for s in exclusions]