From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- dev-python/pyzmq/Manifest | 9 +- dev-python/pyzmq/files/pyzmq-19.0.0-tests.patch | 186 ++++++++++++++++++++++++ dev-python/pyzmq/metadata.xml | 3 + dev-python/pyzmq/pyzmq-16.0.2.ebuild | 6 +- dev-python/pyzmq/pyzmq-17.1.0.ebuild | 6 +- dev-python/pyzmq/pyzmq-19.0.0.ebuild | 61 ++++++++ 6 files changed, 260 insertions(+), 11 deletions(-) create mode 100644 dev-python/pyzmq/files/pyzmq-19.0.0-tests.patch create mode 100644 dev-python/pyzmq/pyzmq-19.0.0.ebuild (limited to 'dev-python/pyzmq') diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest index e33600b2ecf2..098c907bdce6 100644 --- a/dev-python/pyzmq/Manifest +++ b/dev-python/pyzmq/Manifest @@ -1,6 +1,9 @@ AUX pyzmq-17.1.0-test_message.patch 725 BLAKE2B c756ffc65b1091f5581c1a8b60c5108c736a6cbe0eed6e5420900b39e0b8b4d656ec82851ad35cb734744486f90325c6bde9e5234735144b19c58a94214e0913 SHA512 4b97ec70740a03e28bd21bc50af145c69b3546e2c5c01b5e7db4b577facd3d1f01d84c5539aff7e6ac44549f90c86be52a09bedac3e2c027cc792b4dbed0da20 +AUX pyzmq-19.0.0-tests.patch 6686 BLAKE2B 91ca18b17331f64448b151269c971ce4dec01b753f00623ea5570a2694b5e2dbbb457c420f22772e8471228f1042da656b06ca740f79f7d6b9ef0d18b8176317 SHA512 971ed65fb299f865edc96c7e138f65cecbed9de526ef10f412e4d81a53c4dc4d65512455bc2ca17c0bc24c09d7bfd7b79cc4acd08f93b517f42466e2b1490836 DIST pyzmq-16.0.2.tar.gz 1026531 BLAKE2B b276fea116d56595ff2aca8a00b2b8918c0170cf1522c4bb457f6bb0d44a13e63de18e4d4f53238a1a5b515986e029ffebdded269f191d62eb36d988b328b402 SHA512 40eaf8ce39db86ab3866890d74b92bd6f20d4ae827828a8772003656d899d10ffcfc222d21f344d9daba390824e6c43b9f34e31beb604ec5ee1ec199165f4b96 DIST pyzmq-17.1.0.tar.gz 1082716 BLAKE2B eed059cad8cc37e9315d16a43768f531ada1274b46bdf91d2ebe83cd0b4c269ea99a8532e3db6d0ea68be31600cf7d29ea4c4e894aa6d04c61534b11fb816d54 SHA512 7f1975c4d02e7d47577049da8df84753905d01672d5a244cef2e5b05e0b6fdb22e88cbb36f2e59831e95a8224819183d9a82baf1f9d7f599da61bcbfe2fc23d3 -EBUILD pyzmq-16.0.2.ebuild 1769 BLAKE2B c17a052f1873a15ce9dfeeff85f3cc1df49e39eb8fea26821fd04cdebf34d2879f0318b3ad16c2603f078be0b2fbf6ba0c1281198aafc4f21b4e1f67fc33f9ee SHA512 9ef86b6adb8fd2eec0733e76be3da99e6cad72dd9f3647f0e0882a4220702cd9ef1ed6b0d919e2f118fcde6a4988d25604b95b5ced691ded5f4924be8b8e4887 -EBUILD pyzmq-17.1.0.ebuild 1842 BLAKE2B 5544284ec6dbc4b104b33d92b8435c85f74bde623a5e059508f5dceaf33f95920f19b81a1a407d3a8bebf1abd1fa0ffed4557db51a5794256736208dc64fb42e SHA512 2894ea32204d9dbca93a31638ef223900ba821ba4223856cbf92936d597c446ffd787dae597aed5367041f548c55c9177214c99c8eaa182fb5002f4f4f1eabd5 -MISC metadata.xml 318 BLAKE2B 332c15a9f2501968cf1ef1f794c6ffe69c196b0d1574889cf90cbffe394e01aeeb869d4644d3182bfb4fd6f1fd1b08e4d73bfdeca401e7071f547311fcebdab5 SHA512 82430ca9ef38b198825652b6a35b18070c4dbfbe9e662311755c6436e98d37b83c44c1d1aa9ade477b5eefadef85390ca1e6c3d035150a850ec08e8134b4f03c +DIST pyzmq-19.0.0.tar.gz 1150320 BLAKE2B a2af57b1cb809ab72aff1bbee17a7fff5eeeff90805884542579c7cb58c235f8b257a8724c64f55cc8e8eda4a943ec2f54490d546a74bc1532557c46b420e6d2 SHA512 06a395fee62c78f806c43b07362fe2d4b7ac05813d75d4b983f8eefffbe0ca36f64db1591ead719b2866fcfe0867c919033eca0063ca32529e649cd9790461b1 +EBUILD pyzmq-16.0.2.ebuild 1619 BLAKE2B 3b39a4d1e4f8d022c7cf4371a87145f54dfbf0b99ad187cde7ac5ac91505689cebac3f86519d70626d8eda9d116450fd6dd129bcacafb7e20b0b3915cb0232af SHA512 a81331c8dce0335290e51cd2423841d0cfa07a8092c18bf800561cbbd8472259017abe78ce8984da6d44e7b8f9c8c403d25f17884fb5ef1e2dd591fc95c75ab3 +EBUILD pyzmq-17.1.0.ebuild 1692 BLAKE2B b75924c63d6332a3dd54beefa42b4a656539214ce154e6dab3c3cf6a115078cd61fc34545b75739ef716475b74301064296f1d4a24f9c6078371ddeb362589a6 SHA512 e69f961773f54e6d2460740d5eb2cdf139689b4eeddc8a2713ecc931ab6d60bc65d49015407bea467bb69f0bab7c7a181f94e71596deb96981cf37c9b78f8f1c +EBUILD pyzmq-19.0.0.ebuild 1547 BLAKE2B aae98a7aa31dae3543fc5c0a842141edcfbbde8c32587eb5b0d76247dbd47bb548ef88fb78d5212f725dfd8727ce6de7a870c9a50b50b22e75bae6a7884e3126 SHA512 b905ffccdd3ce477961f3ae76f9d89619694f3cb2d86c568e1e1b92bed371a572fd9bf56ff7576f6148424a63315a9c70175b663ba5b611ce69843fba4269822 +MISC metadata.xml 390 BLAKE2B bef63f0fd0f88f72fbbdbe6ecbc25572a97dedb5cf17e4a4f99b4698a4e437935970425fc7a32b46059ceb2cf2ea177b25c324a00261e22d881ff4c5d9fd408f SHA512 8b702f02b5ed0233f1b9cd7c7366e108436ad8331082af8606d864145c967f45d1317b7c4f260a0542430397dfc1a5fb18e69bef90f154bb65ff07a4f7132dc7 diff --git a/dev-python/pyzmq/files/pyzmq-19.0.0-tests.patch b/dev-python/pyzmq/files/pyzmq-19.0.0-tests.patch new file mode 100644 index 000000000000..f56e7c6d3a5d --- /dev/null +++ b/dev-python/pyzmq/files/pyzmq-19.0.0-tests.patch @@ -0,0 +1,186 @@ +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 index 7b2bf120e320..6c1c2af5565c 100644 --- a/dev-python/pyzmq/metadata.xml +++ b/dev-python/pyzmq/metadata.xml @@ -8,4 +8,7 @@ pyzmq + + Enable draft API support + diff --git a/dev-python/pyzmq/pyzmq-16.0.2.ebuild b/dev-python/pyzmq/pyzmq-16.0.2.ebuild index 914737e0cb2b..a77b3c5d365b 100644 --- a/dev-python/pyzmq/pyzmq-16.0.2.ebuild +++ b/dev-python/pyzmq/pyzmq-16.0.2.ebuild @@ -3,13 +3,13 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7} ) 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="http://www.zeromq.org/bindings:python https://pypi.org/project/pyzmq/" +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" @@ -22,13 +22,11 @@ RDEPEND=" >=net-libs/zeromq-4.1.2:= dev-python/py[${PYTHON_USEDEP}] dev-python/cffi:=[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7) " DEPEND="${RDEPEND} dev-python/cython[${PYTHON_USEDEP}] test? ( dev-python/pytest[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2) www-servers/tornado[${PYTHON_USEDEP}] ) doc? ( diff --git a/dev-python/pyzmq/pyzmq-17.1.0.ebuild b/dev-python/pyzmq/pyzmq-17.1.0.ebuild index 90216948f4ff..1e918eb84bc5 100644 --- a/dev-python/pyzmq/pyzmq-17.1.0.ebuild +++ b/dev-python/pyzmq/pyzmq-17.1.0.ebuild @@ -3,13 +3,13 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7} ) 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="http://www.zeromq.org/bindings:python https://pypi.org/project/pyzmq/" +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" @@ -22,13 +22,11 @@ RDEPEND=" >=net-libs/zeromq-4.2.2-r2:=[drafts] dev-python/py[${PYTHON_USEDEP}] dev-python/cffi:=[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7) " DEPEND="${RDEPEND} dev-python/cython[${PYTHON_USEDEP}] test? ( dev-python/pytest[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2) >=www-servers/tornado-5.0.2[${PYTHON_USEDEP}] ) doc? ( diff --git a/dev-python/pyzmq/pyzmq-19.0.0.ebuild b/dev-python/pyzmq/pyzmq-19.0.0.ebuild new file mode 100644 index 000000000000..be7f07be845a --- /dev/null +++ b/dev-python/pyzmq/pyzmq-19.0.0.ebuild @@ -0,0 +1,61 @@ +# 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 +} -- cgit v1.2.3