gentoo resync : 12.05.2022

5 files changed, 32 insertions, 63 deletions

diff --git a/dev-python/watchgod/Manifest b/dev-python/watchgod/Manifest
index e3d18a56b154..b0030ed3a562 100644
--- a/dev-python/watchgod/Manifest
+++ b/dev-python/watchgod/Manifest
@@ -1,7 +1,5 @@
-DIST watchgod-0.7.gh.tar.gz 14362 BLAKE2B 0c16b7ef2a7e1d0ca2c9d27b1503a9710662364318d5021e916aabf90c8f917b0bf69559a545658f839953832edc579b0014a0736b3b155f097d1d29c2e4b4f7 SHA512 afa225b30cf796ce95861c61fbe8eb22ed72011522de53d53c41148311793db10e41b66e9eb1237c4372f142edaec992de79715c568e435ddb1695666be1cdd8
-DIST watchgod-0.8.1.gh.tar.gz 15414 BLAKE2B 237b03a08b053f6979b884a02818b8651ce7415dbd08a848c2d754361c3f9aaf315db2b352a8f159f6245f2db92ea2f5485daacfb8924edcc361049f307467bb SHA512 a30ac1093df1e26ce78bbc09f5b1155cd5a9becad13da54ab3009012a5630404bb94695474be05133ad3e57c1727743efc408235a19a25f276265d752f0624cc
-DIST watchgod-0.8.gh.tar.gz 15354 BLAKE2B 1325f452593e54e8cc40eca0fc9867aff0c93d89de767b9512508fee02efe94e43284b30c316b2cce31a15acc2ee9ff19ca7f9cc6fb46cfffdb0458e502d85ca SHA512 0e86d9dd3eba0cd3aaeccc009ebdba8528ba23d63ad19ff789dffda075b4a01c32be0dfabf38f15e7966bc09e7fb5ae3a94a9dd89a55358a95622aaf5cad0947
-EBUILD watchgod-0.7.ebuild 960 BLAKE2B df5acdbe3b1c759bc22af4451b872aa8a3b7f442350aa6e494768a7c55c5c874c335e4087b8b38078f6ccb8012b3f5f3e42d664def636f28f1a51e66a7afab90 SHA512 c0115f54f24d59c04829326d41a1ff09857609f308dfa99ef7c34fe4642fbb54d1d70c6cb96a739fd848461b1f9a8c26df2546980c82758a73dafc4f199917d8
-EBUILD watchgod-0.8.1.ebuild 1241 BLAKE2B 871e22ab16ec2c1e28a682f4ce0a64cc084b3b2e7dda062d7e9122f81c5e93025ef48970de2a3200d51950b8bf9990e53cfa7389eccd8ba1613ec0a26cbb713a SHA512 69df0edc0be3268f68a11d7bec9f941b6b6ea98211f93712a4c93269ef885bbb90de74640b848cfec8f87bb0bbb88961020c15a68016f11fe246df47c1d7cbe3
-EBUILD watchgod-0.8.ebuild 1057 BLAKE2B fb5bc2bdb26584c38a6180da3670eaa89bbee2eb65ebbc858beb973fc169bd7f09cab48148044827ebab0c6d12a0e5f766edb0054e75673300cdd3b4e2fc6656 SHA512 f4cadf32e6327006d644c56c23f6f86626ce303594fa5aaeb8fe73acc6d8067241b97f81138af932180ad20e09a00c335f8903c8e4a551cf6855b0cc85b625d7
-MISC metadata.xml 351 BLAKE2B 07e1d5205c2ec59e8fe690449302a0cc7d75b6b3171669bdd4e0476e1c1e389b9af36a331d18f8d45b3b8486372e52558b2a6f48545b78a87eeca092c899837a SHA512 261367cd6511a897955e85335dfa158ee9441bb2e61592e2bbe964fc0f8219e271e764b7c65c659d3ed1dc4d87896dafab83abfc0708715c749e2fdf16a4c9ec
+DIST watchfiles-0.8.1.gh.tar.gz 15405 BLAKE2B ea5d6d59b930f00d6b4b8d6236a38dbb2463866246f1ff4cda828a99a7383fac9c47b131417d8f375a105733c7567f32895759a8dc4503f5671b524977e282ed SHA512 2f611786d267ceae5d6e9094400f5dc6eb59a008f047a511b58b329762e63bbcd83a56cc95cca54c8480b1702c160548baa30549e907e6b85c8bf176ba339fb6
+DIST watchfiles-0.8.2.gh.tar.gz 15515 BLAKE2B 97c17737c6970c8b799707547cef760c307cd000d09cf3a338e47c0735d537e0321643066eab592f7f7e6ccc25272ea1e7e0bbc02f6274864f7cc39a177b83ba SHA512 a44b831352ace03c450781bc815b1813c44c386d666a9b724b562ff69228705651bfc23e81b7344d0f79c62577d4f910b323c734298e2a609f85bbc4a0f0498e
+EBUILD watchgod-0.8.1.ebuild 1289 BLAKE2B b674459b7943b48cacbe424bbe3a9f71289febea1072190bdee4579b678ed2a6854a23145ec97ee0d121e5c8febf82d5f40b4a61587892730e7e29c3fc0c7287 SHA512 e243f4ef4b52ba92fb4859c708344d2f2e834d8f5fae0bc2599e99465b5f99cd437977ada48f030390e6e068b69d1d252ea5259e9ee46763c61fd8f8bd737fee
+EBUILD watchgod-0.8.2.ebuild 1310 BLAKE2B 1e4ff7d7e08e599f465270faf94dcb13b916bdb75de579bfcacbbb26f844d6c8a3836b746014b5ba22f57d496b6a12f2596feb2e36b558c4957428f04eeb4718 SHA512 7c071b9c7eeb2d98cd050b9df083db4b3dd15f6397200a7258611b2f30c40c54800c338afef1feb24be2d673c66c5e204ed0c5673a7dba4b889f62f80313de27
+MISC metadata.xml 353 BLAKE2B 9fba49b9fcbfb15db8c5709ba52b803063c010ebeaed0ab6ee715e776a7da16c295ef6ae6495dd94372835970b34676dbf5b05d96b6bfc737bd68f504384d9f1 SHA512 ca0d0d4135e2ce7678ce004a48389ac614f512f502194ec542d461592ab73d63d68ed5d9a4f9ccc1a37b74435bfb6c75d309bccc43eba8d53fdc36520199d751
diff --git a/dev-python/watchgod/metadata.xml b/dev-python/watchgod/metadata.xml
index a55f25425b16..f8df5d7b0948 100644
--- a/dev-python/watchgod/metadata.xml
+++ b/dev-python/watchgod/metadata.xml
@@ -5,7 +5,7 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">samuelcolvin/watchgod</remote-id>
+		<remote-id type="github">samuelcolvin/watchfiles</remote-id>
 		<remote-id type="pypi">watchgod</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/watchgod/watchgod-0.7.ebuild b/dev-python/watchgod/watchgod-0.7.ebuild
