gentoo resync : 13.06.2020

4 files changed, 101 insertions, 1 deletions

diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index 0929e886fc9a..8ab70ce8dfdd 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,3 +1,6 @@
+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
-MISC metadata.xml 569 BLAKE2B 2f205ddc11fc56ac1b708a0d4e786d1e04051faa47af17970d4ed0a2088c4159a1b3199f2581794884463a83fc33926a053c55b4e6b265bdd90539a6d700d977 SHA512 dd29f7ff9dcca2afaa4caf814f4792391560a33b485d9a6de539a36c75df7b63e59d3eabf7bcb020b48ad30a7de0ac28137f54d96023fbc435e3a6378cc79b10
+EBUILD jupyter_console-6.1.0.ebuild 869 BLAKE2B 8ca12ecd563abaa9a011a90c4da3bee86405b85935d202166218599f7581abcc1946fb6304b9214030104638d963fd21dca086cdb72992473a4ce583b31c5f6e SHA512 77ad3b92664e3af1ab3cebbf8aa5cf3ad1f029521c9981e68e6d844b7465864ad2ff8e4c9462a820ee6d8960081cc66132256ab4d44fe39aa3c2e95dee3ef750
+MISC metadata.xml 676 BLAKE2B bf2c14249bcb77defadb810b89cd41359927e79722a4aa3e7f9bb493e2a567d076b7f72922f74a94023e4339e0005d5e28ee3f1599e33962ccb4b0b810f9e4e9 SHA512 fd331bc5e964ed1124d0a927a0d31ad8a22b1ed6e797023a0af1457d037bea96078553c78bdfff84a3512e11a08c5fb91c6287d032e99f3a6da739cf7d0bd04c
diff --git a/dev-python/jupyter_console/files/jupyter_console-6.1.0-py39.patch b/dev-python/jupyter_console/files/jupyter_console-6.1.0-py39.patch
new file mode 100644
index 000000000000..92d3532649e9
--- /dev/null
+++ b/dev-python/jupyter_console/files/jupyter_console-6.1.0-py39.patch
@@ -0,0 +1,51 @@
+From 3b648aab9ce731beab1f02d714a97905ab0e42e1 Mon Sep 17 00:00:00 2001
+From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
+Date: Thu, 2 Jan 2020 18:30:41 +0530
+Subject: [PATCH] Fix deprecation warning in base64
+
+---
+ jupyter_console/ptshell.py                  | 6 +++---
+ jupyter_console/tests/test_image_handler.py | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/jupyter_console/ptshell.py b/jupyter_console/ptshell.py
+index 84af32f..6a55fe1 100644
+--- a/jupyter_console/ptshell.py
++++ b/jupyter_console/ptshell.py
+@@ -818,12 +818,12 @@ def handle_image_PIL(self, data, mime):
+             from PIL import Image, ImageShow
+         except ImportError:
+             return False
+-        raw = base64.decodestring(data[mime].encode('ascii'))
++        raw = base64.decodebytes(data[mime].encode('ascii'))
+         img = Image.open(BytesIO(raw))
+         return ImageShow.show(img)
+ 
+     def handle_image_stream(self, data, mime):
+-        raw = base64.decodestring(data[mime].encode('ascii'))
++        raw = base64.decodebytes(data[mime].encode('ascii'))
+         imageformat = self._imagemime[mime]
+         fmt = dict(format=imageformat)
+         args = [s.format(**fmt) for s in self.stream_image_handler]
+@@ -835,7 +835,7 @@ def handle_image_stream(self, data, mime):
+         return (proc.returncode == 0)
+ 
+     def handle_image_tempfile(self, data, mime):
+-        raw = base64.decodestring(data[mime].encode('ascii'))
++        raw = base64.decodebytes(data[mime].encode('ascii'))
+         imageformat = self._imagemime[mime]
+         filename = 'tmp.{0}'.format(imageformat)
+         with NamedFileInTemporaryDirectory(filename) as f, \
+diff --git a/jupyter_console/tests/test_image_handler.py b/jupyter_console/tests/test_image_handler.py
+index 5296635..b2a5ea9 100644
+--- a/jupyter_console/tests/test_image_handler.py
++++ b/jupyter_console/tests/test_image_handler.py
+@@ -32,7 +32,7 @@ def setUp(self):
+         self.shell = NonCommunicatingShell()
+         self.raw = b'dummy data'
+         self.mime = 'image/png'
+-        self.data = {self.mime: base64.encodestring(self.raw).decode('ascii')}
++        self.data = {self.mime: base64.encodebytes(self.raw).decode('ascii')}
+ 
+     def test_call_pil_by_default(self):
+         pil_called_with = []
diff --git a/dev-python/jupyter_console/jupyter_console-6.1.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.1.0.ebuild
new file mode 100644
index 000000000000..37b6ca896bc2
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-6.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+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"
+
+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}]
+	"
+# 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
+)
+
+python_test() {
+	script -eqc "nosetests -v" || die
+}
diff --git a/dev-python/jupyter_console/metadata.xml b/dev-python/jupyter_console/metadata.xml
index 5f427be5461c..2787cd2e4fca 100644
--- a/dev-python/jupyter_console/metadata.xml
+++ b/dev-python/jupyter_console/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
     A terminal-based console frontend for Jupyter kernels.
     This code is based on the single-process IPython terminal.