gentoo resync : 06.04.2022

3 files changed, 2 insertions, 46 deletions

diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index 524942a29c65..c31a51deff9e 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,5 +1,3 @@
-DIST loky-3.0.0.tar.gz 152463 BLAKE2B 99f0a1fc85e879626d12402dd4fee4b92345eab9520b1afaf95bbf869d2dc9e429f1f9810554e10d97f0ecbc4add28b1cbaee0477de05aa366faeb335eaef7c8 SHA512 ad171bfac031ab4d6749bde416031e905eb29adb97dab9c3348791c9df78b17e1e3eab8a354954d7c16fb2095ccc03d26cf2153fe53a546007a7a89c6046cb36
 DIST loky-3.1.0.tar.gz 139211 BLAKE2B 32e95312c40d6f8d8f9fc8daf5a1e85f1b874cbb902a4885621983d84a5fa9da42f05ff7d5d6bf58cf04a320c04c6e698ff0105cdad9ddd3248a109cc71c9883 SHA512 8bf6b032bb4f770d89c8de93d95c5805fa90dae34f2754f14c3a9fe7860230e8ce8ea97e1b09fa2cdf67f8aecdbd6d1e47ae4fb746fb1c6912d2dd65033f5b6f
-EBUILD loky-3.0.0.ebuild 1018 BLAKE2B 83cdb4c6a4baabf372962df394342bf21454b8f399eef21162fe32e419f54dae00194b17797d9bbe3b14be2b0927a723060843ff6bf7f13c2ffff1265c2cca0c SHA512 8ac89a930e757fb6add9d719f0faa731cb7d86ba64bcec4980cf3f49bbc65dbe5714e732c26ce80b32f15911333257ca2f62cee839f797867a1942eef2a93f6b
-EBUILD loky-3.1.0.ebuild 1036 BLAKE2B 3a1fab14065bf8903dc479a5c6091b35ac01078aa0630c87be1af6a087c4aa0604f95299e1d8fac3ade49c7711417145121d2a16cecbb792bba3ba818b0b428c SHA512 745a0c1f749244ef47f45c22b8b465f5224336534454bc539a4319fcf8285a87f1580ef1f6651304b52379468cbded3cc041c69f33c0d8ce41d731f651d7b960
+EBUILD loky-3.1.0.ebuild 1033 BLAKE2B f79794b101f8d44370fb2737704cc0a5a1c041609511ae00377d211f2d47f2fbc08095d63977a953ad196e49ee95c34b580660b8ba2beea102724f0e82968ec9 SHA512 c25fef6ea4878ebaf8143f02136d6ceb642993947af976e465d23355e60fbad088dd3e5fe2773f4326d85097b9bf04264da7a2fccee17388338f7d0e446ff132
 MISC metadata.xml 383 BLAKE2B 9d990e2f5b4fbf959925d9d7c1f03ecb3acddcc8564c9362f14741d531d79f3e4c6d98a8c84695d8b1f761fa11a80e768b8e8b48ff8be314732d7f574d767223 SHA512 89d9a1f5c253bf99992d16b974d81175d1ae0d17649ffe1a485430735bec38f45e8e1a35c9ba2d99cb1610db3b200adb5af847b2a161c348e29f0cfa89f8076f
diff --git a/dev-python/loky/loky-3.0.0.ebuild b/dev-python/loky/loky-3.0.0.ebuild
deleted file mode 100644
index c7368a937698..000000000000
--- a/dev-python/loky/loky-3.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-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="Robust and reusable Executor for joblib"
-HOMEPAGE="https://github.com/joblib/loky"
-SRC_URI="
-	https://github.com/joblib/loky/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local args=(
-		# docker, seriously?
-		--deselect 'tests/test_loky_module.py::test_cpu_count_cfs_limit'
-		# hangs, and even pytest-timeout does not help
-		--deselect 'tests/test_reusable_executor.py::TestExecutorDeadLock::test_deadlock_kill'
-		# one test that uses a lot of memory, also broken on 32-bit
-		# platforms
-		--skip-high-memory
-		# breaks teardown
-		-p no:xvfb
-	)
-
-	epytest "${args[@]}"
-}
diff --git a/dev-python/loky/loky-3.1.0.ebuild b/dev-python/loky/loky-3.1.0.ebuild
index 61f9d0dae1c4..5444599a1da2 100644
--- a/dev-python/loky/loky-3.1.0.ebuild
+++ b/dev-python/loky/loky-3.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]