From 809e79b6e4cd84933feddc864a68513a2d84a8e8 Mon Sep 17 00:00:00 2001 From: Min RK Date: Thu, 5 Feb 2015 14:16:19 -0800 Subject: [PATCH] bump pyzmq version dependency to 13 pyzmq < 13 doesn't work with tornado >= 3, which we also require. This results in clearer error messages when pyzmq is too old. --- IPython/html/notebookapp.py | 4 ++-- IPython/testing/iptest.py | 2 +- setup.py | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/IPython/html/notebookapp.py b/IPython/html/notebookapp.py index 9121aba29..5e55e1d68 100644 --- a/IPython/html/notebookapp.py +++ b/IPython/html/notebookapp.py @@ -24,9 +24,9 @@ import threading import webbrowser -# check for pyzmq 2.1.11 +# check for pyzmq from IPython.utils.zmqrelated import check_for_zmq -check_for_zmq('2.1.11', 'IPython.html') +check_for_zmq('13', 'IPython.html') from jinja2 import Environment, FileSystemLoader diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py index bf4e48353..ecc1ee457 100644 --- a/IPython/testing/iptest.py +++ b/IPython/testing/iptest.py @@ -143,7 +143,7 @@ have['casperjs'] = is_cmd_found('casperjs') have['phantomjs'] = is_cmd_found('phantomjs') have['slimerjs'] = is_cmd_found('slimerjs') -min_zmq = (2,1,11) +min_zmq = (13,) have['zmq'] = test_for('zmq.pyzmq_version_info', min_zmq, callback=lambda x: x()) diff --git a/setup.py b/setup.py index f682fd13f..dc6a6ef35 100755 --- a/setup.py +++ b/setup.py @@ -246,15 +246,16 @@ setuptools_extra_args = {} # setuptools requirements +pyzmq = 'pyzmq>=13' + extras_require = dict( - parallel = ['pyzmq>=2.1.11'], - qtconsole = ['pyzmq>=2.1.11', 'pygments'], - zmq = ['pyzmq>=2.1.11'], + parallel = [pyzmq], + qtconsole = [pyzmq, 'pygments'], doc = ['Sphinx>=1.1', 'numpydoc'], test = ['nose>=0.10.1', 'requests'], terminal = [], nbformat = ['jsonschema>=2.0'], - notebook = ['tornado>=4.0', 'pyzmq>=2.1.11', 'jinja2', 'pygments', 'mistune>=0.5'], + notebook = ['tornado>=4.0', pyzmq, 'jinja2', 'pygments', 'mistune>=0.5'], nbconvert = ['pygments', 'jinja2', 'mistune>=0.3.1'] )