Skip to content

future pyzmq compatibility #2852

Merged
merged 4 commits into from Jan 29, 2013

3 participants

@minrk
IPython member
minrk commented Jan 25, 2013
  • small change to allow MockSocket tests to run on pyzmq >= 3
  • bump base pyzmq to 2.1.11 (Dec 2011), and remove associated patches/workarounds.
@Carreau Carreau and 1 other commented on an outdated diff Jan 25, 2013
IPython/zmq/__init__.py
@@ -10,7 +10,7 @@
#-----------------------------------------------------------------------------
import warnings
-from distutils.version import LooseVersion as V
+from IPython.utils.version import NumericalVersion as V
@Carreau
IPython member
Carreau added a note Jan 25, 2013

I guess this need #2831 ... but why is Travis not building....

@minrk
IPython member
minrk added a note Jan 25, 2013

Ha, that's what I get for writing two PRs at the same time.

@Carreau
IPython member
Carreau added a note Jan 25, 2013

They'll probably be merge so close one to the other that even travis won't have time to fail.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
minrk added some commits Jan 25, 2013
@minrk minrk declare data attr in MockSocket
setting attrs not declared at the class level will be illegal in pyzmq ≥ 3
92642fc
@minrk minrk bump minimum pyzmq version to 2.1.11
and remove the associated workarounds for old pyzmq
d311c0d
@minrk
IPython member
minrk commented Jan 28, 2013

rebased now that #2831 is merged

@ellisonbg
IPython member

I have read through the code (looks fine), ran the notebook and did a run of python setup.py. Looks good to me. I think it can be merged unless there is anything else you wanted to do.

@minrk
IPython member
minrk commented Jan 29, 2013

letting travis run after fixing a typo in the iptest changes, then I'll merge.

@minrk minrk remove MockSocket in test_session
subclassing zmq.Socket doesn't behave well on Python 3,
and there's no point anyway.
6a83925
@minrk
IPython member
minrk commented Jan 29, 2013

I've had to remove the MockSocket entirely. Apparently there was something weird in old pyzmq, only on Python 3, preventing the new way of subclassing zmq.Socket from working. In any case, the MockSocket was pointless, so I removed it in favor of a real inproc PAIR.

@ellisonbg
IPython member

OK I think this looks good.

@minrk minrk merged commit df34852 into ipython:master Jan 29, 2013

1 check passed

Details default The Travis build passed
@minrk minrk added a commit that referenced this pull request Mar 5, 2013
@minrk minrk Backport PR #2852: future pyzmq compatibility
- [x] small change to allow MockSocket tests to run on pyzmq >= 3
- [x] bump base pyzmq to 2.1.11 (Dec 2011), and remove associated patches/workarounds.
0667fb7
@minrk minrk added a commit that referenced this pull request Mar 20, 2013
@minrk minrk Backport PR #2852: future pyzmq compatibility
- [x] small change to allow MockSocket tests to run on pyzmq >= 3
- [x] bump base pyzmq to 2.1.11 (Dec 2011), and remove associated patches/workarounds.
25cdca4
@minrk minrk deleted the minrk:pyzmq_compat branch Mar 31, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.