update zmq dependency to 2.1.4

IPython/zmq/__init__.py

@@ -6,10 +6,10
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
-# Verify zmq version dependency >= 2.0.10-1
+# Verify zmq version dependency >= 2.1.4
 #-----------------------------------------------------------------------------
 
-minimum_pyzmq_version = "2.0.10-1"
+minimum_pyzmq_version = "2.1.4"
 
 try:
     import zmq

docs/source/install/install.txt

@@ -303,11 +303,10 pyzmq
 IPython 0.11 introduced some new functionality, including a two-process
 execution model using ZeroMQ for communication [ZeroMQ]_. The Python bindings
 to ZeroMQ are found in the pyzmq project, which is easy_install-able once you
-have ZeroMQ installed (or even if you don't).
+have ZeroMQ installed.  If you are on Python 2.6 or 2.7 on OSX, or 2.7 on Windows,
+pyzmq has eggs that include ZeroMQ itself.
 
-IPython.zmq depends on pyzmq >= 2.0.10.1, but IPython.parallel requires the more
-recent 2.1.4.  2.1.4 also has binary releases for OSX and Windows, that do not
-require prior installation of libzmq.
+IPython.zmq depends on pyzmq >= 2.1.4.
 
 Dependencies for ipython-qtconsole (new GUI)
 ============================================

setup.py

@@ -213,7 +213,7 if 'setuptools' in sys.modules:
     setuptools_extra_args['entry_points'] = find_scripts(True)
     setup_args['extras_require'] = dict(
         parallel = 'pyzmq>=2.1.4',
-        zmq = 'pyzmq>=2.0.10.1',
+        zmq = 'pyzmq>=2.1.4',
         doc='Sphinx>=0.3',
         test='nose>=0.10.1',
     )

setupext/setupext.py

@@ -139,8 +139,9 def check_for_pyzmq():
         print_status('pyzmq', "no (required for qtconsole and parallel computing capabilities)")
         return False
     else:
-        if zmq.__version__ < '2.0.10':
-            print_status('pyzmq', "no (require >= 2.0.10 for qtconsole and parallel computing capabilities)")
+        if zmq.__version__ < '2.1.4':
+            print_status('pyzmq', "no (have %s, but require >= 2.1.4 for"
+            " qtconsole and parallel computing capabilities)"%zmq.__version__)
             
         else:
             print_status("pyzmq", zmq.__version__)