[python-txzmq] 0.7.0

Ralph Bean ralph at fedoraproject.org
Tue Jan 28 21:27:30 UTC 2014


commit 8c26ee56ea98c4d7eb59b58d123f461c12413c64
Author: Ralph Bean <rbean at redhat.com>
Date:   Tue Jan 28 16:27:50 2014 -0500

    0.7.0

 .gitignore                     |    1 +
 0001-Disable-epgm-test.patch   |   48 +++++++++++++--------------------------
 0002-Support-older-pyzmq.patch |   25 --------------------
 python-txzmq.spec              |   14 ++++++-----
 sources                        |    2 +-
 5 files changed, 26 insertions(+), 64 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 244f04b..895f095 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /txZMQ-0.5.2.tar.gz
 /txZMQ-0.6.1.tar.gz
 /txZMQ-0.6.2.tar.gz
+/txZMQ-0.7.0.tar.gz
diff --git a/0001-Disable-epgm-test.patch b/0001-Disable-epgm-test.patch
index c7eaf76..69bdc85 100644
--- a/0001-Disable-epgm-test.patch
+++ b/0001-Disable-epgm-test.patch
@@ -1,17 +1,17 @@
-From d26b799ace81fcdc00589d9242e3a84aa05452a4 Mon Sep 17 00:00:00 2001
+From b9cc1b4832f4ebdc644a5aa2cf02e4ac40c56451 Mon Sep 17 00:00:00 2001
 From: Ralph Bean <rbean at redhat.com>
-Date: Thu, 11 Apr 2013 01:01:57 -0400
-Subject: [PATCH 1/2] Disable epgm test
+Date: Tue, 28 Jan 2014 16:18:17 -0500
+Subject: [PATCH] Disable epgm test
 
 ---
- txzmq/test/test_pubsub.py | 42 ------------------------------------------
- 1 file changed, 42 deletions(-)
+ txzmq/test/test_pubsub.py | 26 --------------------------
+ 1 file changed, 26 deletions(-)
 
 diff --git a/txzmq/test/test_pubsub.py b/txzmq/test/test_pubsub.py
-index 2010c01..df4f797 100644
+index 86a0238..f2fb12e 100644
 --- a/txzmq/test/test_pubsub.py
 +++ b/txzmq/test/test_pubsub.py
-@@ -23,23 +23,6 @@ class ZmqTestSubConnection(ZmqSubConnection):
+@@ -19,21 +19,6 @@ class ZmqTestSubConnection(ZmqSubConnection):
          self.messages.append([tag, message])
  
  
@@ -22,7 +22,7 @@ index 2010c01..df4f797 100644
 -    import zmq
 -
 -    context = zmq.Context()
--    socket = zmq.Socket(context, zmq.core.constants.PUB)
+-    socket = zmq.Socket(context, zmq.constants.PUB)
 -
 -    try:
 -        socket.bind("epgm://127.0.0.1;239.192.1.1:5557")
@@ -30,12 +30,10 @@ index 2010c01..df4f797 100644
 -        return True
 -    except ZMQError:
 -        return False
--
--
+ 
+ 
  class ZmqConnectionTestCase(unittest.TestCase):
-     """
-     Test case for L{zmq.twisted.connection.Connection}.
-@@ -85,28 +68,6 @@ class ZmqConnectionTestCase(unittest.TestCase):
+@@ -81,14 +66,6 @@ class ZmqConnectionTestCase(unittest.TestCase):
          return _wait(0.01).addCallback(publish) \
              .addCallback(lambda _: _wait(0.01)).addCallback(check)
  
@@ -47,24 +45,10 @@ index 2010c01..df4f797 100644
 -            ZmqEndpointType.connect, "epgm://127.0.0.1;239.192.1.1:5556"))
 -
 -        r.subscribe('tag')
--
--        def publish(ignore):
--            s.publish('xyz', 'different-tag')
--            s.publish('abcd', 'tag1')
--
--        def check(ignore):
--            result = getattr(r, 'messages', [])
--            expected = [['tag1', 'abcd']]
--            self.failUnlessEqual(
--                result, expected, "Message should have been received")
--
--        return _wait(0.2).addCallback(publish) \
--            .addCallback(lambda _: _wait(0.2)).addCallback(check)
--
-     def test_send_recv_multiple_endpoints(self):
-         r = ZmqTestSubConnection(
-             self.factory,
-@@ -134,6 +95,3 @@ class ZmqConnectionTestCase(unittest.TestCase):
+ 
+         def publish(ignore):
+             s.publish('xyz', 'different-tag')
+@@ -130,6 +107,3 @@ class ZmqConnectionTestCase(unittest.TestCase):
  
          return _wait(0.1).addCallback(publish) \
              .addCallback(lambda _: _wait(0.1)).addCallback(check)
@@ -72,5 +56,5 @@ index 2010c01..df4f797 100644
 -    if not _detect_epgm():
 -        test_send_recv_pgm.skip = "epgm:// not available"
 -- 
-1.8.1.4
+1.8.5.3
 
diff --git a/python-txzmq.spec b/python-txzmq.spec
index da6c4ef..2e7962a 100644
--- a/python-txzmq.spec
+++ b/python-txzmq.spec
@@ -1,8 +1,8 @@
 %global modname txZMQ
 
 Name:             python-txzmq
-Version:          0.6.2
-Release:          3%{?dist}
+Version:          0.7.0
+Release:          1%{?dist}
 Summary:          Twisted bindings for ZeroMQ
 
 Group:            Development/Languages
@@ -10,17 +10,16 @@ License:          GPLv2
 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
-Patch1:           0002-Support-older-pyzmq.patch
 
 BuildArch:        noarch
 
 BuildRequires:    python2-devel
 BuildRequires:    python-setuptools
 BuildRequires:    python-nose
-BuildRequires:    python-zmq
+BuildRequires:    python-zmq >= 13.0.0
 BuildRequires:    python-twisted-core
 
-Requires:         python-zmq
+Requires:         python-zmq >= 13.0.0
 Requires:         python-twisted-core
 
 %description
@@ -30,7 +29,6 @@ Twisted event loop (reactor).
 %prep
 %setup -q -n %{modname}-%{version}
 %patch0 -p1 -b .disable_epgm_test
-%patch1 -p1 -b .disable-older-pyzmq
 
 # Patch out the setuptools requirement on Twisted since epel doesn't ship
 # twisted egg-info
@@ -53,6 +51,10 @@ PYTHONPATH=$(pwd) nosetests
 %{python_sitelib}/txZMQ-%{version}*.egg-info
 
 %changelog
+* Tue Jan 28 2014 Ralph Bean <rbean at redhat.com> - 0.7.0-1
+- Latest upstream.
+- Dropped support for older pyzmq.
+
 * Tue Jan 14 2014 Ralph Bean <rbean at redhat.com> - 0.6.2-3
 - Narrow dep down to the twisted-core subpackage.
 
diff --git a/sources b/sources
index 68f2abc..35d5585 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e349d88f3bcbfe890fe23d68129d9fa  txZMQ-0.6.2.tar.gz
+407ceb7d10199b1f7e4581ee91525608  txZMQ-0.7.0.tar.gz


More information about the scm-commits mailing list