gentoo auto-resync : 25:12:2022 - 20:05:44

4 files changed, 2 insertions, 157 deletions

diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index b209ee56afd5..38feb9ba0d77 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,6 +1,3 @@
-AUX cheroot-8.6.0-remove-pypytools-dep.patch 2757 BLAKE2B 97628fd6590dbe41e34bf0b93bc1062c424097aeea26a86891e2d2fc049fb7ee7a990fc9b9d3dba9406bdd344e3c25cdd08907aaac11e64d78c73b3ccd9b3fa5 SHA512 ddc88d93c795ea25c56d0b2a1bfee1b0f9c900ec2594d69aa91c639575c86c1fb89accc95992587db76d5c4e438a34f2eceac480c60a5470aee5ecd996140e44
-DIST cheroot-8.6.0.tar.gz 134779 BLAKE2B 97d1a9bf0a8d72d3204972934aa3ac4c97246b413edebd9f38caa802a5343acc426f137addfdc0faec58f6af2d62bc22023e93b14e1b0b07f6be9ffb12e78306 SHA512 26e48c935fe32d4ce3cf6ae20b5b272416ca53bd8496527c2958ec2ebe87529c831f283ae900e13271b610e39531b682df0376935ecc3bcfcca11c299cd2a893
 DIST cheroot-9.0.0.tar.gz 152562 BLAKE2B 5f5dd172cfc8fdd1318b22fc27060444a34343b6b83bbda4bd40c16d7cb0568c356f5fd14b0a7cdc74895d6707077ec54fcae54fb29b0d16a7c06e2cd36b1ee7 SHA512 86ea0dd2cb4cde25f86b489b1d0bb27e3e7c1ba5449759ccecaae689cdcb349b968fd0c8fb8bc8273deff5e32a078bf40f4342f0c5a1f53bb8d2b968f44a453b
-EBUILD cheroot-8.6.0-r1.ebuild 1872 BLAKE2B 4392d43c6eca572c07129963eef6d8ea0fed1a97dea212fe8eba15d1a12a9860e506a3ec1e41bc726272aae9a5228740ae8a02dfdb6b8e780c4bf8da3c5f05bf SHA512 d25b25098dd127bbf59f089b457599271e36eec82746e57b105934838133adab76fae1b65a7132fb129ac70eb62df4dbb982fa5e660e096ff0c75f3f05d68122
-EBUILD cheroot-9.0.0.ebuild 1969 BLAKE2B 0deffd50d152435a3171f587423f190663850c84184e0c9b7d5745949fd9af7bdef4c8f817ce4044b86e7f76e9573fab687a06341d4cd8c67c0b53a859a86d2a SHA512 58556ac85c2ae0d2e0eb9a264806ea59af91fe646440ff11575b089e45f1f8427668b47edf5c556709a5dc859fac1c3f7a3f541509f1b6e08180f5102c11f6e7
+EBUILD cheroot-9.0.0.ebuild 1963 BLAKE2B 1bf883cac118a36e88f73105443918a7070248104e949e47224f4becd83fd10516005482663186c8788fcc8a477e0d53beea00bc36467b7a8d5eea3012ee1357 SHA512 26007638964aa07b39911ae4d83a9a158cc96b6ee48d188cb14d643c6d710b6bd39bd639f4cd80abf10ee4d71b2934fadf56500cc9574a377a147c2a7e3b9cd0
 MISC metadata.xml 391 BLAKE2B 1c9c2af2c1a8bcd3f1c426a87d1a2a97fb88a9a30f9c2f1802b8885329277fcfde1deadf635e419cd7f85a5685639709be33aa746d9f7a04c3ac7d832d084b42 SHA512 c194e8bed8d082ed4ce3f2a7f608085fdcf2ab8b7c730e5c6ad7438cf177ed1892565cdff0feda564681f59bf6aefc327e3d24da0a543c0f043934af27873e95
