gentoo auto-resync : 10:11:2024 - 21:02:06

3 files changed, 4 insertions, 137 deletions

diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 7cf37a52a3f8..a6d0fb810d76 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,9 +1,7 @@
 DIST aiohttp-3.10.10.tar.gz 7542993 BLAKE2B edc9808937892e2915b591a3d5b9e2be8401a67e6421ada8c49e27cfa1ee67283465d17e3c3a77f7579d4ed45df39884a2f9e336429ef7d64adf351ce7507a85 SHA512 c6928d989c110c323347b6f5b0a90c42e17924b4121455a240f5a15d87f939580640ba0f8d576f8254e484e5b631ec4562a2fb4e6c86402924b1892a6d72aff8
-DIST aiohttp-3.11.0b2.tar.gz 7615280 BLAKE2B a37a095b065adc4ecadfb8c01713848a504ee4ae87a16073283463b0d49dd4adb1439ee900e4015061dc217dacd285faf8e2dc9abcd3dc98ad09836ac07c8611 SHA512 babbcbdf291d80dbb26b2b32db328844d4a815360d8862915b9e5e11c508ab6c381092565d3b014a5c53047b375645f7f607ac6c6a8ed2f15639ebe03148bfa7
-DIST aiohttp-3.11.0b3.tar.gz 7617599 BLAKE2B 02cac5fbaeec0f7d7114bcac48246dfc3777f91e0aeef489f1e537a9e034c09d3e9e8959825c87775ec92f012542138d790be4b4dff89b99c35b87fbc59a236e SHA512 13a3be6a9148363b75ff959b2b0bcb0669990043c89a8f05cbeb133f4e1180ee7ebb1fc8aa5ed6c5dea9e1950294b8ce4f36e54d02e9e4bad03be13083bf3fe8
 DIST aiohttp-3.11.0b4.tar.gz 7618792 BLAKE2B ec809ddfac1c4dd70a84e4ec03e58e20d8f52af6311dc4712cc54321a6d34d551fe13bcc507e293e5a14afbb42dd4beb8544941fbc749fa4c3241a732aaed03e SHA512 2790e9ee096c5825210b98ea18b0119e29b40203e7f62092afc637463e58c8d4036eea7ef4aef7eb58a5bb5fb677ed1251665d70b0ab37f4961de928eb381aec
+DIST aiohttp-3.11.0b5.tar.gz 7621335 BLAKE2B 79fb393009c197f46b096fffa164c3da2380c711c3e28aec8d745c1af3776ea95c097a050943cc4c431c026ac5349c30728c363aa84de50a81162c817af8b319 SHA512 27ac64085317308e9281d8ac047e940f3dc86d4c871c3125b951ed190445623750a3c75745cf01d93739ea1c55126a5b5a56d59fd359ed89f17eaa9792a216a2
 EBUILD aiohttp-3.10.10.ebuild 3228 BLAKE2B 9460d28a9b9d85addbb378a77575cbeadec2c40f4a172aa16955fe2676bc2cea291e7019dd9480a30afc3c8957f69d05a83f6d6151a187ea8f6e9a59e9de6acc SHA512 0fdc8696e8aae4f3e3a0d7636f135bc6268b18299886df364c7dcff536b6817cd82ed93898065770c7791428e984a657f1ab87472eeac10f639350eea34ee0ab
-EBUILD aiohttp-3.11.0_beta2.ebuild 3530 BLAKE2B a6c3a9169fdde6ae4ad4c4fac33dc47a4fc9f66f526256dddc9931ccf791d5669223247d56707f7faea54c757eba89d914f8d59b218547cbd2348e8c950bf962 SHA512 1e10410716d6e00e887fd582234668116cceaee08cdf8e1c23d1048ec69756d68114f971a52b5994ae0c997fa55a57bb71e67f0f53b5ede1a88075dc63e4bbe2
-EBUILD aiohttp-3.11.0_beta3.ebuild 3530 BLAKE2B a6c3a9169fdde6ae4ad4c4fac33dc47a4fc9f66f526256dddc9931ccf791d5669223247d56707f7faea54c757eba89d914f8d59b218547cbd2348e8c950bf962 SHA512 1e10410716d6e00e887fd582234668116cceaee08cdf8e1c23d1048ec69756d68114f971a52b5994ae0c997fa55a57bb71e67f0f53b5ede1a88075dc63e4bbe2
 EBUILD aiohttp-3.11.0_beta4.ebuild 3530 BLAKE2B 2898f25a2ced303720d238aa12827cfe5c8146edd36f60ae79bdb716cb6bb0f7672702288cbfae21b28d0217fcef885faa3ecb8be806dc4e28b2901ee730d8ad SHA512 5eb2983e0e489768ea0141b52c1816515d631e754e7f3bf096d78742633dbac5fbf26966edb424e44f2f31083226111081545d4beda2aa2a7121f04ecd3f2f55