deleted file mode 100644
index 563cc8deb366..000000000000
--- a/dev-python/watchgod/watchgod-0.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Simple, modern file watching and code reload in Python"
-HOMEPAGE="
-	https://pypi.org/project/watchgod/
-	https://github.com/samuelcolvin/watchgod/"
-SRC_URI="
-	https://github.com/samuelcolvin/watchgod/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-toolbox[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# flaky test on slow systems, https://github.com/samuelcolvin/watchgod/issues/84
-	tests/test_watch.py::test_awatch_log
-)
-
-src_prepare() {
-	# increase timeout
-	sed -e '/sleep/s/0.01/1.0/' -i tests/test_watch.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/watchgod/watchgod-0.8.1.ebuild b/dev-python/watchgod/watchgod-0.8.1.ebuild
index f085dd3ac78c..2efec4c90eb0 100644
--- a/dev-python/watchgod/watchgod-0.8.1.ebuild
+++ b/dev-python/watchgod/watchgod-0.8.1.ebuild
@@ -8,19 +8,21 @@ PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
+MY_P=watchfiles-${PV}
 DESCRIPTION="Simple, modern file watching and code reload in Python"
 HOMEPAGE="
 	https://pypi.org/project/watchgod/
-	https://github.com/samuelcolvin/watchgod/
+	https://github.com/samuelcolvin/watchfiles/
 "
 SRC_URI="
-	https://github.com/samuelcolvin/watchgod/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
+	https://github.com/samuelcolvin/watchfiles/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/watchgod/watchgod-0.8.ebuild b/dev-python/watchgod/watchgod-0.8.2.ebuild
index 562b5644a369..1c0a5bceb127 100644
--- a/dev-python/watchgod/watchgod-0.8.ebuild
+++ b/dev-python/watchgod/watchgod-0.8.2.ebuild
@@ -3,22 +3,26 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
 inherit distutils-r1
 
+MY_P=watchfiles-${PV}
 DESCRIPTION="Simple, modern file watching and code reload in Python"
 HOMEPAGE="
 	https://pypi.org/project/watchgod/
-	https://github.com/samuelcolvin/watchgod/
+	https://github.com/samuelcolvin/watchfiles/
 "
 SRC_URI="
-	https://github.com/samuelcolvin/watchgod/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
+	https://github.com/samuelcolvin/watchfiles/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
@@ -34,14 +38,20 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-EPYTEST_DESELECT=(
-	# flaky test on slow systems, https://github.com/samuelcolvin/watchgod/issues/84
-	tests/test_watch.py::test_awatch_log
-)
-
 src_prepare() {
 	# increase timeout
 	sed -e '/sleep/s/0.01/1.0/' -i tests/test_watch.py || die
 
 	distutils-r1_src_prepare
 }
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# flaky test on slow systems, https://github.com/samuelcolvin/watchgod/issues/84
+		tests/test_watch.py::test_awatch_log
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		tests/test_watch.py::test_does_not_exist
+	)
+	epytest
+}