[gentoo-commits] repo/gentoo:master commit in: dev-python/eventlet/, dev-python/eventlet/files/
commit: 783231c88e5a7ed3d40a6a8998a87d411f1d8579 Author: Sam James gentoo org> AuthorDate: Mon Dec 14 05:20:46 2020 + Commit: Sam James gentoo org> CommitDate: Mon Dec 14 05:20:46 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=783231c8 dev-python/eventlet: bump to 0.30.0 Restore inadvertently dropped Python implementations too. Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> dev-python/eventlet/Manifest | 2 +- ...entlet-0.29.1.ebuild => eventlet-0.30.0.ebuild} | 7 ++- .../eventlet/files/eventlet-0.29.1-tests.patch | 71 -- .../files/eventlet-0.30.0-tests-socket.patch | 13 4 files changed, 18 insertions(+), 75 deletions(-) diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest index 9ba86992d66..d60a7b85c86 100644 --- a/dev-python/eventlet/Manifest +++ b/dev-python/eventlet/Manifest @@ -1,2 +1,2 @@ DIST eventlet-0.26.1.tar.gz 398200 BLAKE2B f14024d0825fb5530929766c63dceea7446057d9ad5dfb98ab013e96cab9b0eef5440f2d4d7ceeef17691c8a2a9055cac2b93fb23653a6facba4967c4e7cb0b3 SHA512 55b9b214130d0482ea005ea570a5aa3eafdf66e6d315a95c5ba60186a2d9a9df5c2638c86d886968954ce39e5ac2153e1f9e11631e6aef237078c3776af7d6c5 -DIST eventlet-0.29.1.tar.gz 400673 BLAKE2B 2b317e0c445a7b9c7f96147c033b1a6b4b4d27eeaebe0d40102b4e25d7825861db15e9d77cf6c9e6795e1bc946b1a613d5bb4ffa60a7077c39d575f01bdd8506 SHA512 194544e8fafeb0847673abd84c8fbc876bb407bb76cb86c5a8a92fdb7571d3585e895f0063375e43b74de81b47e49cd6002f5b7a4f266d37bacc1b23e9ce4ef3 +DIST eventlet-0.30.0.tar.gz 401035 BLAKE2B 94a272ce810b28c00fc8a468f160e38f3c58c98750455e5eb096c266c46257a7e30e0278a6a8f509e47e6ab40297129ccf52b347a723037f9cc9b85a3e06a203 SHA512 c2ba28306e9e74536dcda33276f98f74051ea0e9c8669506d2e3b11715f37cd5963af6130f14761a42cc6c8346e59c756efe2cef0ea3547dc30ccb8bf0fb diff --git a/dev-python/eventlet/eventlet-0.29.1.ebuild b/dev-python/eventlet/eventlet-0.30.0.ebuild similarity index 92% rename from dev-python/eventlet/eventlet-0.29.1.ebuild rename to dev-python/eventlet/eventlet-0.30.0.ebuild index c1a6a203dce..bce0a6cda42 100644 --- a/dev-python/eventlet/eventlet-0.29.1.ebuild +++ b/dev-python/eventlet/eventlet-0.30.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_9 ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit distutils-r1 DESCRIPTION="Highly concurrent networking library" @@ -27,8 +27,8 @@ DEPEND="doc? ( >=dev-python/python-docs-2.7.6-r1:2.7 ) dev-python/nose[${PYTHON_USEDEP}] )" PATCHES=( - "${FILESDIR}/eventlet-0.25.1-tests.patch" - "${FILESDIR}/${P}-tests.patch" + "${FILESDIR}/${PN}-0.25.1-tests.patch" + "${FILESDIR}/${PN}-0.30.0-tests-socket.patch" ) distutils_enable_sphinx doc @@ -51,6 +51,7 @@ python_prepare_all() { python_test() { unset PYTHONPATH + export TMPDIR="${T}" nosetests -v || die } diff --git a/dev-python/eventlet/files/eventlet-0.29.1-tests.patch b/dev-python/eventlet/files/eventlet-0.29.1-tests.patch deleted file mode 100644 index 3cd20823899..000 --- a/dev-python/eventlet/files/eventlet-0.29.1-tests.patch +++ /dev/null @@ -1,71 +0,0 @@ -https://github.com/eventlet/eventlet/issues/646 -From 087ba743c7af8a40ac1e4e2ec89409eee3b4233e Mon Sep 17 00:00:00 2001 -From: Tim Burke -Date: Mon, 2 Nov 2020 16:09:46 -0800 -Subject: [PATCH] py39: Add _at_fork_reinit method to Semaphores - -CPython expects to be able to call such a method on RLocks, Conditions, -and Events in threading; since we may monkey-patch threading to use -Semaphores as locks, they need the method, too. - -Addresses #646 - eventlet/semaphore.py | 5 + - tests/semaphore_test.py | 21 + - 2 files changed, 26 insertions(+) - -diff --git a/eventlet/semaphore.py b/eventlet/semaphore.py -index 18b5b05f4..5e2b5e32f 100644 a/eventlet/semaphore.py -+++ b/eventlet/semaphore.py -@@ -39,6 +39,7 @@ def __init__(self, value=1): - if value < 0: - msg = 'Semaphore() expect value >= 0, actual: {0}'.format(repr(value)) - raise ValueError(msg) -+self._original_value = value - self.counter = value - self._waiters = collections.deque() - -@@ -51,6 +52,10 @@ def __str__(self): - params = (self.__class__.__name__, self.counter, len(self._waiters)) - return '<%s c=%s _w[%s]>' % params - -+def _at_fork_reinit(self): -+self.counter = self._original_value -+self._waiters.clear() -+ - def locked(self): - """Returns true if a call to acquire would block. - """ -diff --git a/tests/semaphore_test.py b/tests/semaphore_test.py -index d6c11d1f6..cf6a29daf 100644 a/tests/semaphore_test.py -+++ b/tests/semaphore_test.py -@@ -42,6 +42,27 @@ def test_timeout_non_blocking(self): - sem = eventlet.Semaphore() - self.assertRaises(ValueError, sem.acquire, blocking=False, timeout=1
[gentoo-commits] repo/gentoo:master commit in: dev-python/eventlet/, dev-python/eventlet/files/
commit: 7edee983d2a0d55012a7b4ce162f1f1fd860500b Author: Patrick McLean sony com> AuthorDate: Wed Nov 27 06:36:47 2019 + Commit: Patrick McLean gentoo org> CommitDate: Wed Nov 27 07:57:51 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7edee983 dev-python/eventlet-0.25.1-r1: revbump, python38, fix tests Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Patrick McLean gentoo.org> dev-python/eventlet/eventlet-0.25.1-r1.ebuild | 75 ++ .../eventlet/files/eventlet-0.25.1-tests.patch | 40 2 files changed, 115 insertions(+) diff --git a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild new file mode 100644 index 000..9d080f65712 --- /dev/null +++ b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} ) + +inherit distutils-r1 + +DESCRIPTION="Highly concurrent networking library" +HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"; +SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc examples test" + +RDEPEND=" + >=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}] + virtual/python-enum34[${PYTHON_USEDEP}] + >=dev-python/greenlet-0.3[${PYTHON_USEDEP}] + >=dev-python/monotonic-1.4[${PYTHON_USEDEP}] + >=dev-python/six-1.10.0[${PYTHON_USEDEP}]" +DEPEND="doc? ( >=dev-python/python-docs-2.7.6-r1:2.7 ) + test? ( ${RDEPEND} + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] )" + +PATCHES=( + "${FILESDIR}/eventlet-0.25.1-tests.patch" +) + +distutils_enable_sphinx doc +distutils_enable_tests nose + +python_prepare_all() { + # provided by virtual/python-enum34 + sed -i '/enum-compat/d' setup.py || die + + if use doc; then + local PYTHON_DOC_ATOM=$(best_version -b dev-python/python-docs:2.7) + local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}" + local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html" + local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv" + sed -i "s|'https://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die + fi + + if use test; then +# sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die +# sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die +# sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die + sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die + fi + + # Prevent file collisions from teestsuite + sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die + + distutils-r1_python_prepare_all +} + +python_prepare() { + if ! python_is_python3; then + # this is for python3 only + rm -r eventlet/green/http || die + fi +} + +python_install_all() { + if use examples; then + docompress -x "/usr/share/doc/${PF}/examples" + docinto examples + dodoc -r examples/. + fi + distutils-r1_python_install_all +} diff --git a/dev-python/eventlet/files/eventlet-0.25.1-tests.patch b/dev-python/eventlet/files/eventlet-0.25.1-tests.patch new file mode 100644 index 000..423f8ef8e40 --- /dev/null +++ b/dev-python/eventlet/files/eventlet-0.25.1-tests.patch @@ -0,0 +1,40 @@ +diff --git a/tests/ssl_test.py b/tests/ssl_test.py +index d8b7d7e..5a3580b 100644 +--- a/tests/ssl_test.py b/tests/ssl_test.py +@@ -180,7 +180,6 @@ class SSLTest(tests.LimitedTestCase): + self.assertEqual(client.recv(8), b'response') + stage_1.send() + +-tests.check_idle_cpu_usage(0.2, 0.1) + server_coro.kill() + + def test_greensslobject(self): +diff --git a/tests/zmq_test.py b/tests/zmq_test.py +index 601878f..c643e48 100644 +--- a/tests/zmq_test.py b/tests/zmq_test.py +@@ -432,6 +432,8 @@ class TestUpstreamDownStream(tests.LimitedTestCase): + events = sock2.getsockopt(zmq.EVENTS) + self.assertEqual(events & zmq.POLLIN, zmq.POLLIN) + ++# this will often fail on portage... ++@tests.skip_if(True) + @tests.skip_unless(zmq_supported) + def test_cpu_usage_after_bind(self): + """zmq eats CPU after PUB socket .bind() +@@ -461,14 +463,12 @@ class TestUpstreamDownStream(tests.LimitedTestCase): + sub.setsockopt(zmq.SUBSCRIBE, b"") + eventlet.sleep() + pub.send(b'test_send') +-tests.check_idle_cpu_usage(0.2, 0.1) + +