gentoo resync : 25.08.2020

5 files changed, 32 insertions, 63 deletions

diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index 8ab70ce8dfdd..82961d9378ca 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,6 +1,5 @@
+AUX jupyter_console-6.1.0-increase-test-timeout.patch 393 BLAKE2B b4338c47a14170247b3ceb4d4e8ea861311e651840c1bb2df595f0384ea0e855711633c73e79a6624f82570a86dfcea80b94ec97eeb988881fb9ca5d88e33060 SHA512 7ed1cbb54050eb40456648c92b1471dd164217cb3abd3298327b9d5f20a809bd4dce792e98764f9f5d1b57de9ab118644005f2773e1603002547aef356eb24f9
 AUX jupyter_console-6.1.0-py39.patch 2284 BLAKE2B a54d7d6a8cee2e17bd50a73bf1e242995d3f0e1c375190ce9038560a532cff5d62d56d34afcd574b7dfb91fc2c224f2bc8ff0c8584f7592d933c016f8d9de4d6 SHA512 3b77e727ae62c56d713d9c9c7d8163ecbefaf916238c3964b47407edb166ec4448377c55623e4b0b25c4a491f310cf2895ec3e8e444e0ced09aa57196085ada0
-DIST jupyter_console-6.0.0.tar.gz 27780 BLAKE2B da2b58461caa987bea0b323cedbc79ff24f31cb928602b8ae6dce1ed615008a8227d7a1bab47364e6d182cfd3bd6f548e355430efc505e7183a391ef26c08375 SHA512 27b333f439733c33062d3baa8b49ff673b10e22cb8c28c688ba604799838e899f93372bd2eaf4a94c97260d6dec043d6aef4421388d77e625b1ec43a3dedfa3f
 DIST jupyter_console-6.1.0.tar.gz 28468 BLAKE2B 08ef158de6a0eb8fe741dac00b74e11f7e577b5097f54aa16c47ae9e39607231e19a1fcd0a96cbae41d41fad891fefdb532d0f66bc03aa66ff99a8d3ff3cb28c SHA512 abb5457a90d109457e91071cd8b592a14bec7ead75fd667d656f9180a457e39bf470877b2e17c81ff512d1cc69b62a8f700996492f6164eb05a1581db82abbf7
-EBUILD jupyter_console-6.0.0.ebuild 1200 BLAKE2B 5a3c2949ae83be132e54670b8548bfe8ceccd69d73dc49d8d36ba1fe1044688670c92e34194d0b820ba96cd9077af56436096d2e5094d824826da2005c52ad00 SHA512 7825f0efa66645400f3ef3b1fc0164137dbe13734b0fded0d387e12def1e1922232b8cfe9eed370e1386557c21b15b1f7145beda0aeabc5a53940774be551f03
-EBUILD jupyter_console-6.1.0.ebuild 869 BLAKE2B 8ca12ecd563abaa9a011a90c4da3bee86405b85935d202166218599f7581abcc1946fb6304b9214030104638d963fd21dca086cdb72992473a4ce583b31c5f6e SHA512 77ad3b92664e3af1ab3cebbf8aa5cf3ad1f029521c9981e68e6d844b7465864ad2ff8e4c9462a820ee6d8960081cc66132256ab4d44fe39aa3c2e95dee3ef750
-MISC metadata.xml 676 BLAKE2B bf2c14249bcb77defadb810b89cd41359927e79722a4aa3e7f9bb493e2a567d076b7f72922f74a94023e4339e0005d5e28ee3f1599e33962ccb4b0b810f9e4e9 SHA512 fd331bc5e964ed1124d0a927a0d31ad8a22b1ed6e797023a0af1457d037bea96078553c78bdfff84a3512e11a08c5fb91c6287d032e99f3a6da739cf7d0bd04c
+EBUILD jupyter_console-6.1.0-r1.ebuild 1131 BLAKE2B 42127f8853c46650d1db81427fce1a4f643523828560a29ccefd7c8ae51caf583b8b2ffa372746cc7862044171f72e5ec4d252f989b3c0b499e2b3d3e32b09fe SHA512 5322b9645b1fc8fe749e517f12c6c9fe7abf8dccc02153a509d8fce74456e213512a37ceb4fabbd798da92bce5192b215255c083fec976c6feb9399b9f987944
+MISC metadata.xml 701 BLAKE2B 04e5ee12062960ad591ca853b731b0f5ef797a3ed40ab269b1f82235dca406346db5997f91b58edf1961af2252109c71e510992050e6978fdd787d2c8886cdd4 SHA512 cf5598a16ccd18cbedee0c7403fdf957339cdb4b6c21499cef96273bd25c84755a2e841dde82192a9cf93c12c515334374bdec9ec54a13a8bd027c6540055fd5
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.0.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
deleted file mode 100644
index 643134af1a3f..000000000000
--- a/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.0[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-	)
-	"
-
-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() {
-	nosetests --with-coverage --cover-package=jupyter_console jupyter_console || die
-}
diff --git a/dev-python/jupyter_console/jupyter_console-6.1.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.1.0-r1.ebuild
index 37b6ca896bc2..fbea105a40a5 100644
--- a/dev-python/jupyter_console/jupyter_console-6.1.0.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.1.0-r1.ebuild
@@ -13,30 +13,37 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]
 	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_sphinx docs \
+	dev-python/sphinxcontrib-github-alt dev-python/sphinx_rtd_theme
 distutils_enable_tests nose
 
 PATCHES=(
 	"${FILESDIR}"/${P}-py39.patch
+	"${FILESDIR}"/${P}-increase-test-timeout.patch
 )
 
+python_prepare_all() {
+	# use setuptools unconditionally
+	sed -i -e 's:distutils\.core:setuptools:' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
 	script -eqc "nosetests -v" || die
 }
diff --git a/dev-python/jupyter_console/metadata.xml b/dev-python/jupyter_console/metadata.xml
index 2787cd2e4fca..d0ea336908b6 100644
--- a/dev-python/jupyter_console/metadata.xml
+++ b/dev-python/jupyter_console/metadata.xml
@@ -13,6 +13,7 @@
     A terminal-based console frontend for Jupyter kernels.
     This code is based on the single-process IPython terminal.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">jupyter_console</remote-id>
     <remote-id type="github">jupyter/jupyter_console</remote-id>