Updating liguros repo

13 files changed, 73 insertions, 131 deletions

diff --git a/dev-python/cached-property/cached-property-1.5.1.ebuild b/dev-python/cached-property/cached-property-1.5.1.ebuild
index ee00ea1f6bb1..6caad2c6e1ab 100644
--- a/dev-python/cached-property/cached-property-1.5.1.ebuild
+++ b/dev-python/cached-property/cached-property-1.5.1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -14,15 +15,18 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 
-DEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
+DEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
 
-src_install() {
-	distutils-r1_src_install
+python_prepare_all() {
+	# bug 638250
+	eapply "${FILESDIR}"/${PN}-1.5.1-test-failure.patch
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
 	dodoc README.rst HISTORY.rst CONTRIBUTING.rst AUTHORS.rst
+	distutils-r1_python_install_all
 }
diff --git a/dev-python/cached-property/files/cached-property-1.5.1-test-failure.patch b/dev-python/cached-property/files/cached-property-1.5.1-test-failure.patch
new file mode 100644
index 000000000000..03fabd2900ca
--- /dev/null
+++ b/dev-python/cached-property/files/cached-property-1.5.1-test-failure.patch
@@ -0,0 +1,10 @@
+--- a/tests/test_cached_property.py
++++ b/tests/test_cached_property.py
+@@ -191,6 +191,7 @@
+         self.assert_cached(check, 2)
+         self.assert_cached(check, 2)
+ 
++    @unittest.skip("Gentoo Bug #638250")
+     def test_threads_ttl_expiry(self):
+         Check = CheckFactory(self.cached_property_factory(ttl=100000), threadsafe=True)
+         check = Check()
diff --git a/dev-python/emcee/Manifest b/dev-python/emcee/Manifest
index 6f3277c28a45..26942bdbd401 100644
--- a/dev-python/emcee/Manifest
+++ b/dev-python/emcee/Manifest
@@ -1 +1 @@
-DIST emcee-2.2.1.tar.gz 24277 BLAKE2B 26572cf242caa2f9f7018e91434d7ff8b235d59349fb7b034e52bbab77098ff952e84eb96d013b66853a763c8fccc0cdd7121a5387b5081dd238df85416cda0a SHA512 8f612a135fe5fc2bc75c2bc231d9210d4a70a91f5d7b94ac2161618c082d18aa1b896604b7ece166b86d93a93902e89ee9961da2a3e65307880c0dbc63bea267
+DIST emcee-3.0.2.tar.gz 4054969 BLAKE2B 16b9ebd34b450f8fb92dc50f0652a34f06d20a027ff1cacd73474f4c74ecce7102d5eea54182598fc17175897980131742c0d60ef217b0dc8285c18406ef4d7f SHA512 517c447b9426eb97b72b6e3b21d77720b58a42fc1efe9495cf7ad8a0682841b8d7178a6f070641f68a09aef507e854ceefab9a54afe6baaca8b41f16f34dce9e
diff --git a/dev-python/emcee/emcee-2.2.1.ebuild b/dev-python/emcee/emcee-3.0.2.ebuild
index 4dd74e70b423..1251995e8b8b 100644
--- a/dev-python/emcee/emcee-2.2.1.ebuild
+++ b/dev-python/emcee/emcee-3.0.2.ebuild
@@ -1,29 +1,25 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python ensemble sampling toolkit for affine-invariant MCMC"
-HOMEPAGE="https://danfm.ca/emcee/"
+HOMEPAGE="https://emcee.readthedocs.io/en/stable/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND="
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
 
-DOCS=( AUTHORS.rst README.rst )
+distutils_enable_tests pytest
 
-python_test() {
-	nosetests -v || die
-}
+DOCS=( AUTHORS.rst README.rst )
diff --git a/dev-python/h5py/h5py-2.10.0-r1.ebuild b/dev-python/h5py/h5py-2.10.0-r1.ebuild
index 852acf20e8a8..5fab0cd90704 100644
--- a/dev-python/h5py/h5py-2.10.0-r1.ebuild
+++ b/dev-python/h5py/h5py-2.10.0-r1.ebuild
@@ -11,30 +11,33 @@ DESCRIPTION="Simple Python interface to HDF5 files"
 HOMEPAGE="https://www.h5py.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-# disable mpi until mpi4py gets python3_8
-#IUSE="examples mpi"
-IUSE="examples"
-
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+# disable mpi until mpi4py gets python3_8
+#IUSE="examples mpi"
+IUSE="examples"
 
 #RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
-RDEPEND="sci-libs/hdf5:=[hl(+)]
+RDEPEND="
+	sci-libs/hdf5:=[hl(+)]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 
 BDEPEND="dev-python/pkgconfig[${PYTHON_USEDEP}]"
 #	mpi? ( virtual/mpi )
 
-DEPEND="dev-python/cython[${PYTHON_USEDEP}]
+DEPEND="
+	${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
 	doc? ( dev-python/alabaster[${PYTHON_USEDEP}] )
-	test? ( dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-		dev-python/cached-property[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
+		dev-python/cached-property[${PYTHON_USEDEP}]
+	)"
 #	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
 
-PATCHES="${FILESDIR}/${P}-tests.patch"
-
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
 DOCS=( README.rst AUTHORS ANN.rst )
 
 distutils_enable_tests setup.py
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 3ebe5a7361dd..919742322eeb 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,3 +1,2 @@
-DIST jupyter_client-5.3.4.tar.gz 275850 BLAKE2B a0884fb6cd2858b3ecf8353c6dc180370a53b4d59f77fdeb33c972c72857650e2e8b64ac5f6c9d223a99f30bb9ad9e06673cfe14b2d79abc0e4363104ffd15c3 SHA512 54b5206c08f5119feb50deb2d815d79a178799ad5c1231a0d03fc950ebbf6cb2f7c3a757024f788d416f808c57aa8476fcfa110f63182314bf2d5cdeb9a006cf
 DIST jupyter_client-6.1.5.tar.gz 290829 BLAKE2B 7029703ebf7dccafd9c90835d9ed3305f591597947dabaef3fd670c7fd595bc8a8fa5258ad07b0bbe170c134f8f50593e980c2360de2521216fc061996268032 SHA512 b289b07f1300a7aa541b15ece33340fde7dd9765a200214668ad3a124ec7fd98c742f61417c9d31d6daff9ecc1aaaca6ec516f359cc26007731c0f8d859a73a9
 DIST jupyter_client-6.1.6.tar.gz 292265 BLAKE2B 46f5b814577c8b1351ce42eb3de4a3032bb2917512f0c9cfc07fddc991698e192b628c03a9ce0d98817dfebcf4af0386fa4ee656b524f54c36de64781af3b8dd SHA512 9a443a2b4a86d823d1403a05d359b50ca95efb8e1dd992d331699e3fe2b46e5d4190cc55aa5d110a384fc0bb94abceaa4e36f67c0f7ce5a33f9ef3b11e682522
diff --git a/dev-python/jupyter_client/jupyter_client-5.3.4.ebuild b/dev-python/jupyter_client/jupyter_client-5.3.4.ebuild
deleted file mode 100644
index 847c9461601e..000000000000
--- a/dev-python/jupyter_client/jupyter_client-5.3.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? ( dev-python/ipykernel[${PYTHON_USEDEP}]
-			dev-python/ipython[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv jupyter_client || die
-}
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.6.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.6-r1.ebuild
index b3b3378a0470..fa9264804291 100644
--- a/dev-python/jupyter_client/jupyter_client-6.1.6.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-6.1.6-r1.ebuild
@@ -16,15 +16,14 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
 
 RDEPEND="
+	dev-python/async_generator[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 	dev-python/jupyter_core[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
+	www-servers/tornado[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? (
 		dev-python/ipykernel[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_console/files/jupyter_console-6.1.0-increase-test-timeout.patch b/dev-python/jupyter_console/files/jupyter_console-6.1.0-increase-test-timeout.patch
new file mode 100644
index 000000000000..684ecfc0a841
--- /dev/null
+++ b/dev-python/jupyter_console/files/jupyter_console-6.1.0-increase-test-timeout.patch
@@ -0,0 +1,15 @@
+Very slow CIs take longer on this test
+
+--- a/jupyter_console/tests/test_console.py
++++ b/jupyter_console/tests/test_console.py
+@@ -65,8 +65,8 @@
+     except IOError:
+         raise SkipTest("Couldn't find command %s" % cmd)
+     
+-    # timeout after one minute
+-    t = 60
++    # timeout after 5 minutes
++    t = 300
+     idx = p.expect(r'In \[\d+\]', timeout=t)
+     return p, pexpect, t
+ 
diff --git a/dev-python/jupyter_console/jupyter_console-6.1.0-r1.ebuild b/dev-python/jupyter_console/jupyter_console-6.1.0-r1.ebuild
index dd00e5dcbf75..a5cc7d16e0de 100644
--- a/dev-python/jupyter_console/jupyter_console-6.1.0-r1.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.1.0-r1.ebuild
@@ -20,27 +20,27 @@ RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	<dev-python/prompt_toolkit-3.1.0[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	"
+	dev-python/pygments[${PYTHON_USEDEP}]"
 # util-linux provides script(1)
 BDEPEND="
 	test? (
 		dev-python/pexpect[${PYTHON_USEDEP}]
 		sys-apps/util-linux
-	)
-	"
+	)"
 
 distutils_enable_sphinx docs
 distutils_enable_tests nose
 
 PATCHES=(
 	"${FILESDIR}"/${P}-py39.patch
+	"${FILESDIR}"/${P}-increase-test-timeout.patch
 )
 
-src_prepare() {
+python_prepare_all() {
 	# use setuptools unconditionally
 	sed -i -e 's:distutils\.core:setuptools:' setup.py || die
-	distutils-r1_src_prepare
+
+	distutils-r1_python_prepare_all
 }
 
 python_test() {
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index 5032c8f9ad89..ca7f2d8eb8ae 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,2 +1 @@
-DIST jupyter_core-4.6.1.tar.gz 66693 BLAKE2B f4338a015ac4b3e0a7cd2497a660bfca0deb96ffa2371fa9c72656f8a68b6f80fe5d494be79c8fdccbcb51f3d9122fd7d4b3e36864d38e7da1c5029c6b1aa24d SHA512 baf0c5db4f78a3cee83940ace80b48ba308c47eeafcf584120b8ba82768c15448fb789ec5b9ac8d541cbd1bfdd47a988f79130675c5943a67d3135d428b43cbe
 DIST jupyter_core-4.6.3.tar.gz 67305 BLAKE2B 7c6a32bd8ce773b7bc4156eabf75597112716632179736b19be4b0e73eba7c5c67a0c9d2d141b952d72b68aff826227b0004a3bc9f3b286b68eb1375f2316bdb SHA512 3c7370c24a4cf53c9747e9e411852d207c0c7035809dab7cb018ccb53e19208df25ad4f728531e47f3a42c4d9694c3e1ed7b03133de23bcbdeb346c319f5f51f
diff --git a/dev-python/jupyter_core/jupyter_core-4.6.1-r1.ebuild b/dev-python/jupyter_core/jupyter_core-4.6.1-r1.ebuild
deleted file mode 100644
index 016422ef724d..000000000000
--- a/dev-python/jupyter_core/jupyter_core-4.6.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Core common functionality of Jupyter projects"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-
-RDEPEND="dev-python/traitlets[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-github-alt[${PYTHON_USEDEP}] )
-	test? ( >=dev-python/ipython-4.0.1[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	py.test jupyter_core || die
-}
diff --git a/dev-python/jupyter_core/jupyter_core-4.6.3.ebuild b/dev-python/jupyter_core/jupyter_core-4.6.3.ebuild
index 8c8fcdb6981a..eb583979d3ae 100644
--- a/dev-python/jupyter_core/jupyter_core-4.6.3.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.6.3.ebuild
@@ -18,17 +18,20 @@ KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="dev-python/traitlets[${PYTHON_USEDEP}]"
 BDEPEND="
-	test? ( >=dev-python/ipython-4.0.1[${PYTHON_USEDEP}] )"
+	test? (
+		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinxcontrib-github-alt
 distutils_enable_tests pytest
 
-src_prepare() {
+python_prepare_all() {
 	# rely on imports working without PYTHONPATH
 	sed -e 's:test_not_on_path:_&:' \
 		-e 's:test_path_priority:_&:' \
 		-i jupyter_core/tests/test_command.py || die
 
-	distutils-r1_src_prepare
+	distutils-r1_python_prepare_all
 }