From 1c196310d45fdf31cbe2ca3ac08cc10b21b90c7d Mon Sep 17 00:00:00 2001 From: MinRK Date: Fri, 25 Jan 2013 12:37:49 -0800 Subject: [PATCH] bump minimum pyzmq version to 2.1.11 and remove the associated workarounds for old pyzmq --- IPython/testing/iptest.py | 16 +++------------- setup.py | 8 ++++---- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py index 100f8ea95..6b5d6f4ca 100644 --- a/IPython/testing/iptest.py +++ b/IPython/testing/iptest.py @@ -167,19 +167,9 @@ have['wx'] = test_for('wx') have['wx.aui'] = test_for('wx.aui') have['azure'] = test_for('azure') -if os.name == 'nt': - min_zmq = (2,1,7) -else: - min_zmq = (2,1,4) - -def version_tuple(mod): - "turn '2.1.9' into (2,1,9), and '2.1dev' into (2,1,999)" - # turn 'dev' into 999, because Python3 rejects str-int comparisons - vs = mod.__version__.replace('dev', '.999') - tup = tuple([int(v) for v in vs.split('.') ]) - return tup - -have['zmq'] = test_for('zmq', min_zmq, version_tuple) +min_zmq = (2,1,11) + +have['zmq'] = test_for('zmq.pyzmq_version_info', min_zmq) #----------------------------------------------------------------------------- # Functions and classes diff --git a/setup.py b/setup.py index d0386ec39..5c36e29f6 100755 --- a/setup.py +++ b/setup.py @@ -229,12 +229,12 @@ if 'setuptools' in sys.modules: setuptools_extra_args['zip_safe'] = False setuptools_extra_args['entry_points'] = find_scripts(True) setup_args['extras_require'] = dict( - parallel = 'pyzmq>=2.1.4', - qtconsole = ['pyzmq>=2.1.4', 'pygments'], - zmq = 'pyzmq>=2.1.4', + parallel = 'pyzmq>=2.1.11', + qtconsole = ['pyzmq>=2.1.11', 'pygments'], + zmq = 'pyzmq>=2.1.11', doc = 'Sphinx>=0.3', test = 'nose>=0.10.1', - notebook = ['tornado>=2.0', 'pyzmq>=2.1.4', 'jinja2'], + notebook = ['tornado>=2.0', 'pyzmq>=2.1.11', 'jinja2'], ) requires = setup_args.setdefault('install_requires', []) setupext.display_status = False