gentoo auto-resync : 29:01:2024 - 18:57:21

13 files changed, 109 insertions, 13 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 6b07be891a57..e13383ef6d75 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 8472f36c1ec1..9e15ad00461b 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -4,5 +4,5 @@ DIST numpy-1.26.2.tar.gz 15664248 BLAKE2B 006e511e27c009f27bf4bf6c8c30c84a4bf0e8
 DIST numpy-1.26.3.tar.gz 15679696 BLAKE2B 4c063e1a495b187049b5604686c0411b056fd03a69b5044cff10693694a7f055c87a017334cf8d05aa4a4cb87896fdf9203f51742d3cf83dbaf611b0e6e4091a SHA512 25556b41e2db9cfc52c1dfa61b05e4fc1b7b6df3b169f365375575d1146857fdb5ff91ca1508b968c296b7a06e5c6d95e82c41cdc3561587a46d3aa178f6305d
 EBUILD numpy-1.26.1.ebuild 4493 BLAKE2B 7f588777822396538c2004ce566575508aa65dae01afde32bfd40ac74955fbba98758d2cdaafbd51070b073bf216a528cc2c930970ed7de018b2def0e2b15722 SHA512 2e55c6c7e80864b031a834cbbe5862f608d9d77ddcfb6f868504951889e639f4d39bc1097c1d5a34a145d44511450de0fe38a3299de69d4f059c65b0456a9720
 EBUILD numpy-1.26.2.ebuild 4769 BLAKE2B 0185c924c3348ab96eb83c2ec6d766994c0ea325c5d7287caa5a8e1cc3be6401b35eaf0bc5d6703e74f4ee8a4de6ef4e1514deae3ea904cf9b083aea7ed8da9a SHA512 d18013696e917b2a7841fc2bf6a122cf6ba400f1d109878ada6abee0640fd06fd91ab2480eb6b429e014891fa96cfab3c090964d149a6e3d1dd0859fc36aa041
