From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- dev-python/eventlet/Manifest | 5 +- dev-python/eventlet/eventlet-0.30.0-r1.ebuild | 64 ++++++++++++++++++++ dev-python/eventlet/eventlet-0.30.0.ebuild | 65 -------------------- dev-python/eventlet/eventlet-0.30.2-r1.ebuild | 66 +++++++++++++++++++++ dev-python/eventlet/eventlet-0.30.2.ebuild | 69 ---------------------- .../files/eventlet-0.30.2-test-timeout.patch | 39 ++++++++++++ 6 files changed, 172 insertions(+), 136 deletions(-) create mode 100644 dev-python/eventlet/eventlet-0.30.0-r1.ebuild delete mode 100644 dev-python/eventlet/eventlet-0.30.0.ebuild create mode 100644 dev-python/eventlet/eventlet-0.30.2-r1.ebuild delete mode 100644 dev-python/eventlet/eventlet-0.30.2.ebuild create mode 100644 dev-python/eventlet/files/eventlet-0.30.2-test-timeout.patch (limited to 'dev-python/eventlet') diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest index a423d52e8752..15ea6290c388 100644 --- a/dev-python/eventlet/Manifest +++ b/dev-python/eventlet/Manifest @@ -1,7 +1,8 @@ AUX eventlet-0.25.1-tests.patch 1428 BLAKE2B be4b0e0104473e8434075175a85cb658e7257eea6bb554f92160d308649aa7faee6f4db7d2aa8a3df54e22bf6689d649dec6b74d523425a27bc1a77233b5976e SHA512 a7a413cce99def526ed63b79d1f73d270db9332ac88ff83a830fdc4106ffa20f2e14dfbf8d0dbdd071d39c4d2f161250bd8e7c0681f187fa0736d8184cccd872 AUX eventlet-0.30.0-tests-socket.patch 607 BLAKE2B 3da02ca5cbc16ef2a8ecbd6fc9f817404cd2ad6cd6378e0faaaac7c9721e0ac03d3becee1962f44df3edfe0c30c55d7eb92c66b4a01bc94468d4f1791e40eecc SHA512 3a4f6985c3880a85578591ccbdcc0e76f5dce7c4c8897489d2f2976faf3e73e7ab1d755c91ddfa4cf28b1019e730580ba45184179c0ceef6eee859a2bf6ae28e +AUX eventlet-0.30.2-test-timeout.patch 1421 BLAKE2B 11730b1a5827d1b30537eaecb896d981b19875fdcbf874625057a838b5a48638bec45adecfb9445f68111d00075e81a13780f87f09a11ae332fd6f48748b7db9 SHA512 fa338488912b87bf4ae802ccfc0fcc6e1506ea3d47f82f86da1fced0d3928410a3d62588a9d14b39b6846b4b9539c37d9b678f575680432cbafd3dc3e07f9f82 DIST eventlet-0.30.0.tar.gz 401035 BLAKE2B 94a272ce810b28c00fc8a468f160e38f3c58c98750455e5eb096c266c46257a7e30e0278a6a8f509e47e6ab40297129ccf52b347a723037f9cc9b85a3e06a203 SHA512 c2ba283063333e9e74536dcda33276f98f74051ea0e9c8669506d2e3b11715f37cd5963af6130f14761a42cc6c8346e59c756efe2cef0ea3547dc30ccb8bf0fb DIST eventlet-0.30.2.tar.gz 401552 BLAKE2B 89291efde90d106a96eebd4ea4a892eeb005d6850262b28f7a4508f4f3ccfb9b49dc392dcb6eb0cf20c5d171d26d2a6639627188c97123546162e4e8c61c464d SHA512 af31a7b126f2120dd77699dcf25c7134af1bcf664f40b2422238a3d2120457d5a4d5764e23016ce209882a8b888f94d2776fe194c33092f4a33111b2ac8f0cf1 -EBUILD eventlet-0.30.0.ebuild 1831 BLAKE2B 8f45971352cc6fecfe468a0c59dba62fc62ddd06ffbdbdeabc69cfa579734eb7e20261a5458ed6f178a1d29d45e3dbfc590ae593715f92e1c889a4513fa2e4f5 SHA512 256c6a0502e18cd4ead3f607c42c609c6b811f6b069fd392f37f1f83ecb28b344659bfbf4569f388e7d0b3698a3167fcb462b3fa85baed681c041b60fc6c6024 -EBUILD eventlet-0.30.2.ebuild 1791 BLAKE2B bcb3254a77968390161f352b2d877372016a0f990c55fb93fa410187270ea1fe02759ae7b1b21eb215b2d00d80c4fcd6fd6adf6d17dedd916eaf7f15bbe73715 SHA512 1e52f125598d0949821b41ec33af563589042ef266ab36ddfa13db5ab1eaca9270489659a740e3b58d1d09a355c9895a9a9e919c8b198a039fc6491fcffa2d00 +EBUILD eventlet-0.30.0-r1.ebuild 1785 BLAKE2B 6ba2285e9368427aa547becbaf4973654733990253be55b87500853925783456cbe4c72d7b9864ba1b2c062156386a4a5ba434bcfb5c091e80d9e162fa8189b1 SHA512 df33839410c4f074b6e5bd9d349226a0af9c94905b7beaf07410eef40776dd70fed116f40c30df9a152126ae26ea931839443f12107d3e0de1c58f628531ab31 +EBUILD eventlet-0.30.2-r1.ebuild 1696 BLAKE2B ff7ce278853e6ebd3e6f0e5939b3c011c4368cba536620e3fd56f10c6b80a2bf82856809aa9c72440080904684bb4466ea65a18d33104de55413785f24386ec4 SHA512 be1e474154b49e7aac41598ef2656510e07c748ad8f1501cb087091620d43986fb34be8ddf885eaa27790120a9e7e9539a5d27a5f7dd7b89b0a5fb419f96781a MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa diff --git a/dev-python/eventlet/eventlet-0.30.0-r1.ebuild b/dev-python/eventlet/eventlet-0.30.0-r1.ebuild new file mode 100644 index 000000000000..4e937ab0a086 --- /dev/null +++ b/dev-python/eventlet/eventlet-0.30.0-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,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/e/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc x86" +IUSE="doc examples test" + +RDEPEND=" + >=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}] + =dev-python/greenlet-0.3[${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}/${PN}-0.25.1-tests.patch" + "${FILESDIR}/${PN}-0.30.0-tests-socket.patch" +) + +distutils_enable_sphinx doc +distutils_enable_tests nose + +python_prepare_all() { + 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 + + # Prevent file collisions from teestsuite + sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + unset PYTHONPATH + export TMPDIR="${T}" + nosetests -v || 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/eventlet-0.30.0.ebuild b/dev-python/eventlet/eventlet-0.30.0.ebuild deleted file mode 100644 index ccedd92056ff..000000000000 --- a/dev-python/eventlet/eventlet-0.30.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,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/e/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc x86" -IUSE="doc examples test" - -RDEPEND=" - >=dev-python/dnspython-1.15.0[${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}/${PN}-0.25.1-tests.patch" - "${FILESDIR}/${PN}-0.30.0-tests-socket.patch" -) - -distutils_enable_sphinx doc -distutils_enable_tests nose - -python_prepare_all() { - 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 - - # Prevent file collisions from teestsuite - sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - unset PYTHONPATH - export TMPDIR="${T}" - nosetests -v || 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/eventlet-0.30.2-r1.ebuild b/dev-python/eventlet/eventlet-0.30.2-r1.ebuild new file mode 100644 index 000000000000..f8d57c28dd02 --- /dev/null +++ b/dev-python/eventlet/eventlet-0.30.2-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +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 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="doc examples" + +RDEPEND=" + >=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}] + =dev-python/six-1.10.0[${PYTHON_USEDEP}] + virtual/python-greenlet[${PYTHON_USEDEP}] +" +BDEPEND=" + doc? ( >=dev-python/python-docs-2.7.6-r1:2.7 ) + 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_sphinx doc +distutils_enable_tests nose + +python_prepare_all() { + 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 + + distutils-r1_python_prepare_all +} + +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/eventlet-0.30.2.ebuild b/dev-python/eventlet/eventlet-0.30.2.ebuild deleted file mode 100644 index e34678ddab00..000000000000 --- a/dev-python/eventlet/eventlet-0.30.2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,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/e/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="doc examples" - -RDEPEND=" - >=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}] - =dev-python/monotonic-1.4[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - virtual/python-greenlet[${PYTHON_USEDEP}] -" -BDEPEND=" - doc? ( >=dev-python/python-docs-2.7.6-r1:2.7 ) - test? ( - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-0.25.1-tests.patch" - "${FILESDIR}/${PN}-0.30.0-tests-socket.patch" -) - -distutils_enable_sphinx doc -distutils_enable_tests nose - -python_prepare_all() { - 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 - - # Prevent file collisions from teestsuite - sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - unset PYTHONPATH - export TMPDIR="${T}" - nosetests -v || 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.30.2-test-timeout.patch b/dev-python/eventlet/files/eventlet-0.30.2-test-timeout.patch new file mode 100644 index 000000000000..d31b3738bc16 --- /dev/null +++ b/dev-python/eventlet/files/eventlet-0.30.2-test-timeout.patch @@ -0,0 +1,39 @@ +From 0b8fd069386354d2d7e5464ce0b0d5b7d1795376 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +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 + -- cgit v1.2.3