diff --git a/dev-python/cheroot/cheroot-8.6.0-r1.ebuild b/dev-python/cheroot/cheroot-8.6.0-r1.ebuild
deleted file mode 100644
index d3a9411fde90..000000000000
--- a/dev-python/cheroot/cheroot-8.6.0-r1.ebuild
+++ /dev/null
@@ -1,78 +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..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="High-performance, pure-Python HTTP server used by CherryPy"
-HOMEPAGE="
-	https://cherrypy.dev/
-	https://pypi.org/project/cheroot/
-	https://github.com/cherrypy/cheroot/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/jaraco-context[${PYTHON_USEDEP}]
-		dev-python/jaraco-text[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
-		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/pyopenssl[${PYTHON_USEDEP}]
-			dev-python/trustme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-PATCHES=(
-	# Bad dep (upstream gone, only PyPi package, has py2 code, etc)
-	"${FILESDIR}/${PN}-8.6.0-remove-pypytools-dep.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e '/--cov/d' \
-		-e '/--testmon/d' \
-		-e '/--numproc/d' \
-		-i pytest.ini || die
-
-	# broken
-	sed -e '/False.*localhost/d' \
-		-i cheroot/test/test_ssl.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_IGNORE=()
-	if ! has_version "dev-python/pyopenssl[${PYTHON_USEDEP}]" ||
-		! has_version "dev-python/trustme[${PYTHON_USEDEP}]"
-	then
-		EPYTEST_IGNORE+=(
-			lib/cheroot/test/test_ssl.py
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/cheroot/cheroot-9.0.0.ebuild b/dev-python/cheroot/cheroot-9.0.0.ebuild
index f16d3e17d8a7..18b5c59a86b6 100644
--- a/dev-python/cheroot/cheroot-9.0.0.ebuild
+++ b/dev-python/cheroot/cheroot-9.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/cheroot/files/cheroot-8.6.0-remove-pypytools-dep.patch b/dev-python/cheroot/files/cheroot-8.6.0-remove-pypytools-dep.patch
deleted file mode 100644
index f1f4fac26557..000000000000
--- a/dev-python/cheroot/files/cheroot-8.6.0-remove-pypytools-dep.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/cheroot/test/test_server.py b/cheroot/test/test_server.py
-index 8305c78c..39e4e066 100644
---- a/cheroot/test/test_server.py
-+++ b/cheroot/test/test_server.py
-@@ -16,7 +16,6 @@ import requests
- import requests_unixsocket
- import six
- 
--from pypytools.gc.custom import DefaultGc
- from six.moves import queue, urllib
- 
- from .._compat import bton, ntob
-@@ -330,8 +329,7 @@ def test_peercreds_unix_sock_with_lookup(peercreds_enabled_server):
-     ),
-     indirect=('resource_limit',),
- )
--@pytest.mark.usefixtures('many_open_sockets')
--def test_high_number_of_file_descriptors(native_server_client, resource_limit):
-+def _test_high_number_of_file_descriptors(native_server_client, resource_limit):
-     """Test the server does not crash with a high file-descriptor value.
- 
-     This test shouldn't cause a server crash when trying to access
-@@ -363,18 +361,6 @@ def test_high_number_of_file_descriptors(native_server_client, resource_limit):
-     assert any(fn >= resource_limit for fn in native_process_conn.filenos)
- 
- 
--if not IS_WINDOWS:
--    test_high_number_of_file_descriptors = pytest.mark.forked(
--        test_high_number_of_file_descriptors,
--    )
--
--
--@pytest.fixture
--def _garbage_bin():
--    """Disable garbage collection when this fixture is in use."""
--    with DefaultGc().nogc():
--        yield
--
- 
- @pytest.fixture
- def resource_limit(request):
-@@ -400,32 +386,3 @@ def resource_limit(request):
-     finally:
-         # Reset the resource limit back to the original soft limit
-         resource.setrlimit(resource.RLIMIT_NOFILE, (soft_limit, hard_limit))
--
--
--@pytest.fixture
--def many_open_sockets(request, resource_limit):
--    """Allocate a lot of file descriptors by opening dummy sockets."""
--    # NOTE: `@pytest.mark.usefixtures` doesn't work on fixtures which
--    # NOTE: forces us to invoke this one dynamically to avoid having an
--    # NOTE: unused argument.
--    request.getfixturevalue('_garbage_bin')
--
--    # Hoard a lot of file descriptors by opening and storing a lot of sockets
--    test_sockets = []
--    # Open a lot of file descriptors, so the next one the server
--    # opens is a high number
--    try:
--        for _ in range(resource_limit):
--            sock = socket.socket()
--            test_sockets.append(sock)
--            # If we reach a high enough number, we don't need to open more
--            if sock.fileno() >= resource_limit:
--                break
--        # Check we opened enough descriptors to reach a high number
--        the_highest_fileno = test_sockets[-1].fileno()
--        assert the_highest_fileno >= resource_limit
--        yield the_highest_fileno
--    finally:
--        # Close our open resources
--        for test_socket in test_sockets:
--            test_socket.close()