-EBUILD numpy-1.26.3.ebuild 4789 BLAKE2B 264c452c699c41993773dba9d3be643e7952112bc49b577f81d3a5823666ddaab0cbf3e7c7ed0ea6444be78361a83a97737da83bf308b170ce2796466b32df47 SHA512 865965ed6840d8999bf1de879f72a8d38a7f1083be25d3325071ff55ab1b85896105b1e3e4ebe5dedf65c6089b1189d8194ada49ecaaba17f241b435d2c75e92
+EBUILD numpy-1.26.3.ebuild 4787 BLAKE2B 22d76498a5fe1340594347ec1780140b8d5e20a33fc74c04defe02365e16d3c82ecc2de8f3a9ed205aee754865ee7109003ad62eebac5d7c99f662729bef2c4f SHA512 829d0fa1472cfc0e509e091c5889d2eb1c0cdb132f329774d088d6ee4cbd4d44b209eb304fbb8e3716a7e284773b52a0247ca0187979fad38b6287d5b4c206f8
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/numpy-1.26.3.ebuild b/dev-python/numpy/numpy-1.26.3.ebuild
index 0b04cfc5e5f3..1bd624c00d92 100644
--- a/dev-python/numpy/numpy-1.26.3.ebuild
+++ b/dev-python/numpy/numpy-1.26.3.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 # is barely supported anyway, see bug #914358.
 IUSE="+lapack"
 if [[ ${PV} != *_[rab]* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 RDEPEND="
diff --git a/dev-python/pytest-lazy-fixture/Manifest b/dev-python/pytest-lazy-fixture/Manifest
index bfa74cfef6b0..cdf0e1125319 100644
--- a/dev-python/pytest-lazy-fixture/Manifest
+++ b/dev-python/pytest-lazy-fixture/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-lazy-fixture-0.6.3.tar.gz 7878 BLAKE2B f3a034678f590090a453b44b9fea938ced040c80922f139f3321ec20db856be219d039c7f4199ef67af79b5008d37425b5c08a0edaf71fdd7c8f248702acf488 SHA512 3281edc516f21f23104d7fc188b5c9aecf364f55109dab52865cbfef4a540727eb2bd42fb9806a7e8be728b249bc7a224ffdbab96473f043bef9a7aea1e4baa8
-EBUILD pytest-lazy-fixture-0.6.3.ebuild 540 BLAKE2B 35e1a05530833f3366ddb45b330a0d474c5fe4c9eebf958c15155128a41890df9ebf36c0f3a7104538bb369e075fa90ea8107cfc386744094f697ade5af11a1d SHA512 4a3faedf384943dc5cebb21bf1e3ffe1309f6eaa63a70f0dfdf6bfd26eb5f8e5b3ea183dba2563bcb81f254514aba1566edb72985402a3edb235751856c9ef3b
+EBUILD pytest-lazy-fixture-0.6.3-r1.ebuild 598 BLAKE2B ebe4ad9d86d6396ec4c24f4334c1f588e74609131bbb22ceeff5f97565e5a1b4a82845c55be6e07a2c345045254d63118ab7f94bfc9b90596c4a96610656b064 SHA512 ad7bc20baa467985492b7505608713661b20050360846543687e0f3dc82936b1cf4102ddfc71cd0ef454759dbca8fb366a58bef0bfde056a83637a70aa1e7606
 MISC metadata.xml 413 BLAKE2B 12c78c7219d94bb10ab01fa41375b079240b89e2a9749c712859f279b17250a324bba3eeef519e0008130e9a2d9a859a09dfe7e7f618dfed41ea6fd7b93bb58a SHA512 96aafce95f7f50725348911c54f1b0876f413caf0c41fddbe55caf57495e799ebc8884790a22c3b7c2d89b2dc9354c592a1ed8a6852b9a51b4a80c4f124d57ac
diff --git a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3-r1.ebuild
index 7088080bf410..500904a50a46 100644
--- a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
+++ b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3-r1.ebuild
@@ -1,20 +1,26 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
 inherit distutils-r1 pypi
 
 DESCRIPTION="It helps to use fixtures in pytest.mark.parametrize"
-HOMEPAGE="https://github.com/tvorog/pytest-lazy-fixture"
+HOMEPAGE="
+	https://github.com/tvorog/pytest-lazy-fixture/
+	https://pypi.org/project/pytest-lazy-fixture/
+"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv ~s390 sparc x86"
 
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+RDEPEND="
+	<dev-python/pytest-8[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/simpervisor/Manifest b/dev-python/simpervisor/Manifest
index 09d414de7b7a..b09f79deb59c 100644
--- a/dev-python/simpervisor/Manifest
+++ b/dev-python/simpervisor/Manifest
@@ -1,3 +1,4 @@
+AUX simpervisor-1.0.0-yarl.patch 914 BLAKE2B 06a317c4fe6b464bcb7b920be870749949e1220739279fd3a347d833aff428188deab6d4dd1a09246a1d5b886496c5e37dd6f84b52f42ac02918811419046fc7 SHA512 327ba1fea64d1e178d5f5320e031c73e4ed5865f3c98694a94c7cc81905a8a5b06ead6df1308010765c5a4fc3c38adc5aea9b6e9568365a0fa303c2962de205e
 DIST simpervisor-1.0.0.tar.gz 14637 BLAKE2B 3e87cca2478f29e044cafa0f5da6a5c8cfdf61f5c39ce87a0a6bae91670463d894e5c23af53c915b7d3469eade8d26947ea2e5c05c6d491bd33222e817319100 SHA512 0074ca5da0839f7bcf3f692f33f9a27358409bc194cfe04ff906aaec5f4cfbd613ccd285612ac473f5b6452a5c31959c098955a1962755a5c09258ded0d2a430
-EBUILD simpervisor-1.0.0.ebuild 584 BLAKE2B 38864adcda9c993d48f05ac365fd24011b98647fa8de14879cab4430fe2be10291340b887dce7d7664fc607471c07b5b169868fa441fca954a85e3d6438a78fc SHA512 b955e53cf2ae51c6d8292be86e1cc2ee62688ff8914328f0e80a1751c451a4dcabc0c66d7d92ee195b1fb4155316442121c69988fc139b70a7e1ef1808c33a28
+EBUILD simpervisor-1.0.0-r1.ebuild 681 BLAKE2B 753a138f7098e783a6f64ab3a3f4ce065ece9ca4c7190f1f5731360d2939b83b3a90b844cf0feb4b6221e0dfd8efeec2b2237d0fa427c418c4b7dc7ab8ff930c SHA512 189e2b095429e27c5cd52471fbcba6f7054af3434638eac63194664c3164bb5bfddb4117172f7685fc6f78b7767fff798e8f7334a2aff51faf152e15217be096
 MISC metadata.xml 416 BLAKE2B 5a2eaeb468acd18ff9b8259bd8428aeb23292e06ad087f0fa9d7b4a3ffd340c8458fad980223b1b342225b518db8eea23af97f07079ae9a3518bb5a50d17edbf SHA512 2cf5e0a854134ed7de9418ba3f84e7a5708ca158021bcb3467b335a9b59686f034a152884e40aaf487b1f3f430f7404f8ed4e52f0192800400aa5cd32b31167d
diff --git a/dev-python/simpervisor/files/simpervisor-1.0.0-yarl.patch b/dev-python/simpervisor/files/simpervisor-1.0.0-yarl.patch
new file mode 100644
index 000000000000..5f884255262c
--- /dev/null
+++ b/dev-python/simpervisor/files/simpervisor-1.0.0-yarl.patch
@@ -0,0 +1,28 @@
+From b08f4b9b46009fb96c7194aecbc28d6b266e44c0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 29 Jan 2024 18:14:32 +0100
+Subject: [PATCH] Convert `PORT` envvar to int to fix aiohttp/yarl
+ compatibility
+
+Conver the value of the `PORT` environment variable to int, to fix
+incompatibility with modern versions of aiohttp/yarl, that do expect
+the `port` argument to be one.
+
+Fixes #49
+---
+ tests/child_scripts/simplehttpserver.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/child_scripts/simplehttpserver.py b/tests/child_scripts/simplehttpserver.py
+index cc460ff..268dc7d 100644
+--- a/tests/child_scripts/simplehttpserver.py
++++ b/tests/child_scripts/simplehttpserver.py
+@@ -11,7 +11,7 @@
+ print("waiting", wait_time)
+ time.sleep(wait_time)
+ 
+-PORT = os.environ["PORT"]
++PORT = int(os.environ["PORT"])
+ 
+ routes = web.RouteTableDef()
+ 
diff --git a/dev-python/simpervisor/simpervisor-1.0.0.ebuild b/dev-python/simpervisor/simpervisor-1.0.0-r1.ebuild
index ac7a8e2d6665..344831934f52 100644
--- a/dev-python/simpervisor/simpervisor-1.0.0.ebuild
+++ b/dev-python/simpervisor/simpervisor-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,3 +27,8 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/jupyterhub/simpervisor/pull/50
+	"${FILESDIR}/${P}-yarl.patch"
+)
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index 157c3b994591..525b2a28b542 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,3 +1,4 @@
+AUX sybil-6.0.2-pytest-8.patch 2027 BLAKE2B c71742c315b0195a5984a40b399e071f648c9c5a688f3099d2a8771f01c946ae9074be307793055235225364330b72d7e00b27c03a3c94f0a56d316c60fc6b3a SHA512 f9c237aea2c498d3df076b011a377983344ad03b89e2f11146f13216d38157795f67f2afd78bf714ffbce2902d73caf1a79e01409738d92d8f3df4ee97761fa1
 DIST sybil-6.0.2.gh.tar.gz 67619 BLAKE2B ec723cb21d2ac1232bd6e9a3e3edb0bc65c705048c2d288df778b4dd19a1b46c956f7d2bd57dfa028d7a8a06357501ffc1226ba171e2073abec51f8d3c536d86 SHA512 9966173b5fb013be1f298b586052d8c10b76efb43bf5230f3d0b780e6d6238e7e33840eeb7c8b9860911351ea612766ed19ea2a61d48424465f3b58e408da5d2
-EBUILD sybil-6.0.2.ebuild 734 BLAKE2B 46ce10ce0cac76396586205f9a4abb001f265c0b3b03149e065fd023eefd102517057e2ed7dd7080e47648abda923518fc394de99d42a9df03cb848f99808be8 SHA512 690027da753a48fea77fae8bc519698cd75a2a6518d7c76cfbfad8b775dbaa28f4580c266b896f95d79734da452a2738ea63638d40d03c3f597a672910ffe37a
+EBUILD sybil-6.0.2-r1.ebuild 901 BLAKE2B 559ec680a63f7a095b352808370bf04950ea23f683f0a4800a8dc3468a6c19f2ad5e90811daad2d60217b04a31c115782cafefc933e254b67acdb8f990ca682e SHA512 d58e428155a5727391159e7e500c405ab2705fcb93416127aad3360abaaa79ebadb64768a0568358bda4e1740cd46d873862c7301eb82673183a46c2ffe6ef79
 MISC metadata.xml 402 BLAKE2B 3fcce3ac9ff731e24a3f6e761da2d840b3a7c9107b3d9a46afe00fed61b475d1400580b4ccf49dd71f6a1ab8098dc2aaf895e529a723cd96301d1400ee211edf SHA512 138106c714dc33871ccf535cc47d669580b665c842adfea5442a03067fe507236d8fde4158f006e1188003abe53c9c25db98632dadd1cfa0e41efd1755c2c75c
diff --git a/dev-python/sybil/files/sybil-6.0.2-pytest-8.patch b/dev-python/sybil/files/sybil-6.0.2-pytest-8.patch
new file mode 100644
index 000000000000..2447289c0266
--- /dev/null
+++ b/dev-python/sybil/files/sybil-6.0.2-pytest-8.patch
@@ -0,0 +1,40 @@
+From d7428b4cfe5f817037030d025028bf09fd7992ee Mon Sep 17 00:00:00 2001
+From: Adam Dangoor <adamdangoor@gmail.com>
+Date: Mon, 29 Jan 2024 11:29:16 +0000
+Subject: [PATCH] Add fixes for Pytest 8.0.0
+
+---
+ CHANGELOG.rst               |  5 +++++
+ sybil/integration/pytest.py | 17 +++++++++++++----
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/sybil/integration/pytest.py b/sybil/integration/pytest.py
+index 8ce6c72..cad311d 100644
+--- a/sybil/integration/pytest.py
++++ b/sybil/integration/pytest.py
+@@ -53,12 +53,21 @@ def __init__(self, parent, sybil, example: Example) -> None:
+     def request_fixtures(self, names):
+         # pytest fixtures dance:
+         fm = self.session._fixturemanager
+-        closure = fm.getfixtureclosure(names, self)
+-        initialnames, names_closure, arg2fixturedefs = closure
+-        fixtureinfo = FuncFixtureInfo(names, initialnames, names_closure, arg2fixturedefs)
++        if PYTEST_VERSION >= (8, 0, 0):
++            closure = fm.getfixtureclosure(initialnames=names, parentnode=self, ignore_args=set())
++            names_closure, arg2fixturedefs = closure
++            fixtureinfo = FuncFixtureInfo(argnames=names, initialnames=names, names_closure=names_closure, name2fixturedefs=arg2fixturedefs)
++        else:
++            closure = fm.getfixtureclosure(names, self)
++            initialnames, names_closure, arg2fixturedefs = closure
++            fixtureinfo = FuncFixtureInfo(names, initialnames, names_closure, arg2fixturedefs)
+         self._fixtureinfo = fixtureinfo
+         self.funcargs = {}
+-        self._request = fixtures.FixtureRequest(self, _ispytest=True)
++        if PYTEST_VERSION >= (8, 0, 0):
++            self._request = fixtures.TopRequest(pyfuncitem=self, _ispytest=True)
++            self.fixturenames = names_closure
++        else:
++            self._request = fixtures.FixtureRequest(self, _ispytest=True)
+ 
+     def reportinfo(self) -> Tuple[Union["os.PathLike[str]", str], Optional[int], str]:
+         info = '%s line=%i column=%i' % (
diff --git a/dev-python/sybil/sybil-6.0.2.ebuild b/dev-python/sybil/sybil-6.0.2-r1.ebuild
index 27065ab0f6bb..0a280c114202 100644
--- a/dev-python/sybil/sybil-6.0.2.ebuild
+++ b/dev-python/sybil/sybil-6.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,3 +32,13 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/simplistix/sybil/pull/108
+	"${FILESDIR}/${P}-pytest-8.patch"
+)
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index d8aa0bc9bf64..837d9f602435 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,3 +1,3 @@
 DIST terminado-0.18.0.tar.gz 32250 BLAKE2B 1993df502e0e54f78160aca91b475f989cd83a3ea6dedef3d70db7a2d2c7b4dd8ccbcb854302e665f079f4b12c91ad434c23407974ad18e8c6e1f47cf54179ec SHA512 4cefaf34e00d4c22b01c2cfbd55e385df1c2ad6e812fb6f9a47d1af2126251028d633a40c20e9babec7de927a44fc580c5972f85d00fbdd32b895a4197346c90
-EBUILD terminado-0.18.0.ebuild 810 BLAKE2B 0ca2889cd83bf693e90a3f8c1ec54ad2595f93c224b1d390f13b9aa8560cb86d37d244e658059070b3bb51861638cce79176cc4ba77bace4e3e7f1df378add22 SHA512 71230680caea2d3f83e3cea3faba55821a0702062b18a54eb2c325e3e328bb925dcd79d7d1710fb421e62769cfee6862325a20449bbf583187bd375be952ad99
+EBUILD terminado-0.18.0.ebuild 880 BLAKE2B 55e5ee229961eeb3a77bbb3bbfc51eabee8d3fbd8d855b3bba8311bad0749cba23f31da07342964546144b71222df0c19a8175636f30fa43d45701dc9d5c440c SHA512 4b426fac2a5c7ffd86ba4727691d18b1977e161f4bffaed418204be7f77504dce2e2cf938b07b92e31331acef5bc72311024d21bde3ff52a859301acd7bce49d
 MISC metadata.xml 407 BLAKE2B 11da32addf98212561629b99650880eca0a6c057414d8a97f535f40b046c6587d326e3193eab264f439caf38e5d6d8f3f5d1a5891746262494ced39effb2651f SHA512 6c993bf16c0413aea33e06efef79dc6189d3b62b71574fffb2bdce7ddb27b4b12f1d5c0d2a3a80a51ae8894c60efb83a9966cabd53662d358f3f1ec52d27590b
diff --git a/dev-python/terminado/terminado-0.18.0.ebuild b/dev-python/terminado/terminado-0.18.0.ebuild
index c17a455d8281..e3856f4e6f4a 100644
--- a/dev-python/terminado/terminado-0.18.0.ebuild
+++ b/dev-python/terminado/terminado-0.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,6 +22,11 @@ RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
 	dev-python/tornado[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest