gentoo (leap year) resync : 29.02.2020

5 files changed, 47 insertions, 78 deletions

diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 6db6f42e9af3..08e46395d332 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,7 +1,3 @@
-DIST spyder-kernels-0.2.4.tar.gz 35750 BLAKE2B 85cc767dc1ab8e071a6c08993b3d8d383e7b9bcf85be704fcd1bc3b321ff7ec532a7ecbb6a30dc2bce2fa7fd8d74812fae07dea5e10eff6309b3ca13fb16e6d5 SHA512 d5b8af3e0b8c5af9e29864912ecd27ee27a605938f36c0a7681167fb782e4b7fb79d5ffb4ae9b77fb82676301be664a1e1dd64f2f206fee2bf047f0ef9e05941
-DIST spyder-kernels-1.0.1.tar.gz 35936 BLAKE2B d3e572ba04823869bf8a602e96195a95c39da3c0e29d6bf17eeb305e21d60d72fb8c6bda9f111558468655759f1319e2d69d12b7a3c4011c18d22570d394d64e SHA512 05a4124e44cf1ba1d56927295dc9a2fea315ffe107d0f835a36d29b0727c2d7abe35e41974d62ece23b2d5ef78baa18c1d29910c0359b6fea900216e8f093d97
-DIST spyder-kernels-1.8.1.tar.gz 52588 BLAKE2B 50cdc515da8b489d4cf3027e85a5c0e65f6ca715244eeffd4b5c8000f81a2eb8c34e64f221ff02d1a613b48ae0aaf8fbd6aa51ee78bf3f590bf3b70d786091b0 SHA512 c2bdbe862450a4c881cedfbdeb7c8a117b3d20a0faa593439308e9f52ed4d4576b32151f8edb0b1df460e538894e31971dc7dcd792b4c999b0ef9dedee654d6c
-EBUILD spyder-kernels-0.2.4.ebuild 585 BLAKE2B 71f1f3ed4344613fa7416a49d191de416bf4f968624067eedd0d1cea0c268085112dd82ef38a7b0f524dfd3c584f1e9137bf247b50a9e23d01d631f1c0beb09b SHA512 4759fa11afad501ea96af17933695c460de7b05403a2298dbc0bf7bdfe2a24fbfa443a1cae27b4f44eaefdb9b78e42f0564f6f4cf2f578cd0ece0baf1faab3e8
-EBUILD spyder-kernels-1.0.1.ebuild 585 BLAKE2B 71f1f3ed4344613fa7416a49d191de416bf4f968624067eedd0d1cea0c268085112dd82ef38a7b0f524dfd3c584f1e9137bf247b50a9e23d01d631f1c0beb09b SHA512 4759fa11afad501ea96af17933695c460de7b05403a2298dbc0bf7bdfe2a24fbfa443a1cae27b4f44eaefdb9b78e42f0564f6f4cf2f578cd0ece0baf1faab3e8
-EBUILD spyder-kernels-1.8.1.ebuild 661 BLAKE2B 4bfc86496eba4ae9bb6ad27857f4018929545edff21a3c7b9e9b7e72043ccf9521686d4cf9b80fb627e44ce7e8cec5d59273dec6329b08a09a67bd5dc7a96fea SHA512 c7c44e2c28fcc02c53548a6e00f1426d5a00820fe913eb1d3ade08e2e182ffb92813163076bbb82de7ed2b4df51d2f0b397127a963fb65cd53f68aeaba8395d9
+DIST spyder-kernels-1.8.1-gh.tar.gz 68622 BLAKE2B dc8bd62b94d392026c810a038d7e4076e6b6bcf97dce79197617666be1316935b55345d6378f15d66bd37dd4b2595afe5e40ce75857e8807ad1f1708092222f3 SHA512 aad8a641f801989bf458591f2b938fff178d04d3ae028b18ed5b6926556da840f27e1febc18cf4df9f8fcacd6ac993a5ebd192b5f9d922a16c2dbd63c2059750
+EBUILD spyder-kernels-1.8.1-r1.ebuild 1287 BLAKE2B 5d5488a7601a78a6faccb4a2449848f86b4448a855865a6e7b88bd593dd82c1f873d542b54bd8e19780063dc932e2bcc53056fc71b0ba875fe6cfcbabc945150 SHA512 b62d8b15f5483057a0b0fbb90f74128b9299a40fb3880e3e13fd7586160612d882bfebee25f0432447de7c3f2f796782a7c922f407c903d9daf42fb33e175880
 MISC metadata.xml 648 BLAKE2B 571d097dacb5bff623fac2098059d24dfe73241f2dd75f77a451859479779b945d478c13e22f4f69716de473437576bc6db870a01002a66e046d5219ab052af6 SHA512 13b2c212ea44acd0a21b30386e84f6ca2b0fa49e9ca5bcfb952d951215abd5bce5d14441cad0bfba0b39685c8e5f5e2fe1a1659101f48cb6787d17a8403231b9
diff --git a/dev-python/spyder-kernels/spyder-kernels-0.2.4.ebuild b/dev-python/spyder-kernels/spyder-kernels-0.2.4.ebuild
deleted file mode 100644
index 9d258220b017..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-0.2.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Kernels used by spyder on its ipython console"
-HOMEPAGE="
-	https://github.com/spyder-ide/spyder-kernels/
-	https://pypi.org/project/spyder-kernels/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.0.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.0.1.ebuild
deleted file mode 100644
index 9d258220b017..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-1.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Kernels used by spyder on its ipython console"
-HOMEPAGE="
-	https://github.com/spyder-ide/spyder-kernels/
-	https://pypi.org/project/spyder-kernels/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.8.1-r1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..1d6aba4a10bb
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-1.8.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="https://github.com/spyder-ide/spyder-kernels/
+	https://pypi.org/project/spyder-kernels/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/cloudpickle[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-5.1.3[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/wurlitzer[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/xarray[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	if [[ ${EPYTHON} = python3.6 ]]; then
+		# this fails in py3.6 for some reason
+		sed -i -e 's:test_turtle_launch:_&:' \
+			spyder_kernels/console/tests/test_console_kernel.py || die
+	fi
+
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.8.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.8.1.ebuild
deleted file mode 100644
index cc6a13af51d7..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-1.8.1.ebuild
+++ /dev/null
@@ -1,24 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Kernels used by spyder on its ipython console"
-HOMEPAGE="
-	https://github.com/spyder-ide/spyder-kernels/
-	https://pypi.org/project/spyder-kernels/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/cloudpickle[${PYTHON_USEDEP}]
-		>=dev-python/ipykernel-5.1.3[${PYTHON_USEDEP}]
-		>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
-		dev-python/pyzmq[${PYTHON_USEDEP}]
-		dev-python/wurlitzer[${PYTHON_USEDEP}]"