mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-04-06 13:50:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

bump minimum pyzmq version to 2.1.11

Browse Source 
and remove the associated workarounds for old pyzmq
This commit is contained in:
MinRK 2013-01-25 12:37:49 -08:00
parent c82b22b2f1
commit 1c196310d4
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
IPython/testing/iptest.py
View File

@ -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)
min_zmq = (2,1,11)
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)
have['zmq'] = test_for('zmq.pyzmq_version_info', min_zmq)
#-----------------------------------------------------------------------------
# Functions and classes

8
setup.py
View File

@ -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