diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest deleted file mode 100644 index 3f2810ad2..000000000 --- a/dev-python/pyzmq/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pyzmq-19.0.0.tar.gz 1150320 BLAKE2B a2af57b1cb809ab72aff1bbee17a7fff5eeeff90805884542579c7cb58c235f8b257a8724c64f55cc8e8eda4a943ec2f54490d546a74bc1532557c46b420e6d2 SHA512 06a395fee62c78f806c43b07362fe2d4b7ac05813d75d4b983f8eefffbe0ca36f64db1591ead719b2866fcfe0867c919033eca0063ca32529e649cd9790461b1 diff --git a/dev-python/pyzmq/files/pyzmq-17.1.0-test_message.patch b/dev-python/pyzmq/files/pyzmq-17.1.0-test_message.patch deleted file mode 100644 index 66d0de75e..000000000 --- a/dev-python/pyzmq/files/pyzmq-17.1.0-test_message.patch +++ /dev/null @@ -1,22 +0,0 @@ -Disable hanging test -Bug: https://github.com/zeromq/pyzmq/issues/1202 - -Patch by Marius Brehler ---- pyzmq-17.1.0/zmq/tests/test_message.py -+++ pyzmq-17.1.0/zmq/tests/test_message.py -@@ -14,6 +14,7 @@ import time - from pprint import pprint - from unittest import TestCase - -+import pytest - import zmq - from zmq.tests import BaseZMQTestCase, SkipTest, skip_pypy, PYPY - from zmq.utils.strtypes import unicode, bytes, b, u -@@ -262,6 +263,7 @@ class TestFrame(BaseZMQTestCase): - self.assertEqual(s,r) - self.assertEqual(s, m.bytes) - -+ @pytest.mark.skip("test sometimes hangs") - def test_buffer_numpy(self): - """test non-copying numpy array messages""" - try: diff --git a/dev-python/pyzmq/files/pyzmq-19.0.0-tests.patch b/dev-python/pyzmq/files/pyzmq-19.0.0-tests.patch deleted file mode 100644 index f56e7c6d3..000000000 --- a/dev-python/pyzmq/files/pyzmq-19.0.0-tests.patch +++ /dev/null @@ -1,186 +0,0 @@ -diff --git a/zmq/tests/test_auth.py b/zmq/tests/test_auth.py -index 003f171..9d882b6 100644 ---- a/zmq/tests/test_auth.py -+++ b/zmq/tests/test_auth.py -@@ -191,6 +191,7 @@ class TestThreadAuthentication(BaseAuthTestCase): - client.close() - server.close() - -+ @pytest.mark.skip("sometimes hangs") - def test_curve(self): - """threaded auth - CURVE""" - self.auth.allow('127.0.0.1') -@@ -309,6 +310,7 @@ class TestThreadAuthentication(BaseAuthTestCase): - - - @skip_pypy -+ @pytest.mark.skip("fails with cffi") - def test_curve_user_id(self): - """threaded auth - CURVE""" - self.auth.allow('127.0.0.1') -diff --git a/zmq/tests/test_constants.py b/zmq/tests/test_constants.py -index 6b4d0c9..d527b06 100644 ---- a/zmq/tests/test_constants.py -+++ b/zmq/tests/test_constants.py -@@ -91,6 +91,7 @@ class TestConstants(TestCase): - self.fail("Shouldn't have: zmq.%s=%s" % (name, value)) - - @pytest.mark.skipif(not zmq.DRAFT_API, reason="Only test draft API if built with draft API") -+ @pytest.mark.skip("fails with cffi") - def test_draft(self): - zmq_version = zmq.zmq_version_info() - for version, new_names in constant_names.draft_in.items(): -diff --git a/zmq/tests/test_draft.py b/zmq/tests/test_draft.py -index 5bb9e29..934ed50 100644 ---- a/zmq/tests/test_draft.py -+++ b/zmq/tests/test_draft.py -@@ -20,6 +20,7 @@ class TestDraftSockets(BaseZMQTestCase): - super(TestDraftSockets, self).setUp() - - -+ @pytest.mark.skip("fails with cffi") - def test_client_server(self): - client, server = self.create_bound_pair(zmq.CLIENT, zmq.SERVER) - client.send(b'request') -@@ -29,6 +30,7 @@ class TestDraftSockets(BaseZMQTestCase): - reply = self.recv(client) - assert reply == b'reply' - -+ @pytest.mark.skip("fails with cffi") - def test_radio_dish(self): - dish, radio = self.create_bound_pair(zmq.DISH, zmq.RADIO) - dish.rcvtimeo = 250 -diff --git a/zmq/tests/test_message.py b/zmq/tests/test_message.py -index d3a6aa8..9ce622c 100644 ---- a/zmq/tests/test_message.py -+++ b/zmq/tests/test_message.py -@@ -18,6 +18,7 @@ import zmq - from zmq.tests import BaseZMQTestCase, SkipTest, skip_pypy, PYPY - from zmq.utils.strtypes import unicode, bytes, b, u - -+import pytest - - # some useful constants: - -@@ -71,7 +72,7 @@ class TestFrame(BaseZMQTestCase): - m = zmq.Frame(s) - b = m.bytes - self.assertEqual(s, m.bytes) -- if not PYPY: -+ if not PYPY and False: - # check that it copies - self.assert_(b is not s) - # check that it copies only once -@@ -94,6 +95,7 @@ class TestFrame(BaseZMQTestCase): - self.assertEqual(len(s), len(m)) - - @skip_pypy -+ @pytest.mark.skip("seems to be broken") - def test_lifecycle1(self): - """Run through a ref counting cycle with a copy.""" - for i in range(5, 16): # 32, 64,..., 65536 -@@ -130,6 +132,7 @@ class TestFrame(BaseZMQTestCase): - del s - - @skip_pypy -+ @pytest.mark.skip("seems to be broken") - def test_lifecycle2(self): - """Run through a different ref counting cycle with a copy.""" - for i in range(5, 16): # 32, 64,..., 65536 -@@ -166,6 +169,7 @@ class TestFrame(BaseZMQTestCase): - del s - - @skip_pypy -+ @pytest.mark.skip("fails with cffi") - def test_tracker(self): - m = zmq.Frame(b'asdf', copy=False, track=True) - self.assertFalse(m.tracker.done) -@@ -186,6 +190,7 @@ class TestFrame(BaseZMQTestCase): - self.assertRaises(ValueError, zmq.MessageTracker, m) - - @skip_pypy -+ @pytest.mark.skip("fails with cffi") - def test_multi_tracker(self): - m = zmq.Frame(b'asdf', copy=False, track=True) - m2 = zmq.Frame(b'whoda', copy=False, track=True) -@@ -222,6 +227,7 @@ class TestFrame(BaseZMQTestCase): - self.assert_(m.buffer is m.buffer) - - @skip_pypy -+ @pytest.mark.skip("fails with cffi") - def test_memoryview_shape(self): - """memoryview shape info""" - if sys.version_info < (3,): -@@ -331,6 +337,7 @@ class TestFrame(BaseZMQTestCase): - B = numpy.frombuffer(msg, A.dtype).reshape(A.shape) - assert_array_equal(A, B) - -+ @pytest.mark.skip("fails with cffi") - def test_frame_more(self): - """test Frame.more attribute""" - frame = zmq.Frame(b"hello") -diff --git a/zmq/tests/test_security.py b/zmq/tests/test_security.py -index b73234d..8fdea48 100644 ---- a/zmq/tests/test_security.py -+++ b/zmq/tests/test_security.py -@@ -9,6 +9,8 @@ import contextlib - import time - from threading import Thread - -+import pytest -+ - import zmq - from zmq.tests import ( - BaseZMQTestCase, SkipTest, PYPY -@@ -114,6 +116,7 @@ class TestSecurity(BaseZMQTestCase): - client.connect("%s:%i" % (iface, port)) - self.bounce(server, client, False) - -+ @pytest.mark.skip("fails with cffi") - def test_plain(self): - """test PLAIN authentication""" - server = self.socket(zmq.DEALER) -@@ -201,6 +204,7 @@ class TestSecurity(BaseZMQTestCase): - # verify that it is equal to the known public key - self.assertEqual(derived_public, public) - -+ @pytest.mark.skip("fails with cffi") - def test_curve(self): - """test CURVE encryption""" - server = self.socket(zmq.DEALER) -diff --git a/zmq/tests/test_socket.py b/zmq/tests/test_socket.py -index 3046663..dcc66d0 100644 ---- a/zmq/tests/test_socket.py -+++ b/zmq/tests/test_socket.py -@@ -221,6 +221,7 @@ class TestSocket(BaseZMQTestCase): - self.assertEqual(rcvd, [b'b']) - - @skip_pypy -+ @pytest.mark.skip("test hangs") - def test_tracker(self): - "test the MessageTracker object for tracking when zmq is done with a buffer" - addr = 'tcp://127.0.0.1' -@@ -363,6 +364,7 @@ class TestSocket(BaseZMQTestCase): - s.close() - self.assertTrue(s.closed) - -+ @pytest.mark.skip("fails with cffi") - def test_poll(self): - a,b = self.create_bound_pair() - tic = time.time() -@@ -502,6 +504,7 @@ class TestSocket(BaseZMQTestCase): - self.assertEqual(events, []) - - # Travis can't handle how much memory PyPy uses on this test -+ @pytest.mark.skip("test hangs") - @mark.skipif( - ( - pypy and on_travis -@@ -536,6 +539,7 @@ class TestSocket(BaseZMQTestCase): - assert view[0] == byte - assert view[-1] == byte - -+ @pytest.mark.skip("fails with cffi") - def test_custom_serialize(self): - a, b = self.create_bound_pair(zmq.DEALER, zmq.ROUTER) - def serialize(msg): diff --git a/dev-python/pyzmq/metadata.xml b/dev-python/pyzmq/metadata.xml deleted file mode 100644 index 6c1c2af55..000000000 --- a/dev-python/pyzmq/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - python@gentoo.org - Python - - - pyzmq - - - Enable draft API support - - diff --git a/dev-python/pyzmq/pyzmq-19.0.0.ebuild b/dev-python/pyzmq/pyzmq-19.0.0.ebuild deleted file mode 100644 index be7f07be8..000000000 --- a/dev-python/pyzmq/pyzmq-19.0.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE="threads(+)" - -inherit flag-o-matic distutils-r1 toolchain-funcs - -DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library" -HOMEPAGE="https://www.zeromq.org/bindings:python https://pypi.org/project/pyzmq/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc +draft test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=net-libs/zeromq-4.2.2-r2:=[drafts] - dev-python/py[${PYTHON_USEDEP}] - dev-python/cffi:=[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - dev-python/cython[${PYTHON_USEDEP}] - test? ( - >=www-servers/tornado-5.0.2[${PYTHON_USEDEP}] - ) - doc? ( - >=dev-python/sphinx-1.3[${PYTHON_USEDEP}] - dev-python/numpydoc[${PYTHON_USEDEP}] - )" - -PATCHES=( - "${FILESDIR}/pyzmq-19.0.0-tests.patch" -) - -distutils_enable_tests pytest -distutils_enable_sphinx docs \ - "dev-python/numpydoc" - -python_prepare_all() { - # Prevent un-needed download during build - sed -e "/'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die - # some tests fail with cffi backend - rm zmq/tests/asyncio/test_asyncio.py || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - tc-export CC - append-cppflags -DZMQ_BUILD_DRAFT_API=$(usex draft '1' '0') -} - -python_compile() { - esetup.py cython --force - distutils-r1_python_compile -}