gentoo resync : 25.11.2020

4 files changed, 9 insertions, 114 deletions

diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index 95827cbcfeba..9d86f142091a 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,7 +1,3 @@
-DIST joblib-0.14.1.tar.gz 338930 BLAKE2B 6b84c43be8b8d32f28a3dbc3e6f4ce15574cf20571805501972d162d4b076c1fe144a9790b8132821f0acd439c8859873038813c7bdd4163d0535eca36a1a8fa SHA512 079eb4321ed95c8f05399abca2a1c46ecb7c28fe9a3a50b6eb106a2bd2f3566fb25bca59022fafbfcee5069f078921421d799eeb29a796f8f98881491cf9be08
-DIST joblib-0.15.1.tar.gz 342550 BLAKE2B c8ccf0b6d2e229a780939d9c4f39265bd18b5a452d014056001072b7daf7e46a5961c6d80f768c30ba7463aa36c5ec09959bb1e891028bf6f7862a9a265079aa SHA512 a0b0bde5b034af3eee0bce2875199fc9ac232a34a49c14daf6fbddd9bf3ad8fa0d77192827b7531704b81db7bdfbaf76c4755b8fc1035eaf73b2e08f9e6d8828
-DIST joblib-0.16.0.tar.gz 345002 BLAKE2B 0336fcbe95204141a0b04dfbf8949ba509792402eefbb86b3dc02375e7e3eb5c76d548d4ad01238307c0334ce4299fd9e763765d92722819894ea26ab6144032 SHA512 9f1f2e7f2e293e1c53e9752907f4ba25d52a5c4895eebfa423c8e3bc64146ab20a490e1db0cfa39596c9bbc47ea1cc491b0576bf8da9a1f68b58e91ba09ead34
-EBUILD joblib-0.14.1.ebuild 1148 BLAKE2B c1d2b4eae9bea3d2bd1f3f23519f7504e43f3592ddca6217fd9b936989029c2a982a79875eb32f5dc40d7087ae82cf1b5f18cc7257e753f4ec696eeb2fa48eec SHA512 210e793e79ac3d74968105278c5550ebaef4716abd4a6873e152de6f373e672ab39e4d223a4973b7730eb867945dd7242788b2b7d8c411b8c433deccef98cd88
-EBUILD joblib-0.15.1.ebuild 1149 BLAKE2B e709f488c7fca5f6c292be9be23aad64e770dddfde15ef70f0ed8981dc96fc728f14bfb359f9de86f8c5594b9d61973f4cd37d25c294ff8f58e7a8a8148e5dc0 SHA512 0c5f8ba7e79646eb12418bae0b50a0a252547339e781c4d24fc93a07f370c8349edfa0c238b22f277aed92e004d3c7b988939f6e28051d8a5de6284e72317fdd
-EBUILD joblib-0.16.0.ebuild 1411 BLAKE2B 5149186a07a23d3b1bb74c325772f6c83ffe7ae7ee7cecc82b91d211af4c5976f65d399a793e59bd4ce17d135aaa25bb7a8f1468b6e1dde9c7027fe03d03d708 SHA512 31f125a0f98751656404299c42099eb693eede55f445ca88ed989f1cf2726552d9a5a667765689a02b4b1d6c5e9248e3da38f4d271183e17d9e995b73e9cfe65
+DIST joblib-0.17.0.tar.gz 345984 BLAKE2B 4f4cb83037fc02ce9ea17e7dc5d284235b847eeb90bf1a877c4168aabd9ad4dd762e45a6485806efc759cdfcb98e6ee70e6d9a498cd7645b1d6b0051a9f9ba2e SHA512 73c42a9f5949478a4a03b97ec31549cabca2ebc968d2c869632696b671c175dc85ae7aa8ac92905f13f830083b2305b56df1552f1d70fa7fe51945ae7286840a
+EBUILD joblib-0.17.0.ebuild 1295 BLAKE2B ebd09b17853dff4f2125e8835d08c2e052144ae421e8ad51d4021ebcc88557a638c173389418f64e71e6f3db8299eca4f509d5342b6ee3b2d203dcfad2f710c7 SHA512 b54babf2a3c9685cb5ce2a1ad11271105434e9d34c02893f282e74f265953cb0751698b38bbc23ff7840fcd008e5238400a044107df8f5dc323e5da2aff8555d
 MISC metadata.xml 857 BLAKE2B 54960e79cd772ee043d09577668c6197ddf0c2b6bbd4cc2bddcbf60ec25fdc9ee3c0a89611ec10d20acac23d69d3a0d4fef9bf225406fb5ba845c3fb6970746e SHA512 ba9709dae22587a7d2c17ff432d05c50f68bc51bf2f7b4e96fec9165304d76862889beafee4feb3a7dfbb5a54e9561ff4c804232a3c9a7dd7384bbd3467688f9
