gentoo resync : 25.08.2020

4 files changed, 2 insertions, 109 deletions

diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 37ecb888118c..42975162e585 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,6 +1,3 @@
-AUX ipyparallel-6.2.3-disable-broken-test.patch 1063 BLAKE2B a80674390818474fba63c0b86c822eab8238713b96b2d6713478909da57bc4ee1c5bd1fa5da9fd7baff8d84b3ffd313540ed8287bd1c19dbeb61dd69bfe53dbb SHA512 c45c51b5c3fc1512d6bbd7bd557a91de50a1ae172ad465bc4f5482d6036f287ad17cad20406fbd51d8740eabe11a50584040c362c32f1770db69f4cbd9984681
-DIST ipyparallel-6.2.3.tar.gz 2371030 BLAKE2B 73f96bbed280def33ae243e592ecf2e298afe92287cf3a7edb966859c38c6dcb1f1a43082ab83907aa00e06d571f4b750df28e6885a1c2d1fd1489fd4472a7fc SHA512 ddf479a7776c2ca9fd37aa5b7dd402c136ce62a479333f5f56dce413649f9b928daed56c173ad5325268eaa58667d611257b20c8269899cc06ae2829f973b4c1
 DIST ipyparallel-6.3.0.tar.gz 2380153 BLAKE2B b8312102e1d2b5fc963491ebe8530e2fd73e9f941f7912fbc72a8db51e7255f5cac95a853d15a57e384926ab1aff27f2a3ad13cc45130a8b612be5dc623538ab SHA512 fe621854b9cc3e5f88aeca2b06b63bb689dd2feee0da451a0a90800d8832f4b44b23bb9a15033029cc33179276f31e982a10fc7540e6d13b04f15d96c348a295
-EBUILD ipyparallel-6.2.3.ebuild 1969 BLAKE2B dc93cc19091299c4b07e55a7068226e3239a5b3d4d32e2ddb15c1ff4a9cb6c6d6b572a5ca172cad3c59043e5c214e0c6f15dafb3d4303d8be70eb43047669028 SHA512 ef6dbefe4d827f5bd399d90a4b75a2be0b77d000c4973453dce17e26f59d45cb2a3afdae5964f2652e807079f23e6410aead5719fe54d218c6fd1b4d9ee277c4
-EBUILD ipyparallel-6.3.0.ebuild 1721 BLAKE2B bbfc1fa1db531de92835c5400ba27d150cb47e1d02a7eddaff11ed65bc5cffd8d055f9486d7ac68dc12e5c953e68fdf59ab709498feb6a70dae03fde6bc7a5f1 SHA512 778ed1bedc5a2a207dac83f5b08f3a66d9589f28cdda769a621e838b7afe74ba3d20faa1df770f59bbf452f71805b688bc641d6e2ba48cacc378ea5026729df3
+EBUILD ipyparallel-6.3.0.ebuild 1718 BLAKE2B e67a1bf4043f42fe6e60611ee1c6bd1bbfbd56074f5328992ee01e7649b9d415dd173b15779af2fd331cb9368c4fb5c1130efbda2060edbcea303818b1d90d95 SHA512 bc731e2069ea2533eacc3967eaf705148ccd809d8c0d8746296c11097184361ee72c2d351a7b08b13077c2155037a169cde49cc70e7316a868881077556292a8
 MISC metadata.xml 505 BLAKE2B 3dc8a7d01f8d67619f064ced47674ad386c81e625d46b820a7949dcba68755ecc69d29166880d80ba8951bd5226d6a380fdb0545287c527a133c3645b6f2bee5 SHA512 d86601139ae4a5d2aaf7d69fdfd609450f12d03775276bb0b459728712a15803d7c3a6ec3eb73ca7a0802e4333809f2eff8f9ebc2dd2a2c22947262b78c3dea6
diff --git a/dev-python/ipyparallel/files/ipyparallel-6.2.3-disable-broken-test.patch b/dev-python/ipyparallel/files/ipyparallel-6.2.3-disable-broken-test.patch
deleted file mode 100644
index b578cd7f73e1..000000000000
--- a/dev-python/ipyparallel/files/ipyparallel-6.2.3-disable-broken-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/ipyparallel/tests/test_util.py b/ipyparallel/tests/test_util.py
-index 06fde46..e685a88 100644
---- a/ipyparallel/tests/test_util.py
-+++ b/ipyparallel/tests/test_util.py
-@@ -3,7 +3,8 @@ from ipyparallel import util
- from jupyter_client.localinterfaces import localhost, public_ips
- 
- 
--def test_disambiguate_ip():
-+# This test is broken in gentoo's testing environment
-+def xtest_disambiguate_ip():
-     # garbage in, garbage out
-     public_ip = public_ips()[0]
-     assert util.disambiguate_ip_address('garbage') == 'garbage'
-diff --git a/ipyparallel/tests/test_view.py b/ipyparallel/tests/test_view.py
-index 45cb669..dd335b1 100644
---- a/ipyparallel/tests/test_view.py
-+++ b/ipyparallel/tests/test_view.py
-@@ -823,7 +823,8 @@ class TestView(ClusterTestCase):
-         assert view.apply_sync(find_ipython)
- 
-     @skip_without('cloudpickle')
--    def test_use_cloudpickle(self):
-+    # Broken on Gentoo
-+    def xtest_use_cloudpickle(self):
-         view = self.client[:]
-         view['_a'] = 'engine'
-         sys.modules['__main__']._a = 'client'
diff --git a/dev-python/ipyparallel/ipyparallel-6.2.3.ebuild b/dev-python/ipyparallel/ipyparallel-6.2.3.ebuild
deleted file mode 100644
index 074fd315ca02..000000000000
--- a/dev-python/ipyparallel/ipyparallel-6.2.3.ebuild
+++ /dev/null
@@ -1,76 +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} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Interactive Parallel Computing with IPython"
-HOMEPAGE="https://ipyparallel.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# About tests and tornado
-# Upstreams claims to work fine with tornado 5, and it's indeed possible to
-# launch a cluster with tornado 5 installed, but tests definitely don't run with
-# tornado 5 installed. Upstreams CI runs with tornado 4. This is why we limit
-# ourselves to <tornado-5 when running tests.
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/ipython[test]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		<www-servers/tornado-5
-	)
-	"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.2.3-disable-broken-test.patch"
-)
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/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() {
-	pytest -vs ipyparallel/tests || die
-}
-
-pkg_postinst() {
-	optfeature "Jupyter Notebook integration" dev-python/notebook
-}
diff --git a/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild b/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
index e567a97df1c1..d89e468faf15 100644
--- a/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"