commit: 2cae59c762dd22236d7aaec7e979b67e0c10d8a5 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Thu Nov 24 06:32:09 2022 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Thu Nov 24 06:36:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cae59c7
dev-python/eventlet: treeclean Closes: https://bugs.gentoo.org/845723 Closes: https://bugs.gentoo.org/865499 Closes: https://bugs.gentoo.org/827876 Closes: https://bugs.gentoo.org/797586 Closes: https://bugs.gentoo.org/798114 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> dev-python/eventlet/Manifest | 1 - dev-python/eventlet/eventlet-0.33.1.ebuild | 63 ---------------------- .../eventlet/files/eventlet-0.25.1-tests.patch | 40 -------------- .../files/eventlet-0.30.0-tests-socket.patch | 13 ----- .../files/eventlet-0.30.2-test-timeout.patch | 39 -------------- dev-python/eventlet/metadata.xml | 12 ----- profiles/package.mask | 7 --- 7 files changed, 175 deletions(-) diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest deleted file mode 100644 index ee1cd1cc5b3f..000000000000 --- a/dev-python/eventlet/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST eventlet-0.33.1.tar.gz 415294 BLAKE2B 25efb9b9848a6e0db2040d111288447aa07ceb70d2cbd9b3d189a2ca58aadad6b6d64054f76f3329ff7ca832efccbabb780c839c4db6d95a5b623d80079b7da3 SHA512 c8ece6a26039631b13ecc188f480f348a42551267fb6135551899dec7a23d0cfd032c14728e114901e4d256bf580203bfbdb1795881abdd71e49a53f8ed58964 diff --git a/dev-python/eventlet/eventlet-0.33.1.ebuild b/dev-python/eventlet/eventlet-0.33.1.ebuild deleted file mode 100644 index 3dc52c7dc551..000000000000 --- a/dev-python/eventlet/eventlet-0.33.1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..9} ) - -inherit distutils-r1 - -DESCRIPTION="Highly concurrent networking library" -HOMEPAGE=" - https://pypi.org/project/eventlet/ - https://github.com/eventlet/eventlet/ -" -SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="examples" - -RDEPEND=" - >=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - virtual/python-greenlet[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}/eventlet-0.25.1-tests.patch" - "${FILESDIR}/eventlet-0.30.0-tests-socket.patch" - "${FILESDIR}/eventlet-0.30.2-test-timeout.patch" -) - -distutils_enable_tests nose - -src_prepare() { - # increase timeout - #791748 - sed -e '/eventlet.sleep/s/0.1/5.0/' -i tests/isolated/patcher_fork_after_monkey_patch.py || die - - distutils-r1_src_prepare -} - -python_test() { - unset PYTHONPATH - export TMPDIR="${T}" - nosetests -v -x || die -} - -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 deleted file mode 100644 index 423f8ef8e408..000000000000 --- a/dev-python/eventlet/files/eventlet-0.25.1-tests.patch +++ /dev/null @@ -1,40 +0,0 @@ -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) - - sender, receiver, _port = self.create_bound_pair(zmq.DEALER, zmq.DEALER) - eventlet.sleep() - sender.send(b'test_recv') - msg = receiver.recv() - self.assertEqual(msg, b'test_recv') -- tests.check_idle_cpu_usage(0.2, 0.1) - - - class TestQueueLock(tests.LimitedTestCase): diff --git a/dev-python/eventlet/files/eventlet-0.30.0-tests-socket.patch b/dev-python/eventlet/files/eventlet-0.30.0-tests-socket.patch deleted file mode 100644 index 4dd309c68a38..000000000000 --- a/dev-python/eventlet/files/eventlet-0.30.0-tests-socket.patch +++ /dev/null @@ -1,13 +0,0 @@ -Let's use TMPDIR as the base for this test's unix socket to help it pass. -We set TMPDIR in the ebuild to ${T}. ---- a/tests/backdoor_test.py -+++ b/tests/backdoor_test.py -@@ -47,7 +47,7 @@ class BackdoorTest(tests.LimitedTestCase): - self._run_test_on_client_and_server(client, serv) - - def test_server_on_unix_socket(self): -- SOCKET_PATH = '/tmp/eventlet_backdoor_test.socket' -+ SOCKET_PATH = os.getenv('TMPDIR', '/tmp') + '/eventlet_backdoor_test.socket' - if os.path.exists(SOCKET_PATH): - os.unlink(SOCKET_PATH) - listener = socket.socket(socket.AF_UNIX) diff --git a/dev-python/eventlet/files/eventlet-0.30.2-test-timeout.patch b/dev-python/eventlet/files/eventlet-0.30.2-test-timeout.patch deleted file mode 100644 index d31b3738bc16..000000000000 --- a/dev-python/eventlet/files/eventlet-0.30.2-test-timeout.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0b8fd069386354d2d7e5464ce0b0d5b7d1795376 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org> -Date: Sun, 11 Apr 2021 12:20:09 +0200 -Subject: [PATCH] Force test timeouts to 60 s - -The upstream test timeouts are far too low for a busy system, and there -is no point in pursuing such low values anyway. Force 60 s that should -be reasonably safe for our test runs. ---- - tests/__init__.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/__init__.py b/tests/__init__.py -index 82cd247..3a943c4 100644 ---- a/tests/__init__.py -+++ b/tests/__init__.py -@@ -170,8 +170,8 @@ class LimitedTestCase(unittest.TestCase): - - def setUp(self): - self.previous_alarm = None -- self.timer = eventlet.Timeout(self.TEST_TIMEOUT, -- TestIsTakingTooLong(self.TEST_TIMEOUT)) -+ self.timer = eventlet.Timeout(60, -+ TestIsTakingTooLong(60)) - - def reset_timeout(self, new_timeout): - """Changes the timeout duration; only has effect during one test. -@@ -350,7 +350,7 @@ def run_python(path, env=None, args=None, timeout=None, pythonpath_extend=None, - stdout=subprocess.PIPE, - ) - if timeout is None: -- timeout = 10 -+ timeout = 60 - try: - output, _ = p.communicate(timeout=timeout) - except subprocess.TimeoutExpired: --- -2.31.1 - diff --git a/dev-python/eventlet/metadata.xml b/dev-python/eventlet/metadata.xml deleted file mode 100644 index 411e9d7f41d0..000000000000 --- a/dev-python/eventlet/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>pyt...@gentoo.org</email> - <name>Python</name> - </maintainer> - <upstream> - <remote-id type="pypi">eventlet</remote-id> - <remote-id type="github">eventlet/eventlet</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 2aa0eaa20f52..341d720bd5cb 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -440,13 +440,6 @@ sci-calculators/grpn # Masked for removal in 30 days. dev-ruby/ruby-sdl -# Michał Górny <mgo...@gentoo.org> (2022-10-21) -# Barely maintained upstream. Still lacking support for Python 3.10. -# All revdeps in Gentoo were pure test deps, and only optional -# (because they would otherwise block Python 3.10). -# Removal on 2022-11-20. Bug #845723. -dev-python/eventlet - # John Helmert III <a...@gentoo.org> (2022-10-16) # <OpenSSL-1.1.1 are EOL and contain known vulnerabilities. Users should # migrate to a newer branch.