diff --git a/dev-python/joblib/joblib-0.14.1.ebuild b/dev-python/joblib/joblib-0.14.1.ebuild
deleted file mode 100644
index da3e493721db..000000000000
--- a/dev-python/joblib/joblib-0.14.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools to provide lightweight pipelining in Python"
-HOMEPAGE="https://joblib.readthedocs.io/en/latest/
-	https://github.com/joblib/joblib"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/threadpoolctl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc \
-	'dev-python/numpy' \
-	'dev-python/matplotlib' \
-	'dev-python/pillow' \
-	'dev-python/sphinx-gallery' \
-	'dev-python/numpydoc' \
-	'dev-python/pandas' \
-	'dev-python/lz4' \
-	'dev-python/distributed'
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s:'_static/joblib_logo_examples.png':'doc/_static/joblib_logo_examples.png':" \
-		-i doc/conf.py || die
-
-	# tries to fetch from the internet
-	rm examples/compressors_comparison.py \
-		examples/parallel/distributed_backend_simple.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/joblib/joblib-0.15.1.ebuild b/dev-python/joblib/joblib-0.15.1.ebuild
deleted file mode 100644
index e046b8ed957a..000000000000
--- a/dev-python/joblib/joblib-0.15.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools to provide lightweight pipelining in Python"
-HOMEPAGE="https://joblib.readthedocs.io/en/latest/
-	https://github.com/joblib/joblib"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/threadpoolctl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc \
-	'dev-python/numpy' \
-	'dev-python/matplotlib' \
-	'dev-python/pillow' \
-	'dev-python/sphinx-gallery' \
-	'dev-python/numpydoc' \
-	'dev-python/pandas' \
-	'dev-python/lz4' \
-	'dev-python/distributed'
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s:'_static/joblib_logo_examples.png':'doc/_static/joblib_logo_examples.png':" \
-		-i doc/conf.py || die
-
-	# tries to fetch from the internet
-	rm examples/compressors_comparison.py \
-		examples/parallel/distributed_backend_simple.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/joblib/joblib-0.16.0.ebuild b/dev-python/joblib/joblib-0.17.0.ebuild
index f3d3f19a592c..97debf83fed1 100644
--- a/dev-python/joblib/joblib-0.16.0.ebuild
+++ b/dev-python/joblib/joblib-0.17.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,28 +13,20 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
 	dev-python/loky[${PYTHON_USEDEP}]
 "
+# joblib is imported by setup.py so we need ${RDEPEND}
 BDEPEND="
+	${RDEPEND}
 	test? (
 		dev-python/threadpoolctl[${PYTHON_USEDEP}]
 	)
 "
 
-distutils_enable_sphinx doc \
-	'dev-python/numpy' \
-	'dev-python/matplotlib' \
-	'dev-python/pillow' \
-	'dev-python/sphinx-gallery' \
-	'dev-python/numpydoc' \
-	'dev-python/pandas' \
-	'dev-python/lz4' \
-	'dev-python/distributed'
-
 distutils_enable_tests pytest
 
 python_prepare_all() {
@@ -46,8 +38,9 @@ python_prepare_all() {
 			-e 's:from \.externals ::' \
 			-i {} + || die
 
-	sed -e "s:'_static/joblib_logo_examples.png':'doc/_static/joblib_logo_examples.png':" \
-		-i doc/conf.py || die
+	# https://github.com/joblib/joblib/issues/1115
+	sed -e 's:test_parallel_call_cached_function_defined_in_jupyter:_&:' \
+		-i joblib/test/test_memory.py || die
 
 	# tries to fetch from the internet
 	rm examples/compressors_comparison.py \