[python-txzmq] Upstream integrated zeromq3 support patches. Dropping local patches.
Ralph Bean
ralph at fedoraproject.org
Mon Oct 29 14:40:19 UTC 2012
commit 3eb33f4aa6cb37eeed222c45a6b7188583e10af3
Author: Ralph Bean <rbean at redhat.com>
Date: Mon Oct 29 10:40:07 2012 -0400
Upstream integrated zeromq3 support patches. Dropping local patches.
.gitignore | 1 +
0001-Disable-epgm-test.patch | 35 ++--
0002-Support-for-zeromq3.patch | 62 ------
0003-Fixup-pubsub-tests-for-zeromq3.patch | 77 --------
...ts-that-I-can-t-yet-get-passing-with-zero.patch | 98 ----------
0005-Completely-remove-broken-zeromq3-tests.patch | 198 --------------------
0006-Support-older-pyzmq.patch | 25 ---
python-txzmq.spec | 22 +--
sources | 2 +-
9 files changed, 27 insertions(+), 493 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f6ed1c7..8bde7cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/txZMQ-0.3.1.tar.gz
/txZMQ-0.5.0.tar.gz
/txZMQ-0.5.2.tar.gz
+/txZMQ-0.6.1.tar.gz
diff --git a/0001-Disable-epgm-test.patch b/0001-Disable-epgm-test.patch
index 63e9fa0..5ecd839 100644
--- a/0001-Disable-epgm-test.patch
+++ b/0001-Disable-epgm-test.patch
@@ -1,14 +1,14 @@
-From 5fd3b5ddf732056a2c4d25b1edb268c1981fbd1c Mon Sep 17 00:00:00 2001
+From 6857b66383bc634f3cf6f3fffa8da38e317ef478 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean at redhat.com>
-Date: Tue, 2 Oct 2012 13:40:37 -0400
-Subject: [PATCH] Disable epgm test.
+Date: Mon, 29 Oct 2012 10:36:33 -0400
+Subject: [PATCH] Disable epgm test
---
- txzmq/test/test_pubsub.py | 39 ---------------------------------------
- 1 file changed, 39 deletions(-)
+ txzmq/test/test_pubsub.py | 42 ------------------------------------------
+ 1 file changed, 42 deletions(-)
diff --git a/txzmq/test/test_pubsub.py b/txzmq/test/test_pubsub.py
-index 6f98418..efa8415 100644
+index 04ef4f0..b118a59 100644
--- a/txzmq/test/test_pubsub.py
+++ b/txzmq/test/test_pubsub.py
@@ -17,23 +17,6 @@ class ZmqTestSubConnection(ZmqSubConnection):
@@ -35,9 +35,9 @@ index 6f98418..efa8415 100644
class ZmqConnectionTestCase(unittest.TestCase):
"""
Test case for L{zmq.twisted.connection.Connection}.
-@@ -67,25 +50,6 @@ class ZmqConnectionTestCase(unittest.TestCase):
-
- return _wait(0.01).addCallback(check)
+@@ -79,28 +62,6 @@ class ZmqConnectionTestCase(unittest.TestCase):
+ return _wait(0.01).addCallback(publish) \
+ .addCallback(lambda _: _wait(0.01)).addCallback(check)
- def test_send_recv_pgm(self):
- r = ZmqTestSubConnection(self.factory, ZmqEndpoint(
@@ -47,8 +47,10 @@ index 6f98418..efa8415 100644
- ZmqEndpointType.connect, "epgm://127.0.0.1;239.192.1.1:5556"))
-
- r.subscribe('tag')
-- s.publish('xyz', 'different-tag')
-- s.publish('abcd', 'tag1')
+-
+- def publish(ignore):
+- s.publish('xyz', 'different-tag')
+- s.publish('abcd', 'tag1')
-
- def check(ignore):
- result = getattr(r, 'messages', [])
@@ -56,18 +58,19 @@ index 6f98418..efa8415 100644
- self.failUnlessEqual(
- result, expected, "Message should have been received")
-
-- return _wait(0.2).addCallback(check)
+- return _wait(0.2).addCallback(publish) \
+- .addCallback(lambda _: _wait(0.2)).addCallback(check)
-
def test_send_recv_multiple_endpoints(self):
r = ZmqTestSubConnection(
self.factory,
-@@ -110,6 +74,3 @@ class ZmqConnectionTestCase(unittest.TestCase):
- sorted(result), expected, "Message should have been received")
+@@ -128,6 +89,3 @@ class ZmqConnectionTestCase(unittest.TestCase):
- return _wait(0.2).addCallback(check)
+ return _wait(0.1).addCallback(publish) \
+ .addCallback(lambda _: _wait(0.1)).addCallback(check)
-
- if not _detect_epgm():
- test_send_recv_pgm.skip = "epgm:// not available"
--
-1.7.11.7
+1.7.12.1
diff --git a/python-txzmq.spec b/python-txzmq.spec
index dde560c..7387f31 100644
--- a/python-txzmq.spec
+++ b/python-txzmq.spec
@@ -1,8 +1,8 @@
%global modname txZMQ
Name: python-txzmq
-Version: 0.5.2
-Release: 3%{?dist}
+Version: 0.6.1
+Release: 1%{?dist}
Summary: Twisted bindings for ZeroMQ
Group: Development/Languages
@@ -11,14 +11,6 @@ URL: http://pypi.python.org/pypi/%{modname}
Source0: http://pypi.python.org/packages/source/t/%{modname}/%{modname}-%{version}.tar.gz
Patch0: 0001-Disable-epgm-test.patch
-# Tracking upstream issue -> https://github.com/smira/txZMQ/pull/35
-Patch1: 0002-Support-for-zeromq3.patch
-Patch2: 0003-Fixup-pubsub-tests-for-zeromq3.patch
-Patch3: 0004-Disable-tests-that-I-can-t-yet-get-passing-with-zero.patch
-Patch4: 0005-Completely-remove-broken-zeromq3-tests.patch
-Patch5: 0006-Support-older-pyzmq.patch
-
-
BuildArch: noarch
@@ -37,12 +29,7 @@ Twisted event loop (reactor).
%prep
%setup -q -n %{modname}-%{version}
-#%patch0 -p1 -b .disable_epgm_test
-%patch1 -p1 -b .support-zeromq3
-%patch2 -p1 -b .fix-pubsub-test
-%patch3 -p1 -b .disable-wonky-tests
-%patch4 -p1 -b .remove-busted-tests
-%patch5 -p1 -b .support-older-pyzmq
+%patch0 -p1 -b .disable_epgm_test
# Patch out the setuptools requirement on Twisted since epel doesn't ship
# twisted egg-info
@@ -66,6 +53,9 @@ PYTHONPATH=$(pwd) nosetests
%{python_sitelib}/*
%changelog
+* Mon Oct 29 2012 Ralph Bean <rbean at redhat.com> - 0.6.1-1
+- Upstream integrates zeromq3 support. Dropping patches.
+
* Wed Oct 10 2012 Ralph Bean <rbean at redhat.com> - 0.5.2-3
- Patch to support older pyzmq on f17 and el6.
- Fix changelog.
diff --git a/sources b/sources
index d8d6dcb..bdd6489 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-343c1cefb0f481577b7c54176ce32a0c txZMQ-0.5.2.tar.gz
+a2d0b080ae4b18a81d5b027fa56d783a txZMQ-0.6.1.tar.gz
More information about the scm-commits
mailing list