+EBUILD aiohttp-3.11.0_beta5.ebuild 3549 BLAKE2B 2169ec81c8dae03fa993e9ec327bc2ef2b9878d545c11dd49f130ca541bdacbbb2c3aba8623f2f5e820a5e281ecd4bacd490dccd6ae0fd43ec1769c994ae59d0 SHA512 d134edb55e4a8f932f4f883395da2f7217274d0a6070e8b96533da0b20cf7ea6e468ba99dbe93c084d4739fc0861bef79200e50cb9e3619aad03d52ebf8eeff1
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.11.0_beta3.ebuild b/dev-python/aiohttp/aiohttp-3.11.0_beta3.ebuild
deleted file mode 100644
index c1f710ce8a30..000000000000
--- a/dev-python/aiohttp/aiohttp-3.11.0_beta3.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP client/server for asyncio"
-HOMEPAGE="
-	https://github.com/aio-libs/aiohttp/
-	https://pypi.org/project/aiohttp/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+native-extensions test-rust"
-
-RDEPEND="
-	>=dev-python/aiodns-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohappyeyeballs-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/brotlicffi[${PYTHON_USEDEP}]
-	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/propcache-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.17.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		<dev-python/async-timeout-5[${PYTHON_USEDEP}]
-		>=dev-python/async-timeout-4.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		test-rust? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# increase the timeout a little
-	sed -e '/abs=/s/0.001/0.01/' -i tests/test_helpers.py || die
-	# xfail_strict fails on py3.10
-	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
-	sed -i -e 's:-Werror::' Makefile || die
-
-	distutils-r1_src_prepare
-}
-
-python_configure() {
-	if [[ ! -d tools && ${EPYTHON} != pypy3 ]] && use native-extensions
-	then
-		# workaround missing files
-		mkdir tools || die
-		> requirements/cython.txt || die
-		> tools/gen.py || die
-		chmod +x tools/gen.py || die
-		# force rehashing first
-		emake requirements/.hash/cython.txt.hash
-		> .update-pip || die
-		> .install-cython || die
-		emake cythonize
-	fi
-}
-
-python_compile() {
-	# implicitly disabled for pypy3
-	if ! use native-extensions; then
-		local -x AIOHTTP_NO_EXTENSIONS=1
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# proxy is not packaged
-		tests/test_proxy_functional.py
-		# python_on_whales is not packaged
-		tests/autobahn/test_autobahn.py
-		# benchmarks
-		tests/test_benchmarks_client.py
-		tests/test_benchmarks_client_request.py
-		tests/test_benchmarks_client_ws.py
-		tests/test_benchmarks_cookiejar.py
-		tests/test_benchmarks_http_websocket.py
-		tests/test_benchmarks_http_writer.py
-	)
-
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/test_client_session.py::test_client_session_timeout_zero
-		# broken by irrelevant deprecation warnings
-		tests/test_circular_imports.py::test_no_warnings
-	)
-
-	# upstream unconditionally blocks building C extensions
-	# on PyPy3 but the test suite needs an explicit switch
-	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
-		local -x AIOHTTP_NO_EXTENSIONS=1
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin
-	rm -rf aiohttp || die
-	epytest -m "not internal and not dev_mode" \
-		-p rerunfailures --reruns=5
-}
diff --git a/dev-python/aiohttp/aiohttp-3.11.0_beta2.ebuild b/dev-python/aiohttp/aiohttp-3.11.0_beta5.ebuild
index c1f710ce8a30..2d93058de5ea 100644
--- a/dev-python/aiohttp/aiohttp-3.11.0_beta2.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.11.0_beta5.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	>=dev-python/propcache-0.2.0[${PYTHON_USEDEP}]
 	>=dev-python/yarl-1.17.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		<dev-python/async-timeout-5[${PYTHON_USEDEP}]
+		<dev-python/async-timeout-6[${PYTHON_USEDEP}]
 		>=dev-python/async-timeout-4.0[${PYTHON_USEDEP}]
 	' 3.10)
 "
@@ -64,7 +64,7 @@ src_prepare() {
 	# increase the timeout a little
 	sed -e '/abs=/s/0.001/0.01/' -i tests/test_helpers.py || die
 	# xfail_strict fails on py3.10
-	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
+	sed -i -e '/--cov/d' -e '/pytest_cov/d' -e '/xfail_strict/d' setup.cfg || die
 	sed -i -e 's:-Werror::' Makefile || die
 
 	distutils-r1_src_prepare