From 09078c3139ee8f320267b35355dc44d60cd37c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:29 +0700
Subject: [PATCH 01/38] New package: python3-Pebble-4.5.1

---
 srcpkgs/python3-Pebble/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-Pebble/template

diff --git a/srcpkgs/python3-Pebble/template b/srcpkgs/python3-Pebble/template
new file mode 100644
index 00000000000..cea38bd0c61
--- /dev/null
+++ b/srcpkgs/python3-Pebble/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-Pebble'
+pkgname=python3-Pebble
+version=4.5.1
+revision=1
+archs=noarch
+wrksrc=Pebble-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Threading and multiprocessing eye-candy for Python"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://pebble.readthedocs.io/en/latest/"
+distfiles="${PYPI_SITE}/P/Pebble/Pebble-${version}.tar.gz"
+checksum=26fdcc0f36d93d8e07559d36b942b7800c6b9622626d5b587ab1a74820d02732
+
+do_check() {
+	PYTHONPATH=$(pwd)/build/lib pytest
+}

From 34a2204828a5f73dce437605e0d02edfa6e45904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:31 +0700
Subject: [PATCH 02/38] New package: python3-QtPy-1.9.0

---
 srcpkgs/python3-QtPy/template | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 srcpkgs/python3-QtPy/template

diff --git a/srcpkgs/python3-QtPy/template b/srcpkgs/python3-QtPy/template
new file mode 100644
index 00000000000..2ddc8b313ee
--- /dev/null
+++ b/srcpkgs/python3-QtPy/template
@@ -0,0 +1,35 @@
+# Template file for 'python3-QtPy'
+pkgname=python3-QtPy
+version=1.9.0
+revision=1
+archs=noarch
+wrksrc=QtPy-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+# depends on any of PySide2 PyQt5
+depends="python3"
+checkdepends="python3-pytest python3-mock python3-pyside2-webengine
+ python3-PyQt5-sql python3-PyQt5-svg python3-PyQt5-webengine
+ python3-PyQt5-websockets python3-PyQt5-xmlpatterns python3-PyQt5-quick
+ python3-PyQt5-multimedia python3-PyQt5-location python3-PyQt5-tools"
+short_desc="Abstraction layer on top of various Python Qt bindings"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://github.com/spyder-ide/qtpy"
+distfiles="${PYPI_SITE}/Q/QtPy/QtPy-${version}.tar.gz"
+checksum=2db72c44b55d0fe1407be8fba35c838ad0d6d3bb81f23007886dc1fc0f459c8d
+
+post_patch() {
+	# Both of those tests are failing inside chroot,
+	# but success outside of chroot
+	rm -f qtpy/tests/test_patch_qcombobox.py
+}
+
+do_check() {
+	CI=1 QT_API=PyQt5   FORCE_QT_API=PyQt5   pytest -k 'not test_load_ui'
+	CI=1 QT_API=PySide2 FORCE_QT_API=PySide2 pytest
+}
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 0220b99b61389b7d20e538200befd74c17230071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:32 +0700
Subject: [PATCH 03/38] New package: python3-EasyProcess-0.2.10

---
 srcpkgs/python3-EasyProcess/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/python3-EasyProcess/template

diff --git a/srcpkgs/python3-EasyProcess/template b/srcpkgs/python3-EasyProcess/template
new file mode 100644
index 00000000000..db1c8197e84
--- /dev/null
+++ b/srcpkgs/python3-EasyProcess/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-EasyProcess'
+pkgname=python3-EasyProcess
+version=0.2.10
+revision=1
+archs=noarch
+wrksrc=EasyProcess-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest python3-nose python3-PyVirtualDisplay inetutils
+ xorg-server-xvfb"
+short_desc="Easy to use python subprocess interface"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/ponty/easyprocess"
+distfiles="${PYPI_SITE}/E/EasyProcess/EasyProcess-${version}.tar.gz"
+checksum=636b5e30222cde1e881fafc0112b35d516bce41ddee83ecbac656dec9befea1b
+
+do_check() {
+	PYTHONPATH=$(pwd)/build/lib pytest
+}
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 24e7f9767a935c890da8c861444dd5fa61e3066d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:33 +0700
Subject: [PATCH 04/38] New package: python3-PyVirtualDisplay-0.2.5

---
 srcpkgs/python3-PyVirtualDisplay/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-PyVirtualDisplay/template

diff --git a/srcpkgs/python3-PyVirtualDisplay/template b/srcpkgs/python3-PyVirtualDisplay/template
new file mode 100644
index 00000000000..6cf2afcf765
--- /dev/null
+++ b/srcpkgs/python3-PyVirtualDisplay/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-PyVirtualDisplay'
+pkgname=python3-PyVirtualDisplay
+version=0.2.5
+revision=1
+archs=noarch
+wrksrc=PyVirtualDisplay-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-EasyProcess"
+short_desc="Python wrapper for Xvfb, Xephyr and Xvnc"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/ponty/pyvirtualdisplay"
+distfiles="${PYPI_SITE}/P/PyVirtualDisplay/PyVirtualDisplay-${version}.tar.gz"
+checksum=5b267c8ffc98fcbd084ba852ab4caef3f22e9362bc5d117e1697e767553eaf41
+
+do_check() {
+	: no test shipped with dist files
+}
+
+post_install() {
+	vlicense LICENSE.txt
+}

From cbca99cbd286e23ff77d04c9d80b9d519bbc7591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:34 +0700
Subject: [PATCH 05/38] New package: python3-pytest-xvfb-1.2.0

---
 srcpkgs/python3-pytest-xvfb/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-pytest-xvfb/template

diff --git a/srcpkgs/python3-pytest-xvfb/template b/srcpkgs/python3-pytest-xvfb/template
new file mode 100644
index 00000000000..9670ee4ccac
--- /dev/null
+++ b/srcpkgs/python3-pytest-xvfb/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pytest-xvfb'
+pkgname=python3-pytest-xvfb
+version=1.2.0
+revision=1
+archs=noarch
+wrksrc=pytest-xvfb-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest>=2.8.1 python3-PyVirtualDisplay xorg-server-xvfb xauth"
+checkdepends="python3-pytest python3-PyVirtualDisplay xorg-server-xvfb xauth"
+short_desc="Pytest plugin to run Xvfb for tests"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://github.com/The-Compiler/pytest-xvfb"
+distfiles="${PYPI_SITE}/p/pytest-xvfb/pytest-xvfb-${version}.tar.gz"
+checksum=a7544ca8d0c7c40db4b40d7a417a7b071c68d6ef6bdf9700872d7a167302f979
+
+post_install() {
+	vlicense LICENSE
+}

From 3520ab8da61f035ab3f0f907b7b235adc58dbbdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:35 +0700
Subject: [PATCH 06/38] New package: python3-pytest-qt-3.3.0

---
 srcpkgs/python3-pytest-qt/template | 32 ++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/python3-pytest-qt/template

diff --git a/srcpkgs/python3-pytest-qt/template b/srcpkgs/python3-pytest-qt/template
new file mode 100644
index 00000000000..a15bc15a4f3
--- /dev/null
+++ b/srcpkgs/python3-pytest-qt/template
@@ -0,0 +1,32 @@
+# Template file for 'python3-pytest-qt'
+pkgname=python3-pytest-qt
+version=3.3.0
+revision=1
+archs=noarch
+wrksrc=pytest-qt-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest"
+checkdepends="$depends python3-pyside2 python3-PyQt5 python3-pytest-xvfb
+ xdpyinfo"
+short_desc="Pytest support for PyQt and PySide applications"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://github.com/pytest-dev/pytest-qt"
+distfiles="${PYPI_SITE}/p/pytest-qt/pytest-qt-${version}.tar.gz"
+checksum=714b0bf86c5313413f2d300ac613515db3a1aef595051ab8ba2ffe619dbe8925
+
+do_check() {
+	# testing for some configuration in test_basics.py,
+	# isn't those 2 below tests are the real test for envvar
+	# Why does it run just fine?
+	local _skip='test_qapp_args or test_qt_api_ini_config or test_invalid_qt_api_envvar'
+	PYTHONPATH=$(pwd)/build/lib QT_QPA_PLATFORM=offscreen \
+		PYTEST_QT_API=pyside2 python3 -m pytest -k "not ($_skip)"
+	PYTHONPATH=$(pwd)/build/lib QT_QPA_PLATFORM=offscreen \
+		PYTEST_QT_API=pyqt5 python3 -m pytest -k "not ($_skip)"
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 51afc3ea519ae27998033799b0b9da4fa99943a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:36 +0700
Subject: [PATCH 07/38] python-jupyter: drop python 2 package

Also make jupyter as subpackage of jupyter_core to avoid vlicense lint.

/usr/bin/jupyter is provided by jupyter_core packages.
---
 srcpkgs/python-jupyter/template      | 26 --------------------------
 srcpkgs/python-jupyter_core/template | 16 +++++++++++-----
 srcpkgs/python3-jupyter              |  2 +-
 3 files changed, 12 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-jupyter/template

diff --git a/srcpkgs/python-jupyter/template b/srcpkgs/python-jupyter/template
deleted file mode 100644
index e89802506cf..00000000000
--- a/srcpkgs/python-jupyter/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-jupyter'
-pkgname=python-jupyter
-version=1.0.0
-revision=5
-archs=noarch
-build_style=meta
-short_desc="The Jupyter metapackage for Void Linux (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://jupyter.org/"
-license="BSD-3-Clause"
-depends="
-	python-jupyter_notebook
-	python-jupyter_console
-	python-jupyter_nbconvert
-	python-jupyter_ipywidgets"
-
-python3-jupyter_package() {
-	archs=noarch
-	build_style=meta
-	short_desc="${short_desc/Python2/Python3}"
-	depends="
-		python3-jupyter_notebook
-		python3-jupyter_console
-		python3-jupyter_nbconvert
-		python3-jupyter_ipywidgets"
-}
diff --git a/srcpkgs/python-jupyter_core/template b/srcpkgs/python-jupyter_core/template
index f1629208e86..07c270fa77f 100644
--- a/srcpkgs/python-jupyter_core/template
+++ b/srcpkgs/python-jupyter_core/template
@@ -1,17 +1,16 @@
 # Template file for 'python-jupyter_core'
 pkgname=python-jupyter_core
 version=4.4.0
-revision=2
+revision=3
 archs=noarch
 wrksrc="jupyter_core-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-traitlets"
-pycompile_module="jupyter_core jupyter.py"
 short_desc="Jupyter core package (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/jupyter/jupyter_core"
-license="3-clause-BSD"
+license="BSD-3-Clause"
+homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter_core/jupyter_core-${version}.tar.gz"
 checksum=ba70754aa680300306c699790128f6fbd8c306ee5927976cbe48adacf240c0b7
 
@@ -29,7 +28,6 @@ python3-jupyter_core_package() {
 	 jupyter-core:jupyter-migrate:/usr/bin/jupyter-migrate3"
 	archs=noarch
 	depends="python3-traitlets"
-	pycompile_module="jupyter_core jupyter.py"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/bin/jupyter3
@@ -38,3 +36,11 @@ python3-jupyter_core_package() {
 		vlicense COPYING.md LICENSE
 	}
 }
+
+python3-jupyter_package() {
+	build_style=meta
+	archs=noarch
+	depends="python3-jupyter_notebook python3-jupyter_console
+	 python3-jupyter_ipywidgets"
+	short_desc="Jupyter metapackage for Void Linux"
+}
diff --git a/srcpkgs/python3-jupyter b/srcpkgs/python3-jupyter
index 5c43ae08651..d348df87da4 120000
--- a/srcpkgs/python3-jupyter
+++ b/srcpkgs/python3-jupyter
@@ -1 +1 @@
-python-jupyter
\ No newline at end of file
+python3-jupyter_core
\ No newline at end of file

From 4b63a82291fbb58487f105e769a93e528a7cd6d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:38 +0700
Subject: [PATCH 08/38] python-jupyter_console: drop package

---
 srcpkgs/python-jupyter_console/template | 24 ------------------------
 srcpkgs/python-jupyter_console/update   |  1 -
 2 files changed, 25 deletions(-)
 delete mode 100644 srcpkgs/python-jupyter_console/template
 delete mode 100644 srcpkgs/python-jupyter_console/update

diff --git a/srcpkgs/python-jupyter_console/template b/srcpkgs/python-jupyter_console/template
deleted file mode 100644
index bdc224067c0..00000000000
--- a/srcpkgs/python-jupyter_console/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-jupyter_console'
-pkgname=python-jupyter_console
-version=5.2.0
-revision=4
-archs=noarch
-wrksrc="jupyter_console-${version}"
-build_style=python2-module
-pycompile_module="jupyter_console"
-hostmakedepends="python-setuptools"
-depends="python-ipython python-ipython_ipykernel python-jupyter_client
- python-prompt_toolkit1 python-Pygments"
-short_desc="Jupyter terminal console (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/jupyter/jupyter_console"
-distfiles="${PYPI_SITE}/j/jupyter_console/jupyter_console-${version}.tar.gz"
-checksum=545dedd3aaaa355148093c5609f0229aeb121b4852995c2accfa64fe3e0e55cd
-alternatives="jupyter-console:jupyter-console:/usr/bin/jupyter-console2"
-
-post_install() {
-	# create versioned script for alternatives
-	mv ${DESTDIR}/usr/bin/jupyter-console{,2}
-	vlicense COPYING.md LICENSE
-}
diff --git a/srcpkgs/python-jupyter_console/update b/srcpkgs/python-jupyter_console/update
deleted file mode 100644
index b2ab5939791..00000000000
--- a/srcpkgs/python-jupyter_console/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b* 6.*"

From b4966e5d03a9ee33e9c6781c37a3dfd4f94f2eae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Mar 2020 12:14:39 +0700
Subject: [PATCH 09/38] python3-jupyter_console: drop alternatives

---
 srcpkgs/python3-jupyter_console/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-jupyter_console/template b/srcpkgs/python3-jupyter_console/template
index 3837e5b3bbf..cc06132ec85 100644
--- a/srcpkgs/python3-jupyter_console/template
+++ b/srcpkgs/python3-jupyter_console/template
@@ -1,11 +1,10 @@
 # Template file for 'python3-jupyter_console'
 pkgname=python3-jupyter_console
 version=6.0.0
-revision=2
+revision=3
 archs=noarch
 wrksrc="jupyter_console-${version}"
 build_style=python3-module
-pycompile_module="jupyter_console"
 hostmakedepends="python3-setuptools"
 depends="python3-ipython python3-ipython_ipykernel python3-jupyter_client
  python3-prompt_toolkit2 python3-Pygments"
@@ -15,10 +14,9 @@ license="BSD-3-Clause"
 homepage="https://github.com/jupyter/jupyter_console"
 distfiles="${PYPI_SITE}/j/jupyter_console/jupyter_console-${version}.tar.gz"
 checksum=308ce876354924fb6c540b41d5d6d08acfc946984bf0c97777c1ddcb42e0b2f5
-alternatives="jupyter-console:jupyter-console:/usr/bin/jupyter-console3"
+# alternatives will be a conflict
+conflicts="python-jupyter_console<=6.0.0_2"
 
 post_install() {
-	# create versioned script for alternatives
-	mv ${DESTDIR}/usr/bin/jupyter-console{,3}
 	vlicense COPYING.md LICENSE
 }

From 0256d5f50c1a8cfdc9f20fb615f982b8487df7cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:40 +0700
Subject: [PATCH 10/38] python-jupyter_ipywidgets: drop package

---
 srcpkgs/python-jupyter_ipywidgets/template  | 34 ---------------------
 srcpkgs/python3-jupyter_ipywidgets          |  1 -
 srcpkgs/python3-jupyter_ipywidgets/template | 21 +++++++++++++
 3 files changed, 21 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/python-jupyter_ipywidgets/template
 delete mode 120000 srcpkgs/python3-jupyter_ipywidgets
 create mode 100644 srcpkgs/python3-jupyter_ipywidgets/template

diff --git a/srcpkgs/python-jupyter_ipywidgets/template b/srcpkgs/python-jupyter_ipywidgets/template
deleted file mode 100644
index 44570cf390a..00000000000
--- a/srcpkgs/python-jupyter_ipywidgets/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-jupyter_ipywidgets'
-pkgname=python-jupyter_ipywidgets
-version=7.4.2
-revision=2
-archs=noarch
-_widgetsnbextver=3.4.0
-wrksrc="ipywidgets-${version}"
-build_style=python-module
-pycompile_module="ipywidgets"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-jupyter_widgetsnbextension>=${_widgetsnbextver}
- python-ipython_ipykernel python-traitlets"
-short_desc="IPython widgets for the Jupyter notebook (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/jupyter-widgets/ipywidgets"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/i/ipywidgets/ipywidgets-${version}.tar.gz"
-checksum=a3e224f430163f767047ab9a042fc55adbcab0c24bbe6cf9f306c4f89fdf0ba3
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-jupyter_ipywidgets_package() {
-	archs=noarch
-	pycompile_module="ipywidgets"
-	depends="python3-jupyter_widgetsnbextension>=${_widgetsnbextver}
-	 python3-ipython_ipykernel python3-traitlets"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-jupyter_ipywidgets b/srcpkgs/python3-jupyter_ipywidgets
deleted file mode 120000
index 5100ae0a31d..00000000000
--- a/srcpkgs/python3-jupyter_ipywidgets
+++ /dev/null
@@ -1 +0,0 @@
-python-jupyter_ipywidgets
\ No newline at end of file
diff --git a/srcpkgs/python3-jupyter_ipywidgets/template b/srcpkgs/python3-jupyter_ipywidgets/template
new file mode 100644
index 00000000000..4d81b7844c4
--- /dev/null
+++ b/srcpkgs/python3-jupyter_ipywidgets/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-jupyter_ipywidgets'
+pkgname=python3-jupyter_ipywidgets
+version=7.4.2
+revision=3
+archs=noarch
+_widgetsnbextver=3.4.0
+wrksrc="ipywidgets-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-jupyter_widgetsnbextension>=${_widgetsnbextver}
+ python3-ipython_ipykernel python3-traitlets"
+short_desc="IPython widgets for the Jupyter notebook"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyter-widgets/ipywidgets"
+distfiles="${PYPI_SITE}/i/ipywidgets/ipywidgets-${version}.tar.gz"
+checksum=a3e224f430163f767047ab9a042fc55adbcab0c24bbe6cf9f306c4f89fdf0ba3
+
+post_install() {
+	vlicense LICENSE
+}

From 62377c461349d7742c7a65d63d34da312f6d7517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:41 +0700
Subject: [PATCH 11/38] python-jupyter_qtconsole: drop python 2 package

---
 srcpkgs/python-jupyter_qtconsole/template  | 38 ----------------------
 srcpkgs/python3-jupyter_qtconsole          |  1 -
 srcpkgs/python3-jupyter_qtconsole/template | 27 +++++++++++++++
 3 files changed, 27 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/python-jupyter_qtconsole/template
 delete mode 120000 srcpkgs/python3-jupyter_qtconsole
 create mode 100644 srcpkgs/python3-jupyter_qtconsole/template

diff --git a/srcpkgs/python-jupyter_qtconsole/template b/srcpkgs/python-jupyter_qtconsole/template
deleted file mode 100644
index ea7f89a62af..00000000000
--- a/srcpkgs/python-jupyter_qtconsole/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'python-jupyter_qtconsole'
-pkgname=python-jupyter_qtconsole
-version=4.4.3
-revision=2
-archs=noarch
-wrksrc="qtconsole-${version}"
-build_style=python-module
-pycompile_module="qtconsole"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-traitlets python-jupyter_core python-jupyter_client
- python-Pygments python-ipython_ipykernel python-ipython_genutils
- python-PyQt5-svg"
-short_desc="Jupyter Qt console (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/jupyter/qtconsole"
-distfiles="${PYPI_SITE}/q/qtconsole/qtconsole-${version}.tar.gz"
-checksum=bc1ba15f50c29ed50f1268ad823bb6543be263c18dd093b80495e9df63b003ac
-alternatives="jupyter-qtconsole:jupyter-qtconsole:/usr/bin/jupyter-qtconsole2"
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-jupyter_qtconsole_package() {
-	archs=noarch
-	depends="python3-traitlets python3-jupyter_core python3-jupyter_client
-	 python3-Pygments python3-ipython_ipykernel python3-ipython_genutils
-	 python3-PyQt5-svg"
-	pycompile_module="qtconsole"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="jupyter-qtconsole:jupyter-qtconsole:/usr/bin/jupyter-qtconsole3"
-	pkg_install() {
-		vmove usr/bin/jupyter-qtconsole3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-jupyter_qtconsole b/srcpkgs/python3-jupyter_qtconsole
deleted file mode 120000
index 964d4d35037..00000000000
--- a/srcpkgs/python3-jupyter_qtconsole
+++ /dev/null
@@ -1 +0,0 @@
-python-jupyter_qtconsole
\ No newline at end of file
diff --git a/srcpkgs/python3-jupyter_qtconsole/template b/srcpkgs/python3-jupyter_qtconsole/template
new file mode 100644
index 00000000000..44e8639e502
--- /dev/null
+++ b/srcpkgs/python3-jupyter_qtconsole/template
@@ -0,0 +1,27 @@
+# Template file for 'python3-jupyter_qtconsole'
+pkgname=python3-jupyter_qtconsole
+version=4.4.3
+revision=3
+archs=noarch
+wrksrc="qtconsole-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-traitlets python3-jupyter_core python3-jupyter_client
+ python3-Pygments python3-ipython_ipykernel python3-ipython_genutils
+ python3-PyQt5-svg"
+checkdepends="$depends python3-pytest"
+short_desc="Jupyter Qt console"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyter/qtconsole"
+distfiles="${PYPI_SITE}/q/qtconsole/qtconsole-${version}.tar.gz"
+checksum=bc1ba15f50c29ed50f1268ad823bb6543be263c18dd093b80495e9df63b003ac
+conflicts="python-jupyter_qtconsole<=4.4.3_2"
+
+do_check() {
+	QT_QPA_PLATFORM=offscreen pytest
+}
+
+post_install() {
+	vlicense LICENSE
+}

From c9a959536dd5449b247aab918baa9b41a19dab87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:42 +0700
Subject: [PATCH 12/38] jupyter_widgetsnbextension: drop python 2, merge data
 into python 3

---
 .../python-jupyter_widgetsnbextension-data    |  1 -
 .../template                                  | 47 -------------------
 srcpkgs/python3-jupyter_widgetsnbextension    |  1 -
 .../template                                  | 24 ++++++++++
 4 files changed, 24 insertions(+), 49 deletions(-)
 delete mode 120000 srcpkgs/python-jupyter_widgetsnbextension-data
 delete mode 100644 srcpkgs/python-jupyter_widgetsnbextension/template
 delete mode 120000 srcpkgs/python3-jupyter_widgetsnbextension
 create mode 100644 srcpkgs/python3-jupyter_widgetsnbextension/template

diff --git a/srcpkgs/python-jupyter_widgetsnbextension-data b/srcpkgs/python-jupyter_widgetsnbextension-data
deleted file mode 120000
index d92251cfb9e..00000000000
--- a/srcpkgs/python-jupyter_widgetsnbextension-data
+++ /dev/null
@@ -1 +0,0 @@
-python-jupyter_widgetsnbextension
\ No newline at end of file
diff --git a/srcpkgs/python-jupyter_widgetsnbextension/template b/srcpkgs/python-jupyter_widgetsnbextension/template
deleted file mode 100644
index 05e9c0d00a3..00000000000
--- a/srcpkgs/python-jupyter_widgetsnbextension/template
+++ /dev/null
@@ -1,47 +0,0 @@
-# Template file for 'python-jupyter_widgetsnbextension'
-pkgname=python-jupyter_widgetsnbextension
-version=3.4.2
-revision=2
-archs=noarch
-wrksrc="widgetsnbextension-${version}"
-build_style=python-module
-pycompile_module="widgetsnbextension"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-jupyter_widgetsnbextension-data>=${version}_${revision}
- python-jupyter_notebook"
-short_desc="Interactive HTML widgets for Jupyter notebooks (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://pypi.org/project/widgetsnbextension/"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/w/widgetsnbextension/widgetsnbextension-${version}.tar.gz"
-checksum=fa618be8435447a017fd1bf2c7ae922d0428056cfc7449f7a8641edf76b48265
-
-pre_build() {
-	sed -i '/widgetsnbextension.json/d' setup.py
-}
-post_install() {
-	vlicense LICENSE
-}
-
-python-jupyter_widgetsnbextension-data_package() {
-	archs=noarch
-	short_desc+=" - data files"
-	conf_files="/etc/jupyter/nbconfig/notebook.d/widgetsnbextension.json"
-	pkg_install() {
-		vmkdir etc/jupyter/nbconfig/notebook.d
-		vinstall widgetsnbextension.json 644 etc/jupyter/nbconfig/notebook.d
-		vmove usr/share/jupyter
-	}
-}
-
-python3-jupyter_widgetsnbextension_package() {
-	archs=noarch
-	pycompile_module="widgetsnbextension"
-	depends="python-jupyter_widgetsnbextension-data>=${version}_${revision}
-	 python3-jupyter_notebook"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-jupyter_widgetsnbextension b/srcpkgs/python3-jupyter_widgetsnbextension
deleted file mode 120000
index d92251cfb9e..00000000000
--- a/srcpkgs/python3-jupyter_widgetsnbextension
+++ /dev/null
@@ -1 +0,0 @@
-python-jupyter_widgetsnbextension
\ No newline at end of file
diff --git a/srcpkgs/python3-jupyter_widgetsnbextension/template b/srcpkgs/python3-jupyter_widgetsnbextension/template
new file mode 100644
index 00000000000..40a5f33daae
--- /dev/null
+++ b/srcpkgs/python3-jupyter_widgetsnbextension/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-jupyter_widgetsnbextension'
+pkgname=python3-jupyter_widgetsnbextension
+version=3.4.2
+revision=3
+archs=noarch
+wrksrc="widgetsnbextension-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-jupyter_notebook"
+checkdepends="$depends"
+short_desc="Interactive HTML widgets for Jupyter notebooks"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pypi.org/project/widgetsnbextension/"
+distfiles="${PYPI_SITE}/w/widgetsnbextension/widgetsnbextension-${version}.tar.gz"
+checksum=fa618be8435447a017fd1bf2c7ae922d0428056cfc7449f7a8641edf76b48265
+replaces="python-jupyter_widgetsnbextension-data>=0"
+conf_files="/etc/jupyter/nbconfig/notebook.d/widgetsnbextension.json"
+
+post_install() {
+	# /usr/etc is intended for *example configuration*
+	mv ${DESTDIR}/usr/etc ${DESTDIR}
+	vlicense LICENSE
+}

From c9bed936f03b0a868300d3c8c036e1944d638099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:43 +0700
Subject: [PATCH 13/38] python-jupyter_notebook: drop python 2

---
 srcpkgs/python-jupyter_notebook/template  | 55 -----------------------
 srcpkgs/python3-jupyter_notebook          |  1 -
 srcpkgs/python3-jupyter_notebook/template | 32 +++++++++++++
 3 files changed, 32 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/python-jupyter_notebook/template
 delete mode 120000 srcpkgs/python3-jupyter_notebook
 create mode 100644 srcpkgs/python3-jupyter_notebook/template

diff --git a/srcpkgs/python-jupyter_notebook/template b/srcpkgs/python-jupyter_notebook/template
deleted file mode 100644
index 4f6de0f642d..00000000000
--- a/srcpkgs/python-jupyter_notebook/template
+++ /dev/null
@@ -1,55 +0,0 @@
-# Template file for 'python-jupyter_notebook'
-pkgname=python-jupyter_notebook
-version=5.7.0
-revision=2
-archs=noarch
-wrksrc="notebook-${version}"
-build_style=python-module
-pycompile_module="notebook"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-Jinja2 python-terminado python-tornado
- python-ipython_genutils python-traitlets python-jupyter_core
- python-jupyter_client python-jupyter_nbformat python-jupyter_nbconvert
- python-ipython_ipykernel python-send2trash python-prometheus_client
- python-ipaddress mathjax"
-short_desc="Jupyter interactive notebook (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/jupyter/notebook"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/n/notebook/notebook-${version}.tar.gz"
-checksum=b85e4de3d54cf4f14fe1d0515a980ccb49ddd4cdd21250cc0d4fb6374d50b1a7
-
-alternatives="
- jupyter-notebook:jupyter-notebook:/usr/bin/jupyter-notebook2
- jupyter-notebook:jupyter-nbextension:/usr/bin/jupyter-nbextension2
- jupyter-notebook:jupyter-serverextension:/usr/bin/jupyter-serverextension2
- jupyter-notebook:jupyter-bundlerextension:/usr/bin/jupyter-bundlerextension2"
-
-post_install() {
-	vlicense COPYING.md LICENSE
-	# use system mathjax
-	for py_sitelib in $py2_sitelib $py3_sitelib; do
-		rm -rf ${DESTDIR}/${py_sitelib}/notebook/static/components/MathJax
-		ln -sf /usr/share/mathjax ${DESTDIR}/${py_sitelib}/notebook/static/components/MathJax
-	done
-}
-
-python3-jupyter_notebook_package() {
-	alternatives="
-	 jupyter-notebook:jupyter-notebook:/usr/bin/jupyter-notebook3
-	 jupyter-notebook:jupyter-nbextension:/usr/bin/jupyter-nbextension3
-	 jupyter-notebook:jupyter-serverextension:/usr/bin/jupyter-serverextension3
-	 jupyter-notebook:jupyter-bundlerextension:/usr/bin/jupyter-bundlerextension3"
-	archs=noarch
-	depends="python3-Jinja2 python3-terminado python3-tornado
-	 python3-ipython_genutils python3-traitlets python3-jupyter_core
-	 python3-jupyter_client python3-jupyter_nbformat python3-jupyter_nbconvert
-	 python3-ipython_ipykernel python3-send2trash python3-prometheus_client mathjax"
-	pycompile_module="notebook"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense COPYING.md LICENSE
-	}
-}
diff --git a/srcpkgs/python3-jupyter_notebook b/srcpkgs/python3-jupyter_notebook
deleted file mode 120000
index 8c3e828e727..00000000000
--- a/srcpkgs/python3-jupyter_notebook
+++ /dev/null
@@ -1 +0,0 @@
-python-jupyter_notebook
\ No newline at end of file
diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template
new file mode 100644
index 00000000000..d35ec7da3c3
--- /dev/null
+++ b/srcpkgs/python3-jupyter_notebook/template
@@ -0,0 +1,32 @@
+# Template file for 'python3-jupyter_notebook'
+pkgname=python3-jupyter_notebook
+version=5.7.0
+revision=3
+archs=noarch
+wrksrc="notebook-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Jinja2 python3-terminado python3-tornado
+ python3-ipython_genutils python3-traitlets python3-jupyter_core
+ python3-jupyter_client python3-jupyter_nbformat python3-jupyter_nbconvert
+ python3-ipython_ipykernel python3-send2trash python3-prometheus_client
+ mathjax"
+checkdepends="$depends"
+short_desc="Jupyter interactive notebook"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://jupyter.org/"
+distfiles="${PYPI_SITE}/n/notebook/notebook-${version}.tar.gz"
+checksum=b85e4de3d54cf4f14fe1d0515a980ccb49ddd4cdd21250cc0d4fb6374d50b1a7
+conflicts="python-jupyter_notebook<=5.7.0_2"
+
+post_install() {
+	vlicense COPYING.md LICENSE
+	# use system mathjax
+	rm -rf ${DESTDIR}/${py3_sitelib}/notebook/static/components/MathJax
+	ln -sf /usr/share/mathjax ${DESTDIR}/${py3_sitelib}/notebook/static/components/MathJax
+}
+
+do_check() {
+	: no selenium
+}

From 120544f0db9e85ecad83b15db1d221a881216e5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:45 +0700
Subject: [PATCH 14/38] python-jupyter_nbconvert: drop python 2

---
 srcpkgs/python-jupyter_nbconvert/INSTALL.msg  |  2 -
 srcpkgs/python-jupyter_nbconvert/template     | 38 -------------------
 srcpkgs/python3-jupyter_nbconvert             |  1 -
 .../INSTALL.msg}                              |  0
 srcpkgs/python3-jupyter_nbconvert/template    | 28 ++++++++++++++
 5 files changed, 28 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/python-jupyter_nbconvert/INSTALL.msg
 delete mode 100644 srcpkgs/python-jupyter_nbconvert/template
 delete mode 120000 srcpkgs/python3-jupyter_nbconvert
 rename srcpkgs/{python-jupyter_nbconvert/python3-jupyter_nbconvert.INSTALL.msg => python3-jupyter_nbconvert/INSTALL.msg} (100%)
 create mode 100644 srcpkgs/python3-jupyter_nbconvert/template

diff --git a/srcpkgs/python-jupyter_nbconvert/INSTALL.msg b/srcpkgs/python-jupyter_nbconvert/INSTALL.msg
deleted file mode 100644
index 9031810f68d..00000000000
--- a/srcpkgs/python-jupyter_nbconvert/INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-To convert notebooks to formats other than HTML and markdown install
-python-Sphinx and/or pandoc.
diff --git a/srcpkgs/python-jupyter_nbconvert/template b/srcpkgs/python-jupyter_nbconvert/template
deleted file mode 100644
index e6cdad7d21c..00000000000
--- a/srcpkgs/python-jupyter_nbconvert/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'python-jupyter_nbconvert'
-pkgname=python-jupyter_nbconvert
-version=5.4.1
-revision=2
-archs=noarch
-wrksrc="nbconvert-${version}"
-build_style=python-module
-pycompile_module="nbconvert"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-mistune python-Jinja2 python-Pygments python-traitlets
- python-jupyter_core python-jupyter_nbformat python-entrypoints
- python-testpath python-bleach python-pandocfilters python-defusedxml"
-short_desc="Converting Jupyter notebooks (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/jupyter/nbconvert"
-distfiles="${PYPI_SITE}/n/nbconvert/nbconvert-${version}.tar.gz"
-checksum=302554a2e219bc0fc84f3edd3e79953f3767b46ab67626fdec16e38ba3f7efe4
-alternatives="jupyter-nbconvert:jupyter-nbconvert:/usr/bin/jupyter-nbconvert2"
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-jupyter_nbconvert_package() {
-	archs=noarch
-	depends="python3-mistune python3-Jinja2 python3-Pygments python3-traitlets
-	 python3-jupyter_core python3-jupyter_nbformat python3-entrypoints
-	 python3-testpath python3-bleach python3-pandocfilters python3-defusedxml"
-	pycompile_module="nbconvert"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="jupyter-nbconvert:jupyter-nbconvert:/usr/bin/jupyter-nbconvert3"
-	pkg_install() {
-		vmove usr/bin/jupyter-nbconvert3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-jupyter_nbconvert b/srcpkgs/python3-jupyter_nbconvert
deleted file mode 120000
index 441bbee041a..00000000000
--- a/srcpkgs/python3-jupyter_nbconvert
+++ /dev/null
@@ -1 +0,0 @@
-python-jupyter_nbconvert
\ No newline at end of file
diff --git a/srcpkgs/python-jupyter_nbconvert/python3-jupyter_nbconvert.INSTALL.msg b/srcpkgs/python3-jupyter_nbconvert/INSTALL.msg
similarity index 100%
rename from srcpkgs/python-jupyter_nbconvert/python3-jupyter_nbconvert.INSTALL.msg
rename to srcpkgs/python3-jupyter_nbconvert/INSTALL.msg
diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template
new file mode 100644
index 00000000000..e10a2048b2a
--- /dev/null
+++ b/srcpkgs/python3-jupyter_nbconvert/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-jupyter_nbconvert'
+pkgname=python3-jupyter_nbconvert
+version=5.4.1
+revision=3
+archs=noarch
+wrksrc="nbconvert-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-mistune python3-Jinja2 python3-Pygments python3-traitlets
+ python3-jupyter_core python3-jupyter_nbformat python3-entrypoints
+ python3-testpath python3-bleach python3-pandocfilters python3-defusedxml"
+checkdepends="$depends python3-pytest python3-ipython_ipykernel
+ python3-jupyter_ipywidgets python3-Pebble pandoc inkscape"
+short_desc="Converting Jupyter notebooks"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyter/nbconvert"
+distfiles="${PYPI_SITE}/n/nbconvert/nbconvert-${version}.tar.gz"
+checksum=302554a2e219bc0fc84f3edd3e79953f3767b46ab67626fdec16e38ba3f7efe4
+conflicts="python-jupyter_nbconvert<=5.4.1_2"
+
+do_check() {
+	: this version fail badly
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 1cb91117ee423d86e408be7bef6ad8fdf74aca08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:46 +0700
Subject: [PATCH 15/38] python-ipython_ipykernel: drop package

---
 srcpkgs/python-ipython_ipykernel/template  | 35 ----------------------
 srcpkgs/python3-ipython_ipykernel          |  1 -
 srcpkgs/python3-ipython_ipykernel/template | 27 +++++++++++++++++
 3 files changed, 27 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/python-ipython_ipykernel/template
 delete mode 120000 srcpkgs/python3-ipython_ipykernel
 create mode 100644 srcpkgs/python3-ipython_ipykernel/template

diff --git a/srcpkgs/python-ipython_ipykernel/template b/srcpkgs/python-ipython_ipykernel/template
deleted file mode 100644
index 503eba2c07e..00000000000
--- a/srcpkgs/python-ipython_ipykernel/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'python-ipython_ipykernel'
-pkgname=python-ipython_ipykernel
-version=4.10.0
-revision=3
-archs=noarch
-wrksrc="ipykernel-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools python-ipython
- python3-ipython python-jupyter_client python3-jupyter_client python-traitlets
- python3-traitlets python-tornado python3-tornado"
-depends="python-ipython python-traitlets python-jupyter_client python-tornado"
-short_desc="IPython kernel for Jupyter (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/ipython/ipykernel"
-distfiles="${PYPI_SITE}/i/ipykernel/ipykernel-${version}.tar.gz"
-checksum=699103c8e64886e3ec7053f2a6aa83bb90426063526f63a818732ff385202bad
-
-post_install() {
-	for v in 2 3; do
-		vsed -i "s,python,&${v}," ${DESTDIR}/usr/share/jupyter/kernels/python${v}/kernel.json
-	done
-	vlicense COPYING.md LICENSE
-}
-
-python3-ipython_ipykernel_package() {
-	archs=noarch
-	depends="python3-ipython python3-traitlets python3-jupyter_client python3-tornado"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vmove usr/share/jupyter/kernels/python3
-		vlicense COPYING.md LICENSE
-	}
-}
diff --git a/srcpkgs/python3-ipython_ipykernel b/srcpkgs/python3-ipython_ipykernel
deleted file mode 120000
index fd7db802e59..00000000000
--- a/srcpkgs/python3-ipython_ipykernel
+++ /dev/null
@@ -1 +0,0 @@
-python-ipython_ipykernel
\ No newline at end of file
diff --git a/srcpkgs/python3-ipython_ipykernel/template b/srcpkgs/python3-ipython_ipykernel/template
new file mode 100644
index 00000000000..a7d266b8b32
--- /dev/null
+++ b/srcpkgs/python3-ipython_ipykernel/template
@@ -0,0 +1,27 @@
+# Template file for 'python3-ipython_ipykernel'
+pkgname=python3-ipython_ipykernel
+version=4.10.0
+revision=3
+archs=noarch
+wrksrc="ipykernel-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-ipython
+ python3-jupyter_client python3-traitlets python3-tornado"
+depends="python3-ipython python3-traitlets python3-jupyter_client python3-tornado"
+checkdepends="python3-pytest $depends python3-numpy python3-flaky python3-nose"
+short_desc="IPython kernel for Jupyter (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/ipython/ipykernel"
+distfiles="${PYPI_SITE}/i/ipykernel/ipykernel-${version}.tar.gz"
+checksum=699103c8e64886e3ec7053f2a6aa83bb90426063526f63a818732ff385202bad
+
+do_check() {
+	: requires IPython/external/decorators/_decorators of python3-ipython
+}
+
+post_install() {
+	vsed -i -e "s/python/&3/" \
+		${DESTDIR}/usr/share/jupyter/kernels/python3/kernel.json
+	vlicense COPYING.md LICENSE
+}

From e05ec8ea7115137735d74d81dab4f99c299de775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:47 +0700
Subject: [PATCH 16/38] python-plotly: drop package

---
 srcpkgs/python-plotly/template             | 37 --------
 srcpkgs/python3-plotly                     |  1 -
 srcpkgs/python3-plotly/patches/py3.8.patch | 99 ++++++++++++++++++++++
 srcpkgs/python3-plotly/template            | 27 ++++++
 4 files changed, 126 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/python-plotly/template
 delete mode 120000 srcpkgs/python3-plotly
 create mode 100644 srcpkgs/python3-plotly/patches/py3.8.patch
 create mode 100644 srcpkgs/python3-plotly/template

diff --git a/srcpkgs/python-plotly/template b/srcpkgs/python-plotly/template
deleted file mode 100644
index 1593b108f7a..00000000000
--- a/srcpkgs/python-plotly/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-plotly'
-pkgname=python-plotly
-version=2.2.0
-revision=2
-archs=noarch
-#wrksrc="${pkgname#*-}-${version}"
-wrksrc="plotly.py-${version}"
-build_style=python-module
-pycompile_module="plotly"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-six python-requests python-pytz python-decorator python-jupyter_nbformat"
-short_desc="Python2 plotting library for collaborative, interactive graphs"
-maintainer="pulux <pulux@pf4sh.de>"
-license="MIT"
-homepage="https://plot.ly/python/"
-#odistfiles="${PYPI_SITE}/p/plotly/plotly-${version}.tar.gz"
-#checksum=aee7044a5c70989940d24bbbb12469b2ab2dbf41b9dff652052327fe1168b3cc
-#pypi has no LICENSE.txt
-distfiles="https://github.com/plotly/plotly.py/archive/v${version}.tar.gz"
-checksum=dad2a49fe355dddb6ae159e96c10ac22413a33cbac513b4dbf3791e63ec33c1f
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-
-python3-plotly_package() {
-	archs=noarch
-	pycompile_module="plotly"
-	depends="python3-setuptools python3-six python3-requests python3-pytz python3-decorator python3-jupyter_nbformat"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
-
diff --git a/srcpkgs/python3-plotly b/srcpkgs/python3-plotly
deleted file mode 120000
index 8d444272b8f..00000000000
--- a/srcpkgs/python3-plotly
+++ /dev/null
@@ -1 +0,0 @@
-python-plotly
\ No newline at end of file
diff --git a/srcpkgs/python3-plotly/patches/py3.8.patch b/srcpkgs/python3-plotly/patches/py3.8.patch
new file mode 100644
index 00000000000..e8acfb4bd00
--- /dev/null
+++ b/srcpkgs/python3-plotly/patches/py3.8.patch
@@ -0,0 +1,99 @@
+diff --git plotly/figure_factory/_candlestick.py plotly/figure_factory/_candlestick.py
+index 925b4c1..c0847b3 100644
+--- plotly/figure_factory/_candlestick.py
++++ plotly/figure_factory/_candlestick.py
+@@ -211,11 +211,11 @@ def create_candlestick(open, high, low, close, dates=None, direction='both',
+         utils.validate_equal_length(open, high, low, close)
+     validate_ohlc(open, high, low, close, direction, **kwargs)
+ 
+-    if direction is 'increasing':
++    if direction == 'increasing':
+         candle_incr_data = make_increasing_candle(open, high, low, close,
+                                                   dates, **kwargs)
+         data = candle_incr_data
+-    elif direction is 'decreasing':
++    elif direction == 'decreasing':
+         candle_decr_data = make_decreasing_candle(open, high, low, close,
+                                                   dates, **kwargs)
+         data = candle_decr_data
+diff --git plotly/figure_factory/_facet_grid.py plotly/figure_factory/_facet_grid.py
+index 61af2b1..d0eb2bc 100644
+--- plotly/figure_factory/_facet_grid.py
++++ plotly/figure_factory/_facet_grid.py
+@@ -751,7 +751,7 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
+         x='wt',
+         y='mpg',
+         facet_col='cyl',
+-        facet_col_labels={4: "$\\alpha$", 6: '$\\beta$', 8: '$\sqrt[y]{x}$'},
++        facet_col_labels={4: "$\\alpha$", 6: '$\\beta$', 8: '$\\sqrt[y]{x}$'},
+     )
+ 
+     py.iplot(fig, filename='facet_grid_mtcars_custom_labels')
+diff --git plotly/figure_factory/_ohlc.py plotly/figure_factory/_ohlc.py
+index b5e84cd..0c41430 100644
+--- plotly/figure_factory/_ohlc.py
++++ plotly/figure_factory/_ohlc.py
+@@ -264,11 +264,11 @@ def create_ohlc(open, high, low, close, dates=None, direction='both',
+         utils.validate_equal_length(open, high, low, close)
+     validate_ohlc(open, high, low, close, direction, **kwargs)
+ 
+-    if direction is 'increasing':
++    if direction == 'increasing':
+         ohlc_incr = make_increasing_ohlc(open, high, low, close, dates,
+                                          **kwargs)
+         data = [ohlc_incr]
+-    elif direction is 'decreasing':
++    elif direction == 'decreasing':
+         ohlc_decr = make_decreasing_ohlc(open, high, low, close, dates,
+                                          **kwargs)
+         data = [ohlc_decr]
+diff --git plotly/matplotlylib/renderer.py plotly/matplotlylib/renderer.py
+index 548ae74..9eb3fd2 100644
+--- plotly/matplotlylib/renderer.py
++++ plotly/matplotlylib/renderer.py
+@@ -428,7 +428,7 @@ class PlotlyRenderer(Renderer):
+ 
+         """
+         self.msg += "    Attempting to draw a path collection\n"
+-        if props['offset_coordinates'] is 'data':
++        if props['offset_coordinates'] == 'data':
+             markerstyle = mpltools.get_markerstyle_from_collection(props)
+             scatter_props = {
+                 'coordinates': 'data',
+@@ -536,7 +536,7 @@ class PlotlyRenderer(Renderer):
+             self.draw_title(**props)
+         else:  # just a regular text annotation...
+             self.msg += "      Text object is a normal annotation\n"
+-            if props['coordinates'] is not 'data':
++            if props['coordinates'] != 'data':
+                 self.msg += "        Text object isn't linked to 'data' " \
+                             "coordinates\n"
+                 x_px, y_px = props['mplobj'].get_transform().transform(
+diff --git plotly/tools.py plotly/tools.py
+index ba6aae7..db8eaa2 100644
+--- plotly/tools.py
++++ plotly/tools.py
+@@ -319,7 +319,7 @@ def get_embed(file_owner_or_url, file_id=None, width="100%", height=525):
+         raise exceptions.PlotlyError(
+             "The 'file_id' argument must be a non-negative number."
+         )
+-    if share_key is '':
++    if share_key == '':
+         s = ("<iframe id=\"igraph\" scrolling=\"no\" style=\"border:none;\" "
+              "seamless=\"seamless\" "
+              "src=\"{plotly_rest_url}/"
+diff --git plotly/utils.py plotly/utils.py
+index 7d62301..f600402 100644
+--- plotly/utils.py
++++ plotly/utils.py
+@@ -84,8 +84,8 @@ def ensure_dir_exists(directory):
+ def iso_to_plotly_time_string(iso_string):
+     """Remove timezone info and replace 'T' delimeter with ' ' (ws)."""
+     # make sure we don't send timezone info to plotly
+-    if (iso_string.split('-')[:3] is '00:00') or\
+-            (iso_string.split('+')[0] is '00:00'):
++    if (iso_string.split('-')[:3] == '00:00') or\
++            (iso_string.split('+')[0] == '00:00'):
+         raise Exception("Plotly won't accept timestrings with timezone info.\n"
+                         "All timestrings are assumed to be in UTC.")
+ 
diff --git a/srcpkgs/python3-plotly/template b/srcpkgs/python3-plotly/template
new file mode 100644
index 00000000000..78ed7967db9
--- /dev/null
+++ b/srcpkgs/python3-plotly/template
@@ -0,0 +1,27 @@
+# Template file for 'python3-plotly'
+pkgname=python3-plotly
+version=2.2.0
+revision=3
+archs=noarch
+wrksrc="plotly.py-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-six python3-requests python3-pytz
+ python3-decorator python3-jupyter_nbformat"
+short_desc="Python plotting library for collaborative, interactive graphs"
+maintainer="pulux <pulux@pf4sh.de>"
+license="MIT"
+homepage="https://plot.ly/python/"
+#odistfiles="${PYPI_SITE}/p/plotly/plotly-${version}.tar.gz"
+#checksum=aee7044a5c70989940d24bbbb12469b2ab2dbf41b9dff652052327fe1168b3cc
+#pypi has no LICENSE.txt
+distfiles="https://github.com/plotly/plotly.py/archive/v${version}.tar.gz"
+checksum=dad2a49fe355dddb6ae159e96c10ac22413a33cbac513b4dbf3791e63ec33c1f
+
+do_check() {
+	: alot of failures
+}
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 2882c152a0cf91b423e15f7a413240059313df34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:48 +0700
Subject: [PATCH 17/38] python-jupyter_nbformat: drop python 2

---
 srcpkgs/python-jupyter_nbformat/template  | 35 -----------------------
 srcpkgs/python3-jupyter_nbformat          |  1 -
 srcpkgs/python3-jupyter_nbformat/template | 26 +++++++++++++++++
 3 files changed, 26 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/python-jupyter_nbformat/template
 delete mode 120000 srcpkgs/python3-jupyter_nbformat
 create mode 100644 srcpkgs/python3-jupyter_nbformat/template

diff --git a/srcpkgs/python-jupyter_nbformat/template b/srcpkgs/python-jupyter_nbformat/template
deleted file mode 100644
index e2addc8866f..00000000000
--- a/srcpkgs/python-jupyter_nbformat/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'python-jupyter_nbformat'
-pkgname=python-jupyter_nbformat
-version=4.4.0
-revision=3
-archs=noarch
-wrksrc="nbformat-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-jsonschema python-ipython_genutils python-traitlets python-jupyter_core"
-pycompile_module="nbformat"
-short_desc="The Jupyter notebook format (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/jupyter/nbformat"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/n/nbformat/nbformat-${version}.tar.gz"
-checksum=f7494ef0df60766b7cabe0a3651556345a963b74dbc16bc7c18479041170d402
-alternatives="jupyter-nbformat:jupyter-trust:/usr/bin/jupyter-trust2"
-
-post_install() {
-	vlicense COPYING.md LICENSE
-}
-
-python3-jupyter_nbformat_package() {
-	archs=noarch
-	depends="python3-jsonschema python3-ipython_genutils python3-traitlets
-	 python3-jupyter_core"
-	pycompile_module="nbformat"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="jupyter-nbformat:jupyter-trust:/usr/bin/jupyter-trust3"
-	pkg_install() {
-		vmove usr/bin/jupyter-trust3
-		vmove usr/lib/python3*
-		vlicense COPYING.md LICENSE
-	}
-}
diff --git a/srcpkgs/python3-jupyter_nbformat b/srcpkgs/python3-jupyter_nbformat
deleted file mode 120000
index fcc839dfa33..00000000000
--- a/srcpkgs/python3-jupyter_nbformat
+++ /dev/null
@@ -1 +0,0 @@
-python-jupyter_nbformat
\ No newline at end of file
diff --git a/srcpkgs/python3-jupyter_nbformat/template b/srcpkgs/python3-jupyter_nbformat/template
new file mode 100644
index 00000000000..6e9966c3793
--- /dev/null
+++ b/srcpkgs/python3-jupyter_nbformat/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-jupyter_nbformat'
+pkgname=python3-jupyter_nbformat
+version=4.4.0
+revision=4
+archs=noarch
+wrksrc="nbformat-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-jsonschema python3-ipython_genutils python3-traitlets
+ python3-jupyter_core"
+checkdepends="$depends python3-pytest python3-testpath"
+short_desc="Jupyter notebook format"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyter/nbformat"
+distfiles="${PYPI_SITE}/n/nbformat/nbformat-${version}.tar.gz"
+checksum=f7494ef0df60766b7cabe0a3651556345a963b74dbc16bc7c18479041170d402
+conflicts="python-jupyter_nbformat<=4.4.0_3"
+
+do_check() {
+	pytest
+}
+
+post_install() {
+	vlicense COPYING.md LICENSE
+}

From 18cf56757577f450faaea05f636f2529f02ffc45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:49 +0700
Subject: [PATCH 18/38] python-jupyter_client: drop python 2

---
 srcpkgs/python-jupyter_client/template        | 42 -------------------
 srcpkgs/python3-jupyter_client                |  1 -
 .../patches/test_session.patch                | 15 +++++++
 srcpkgs/python3-jupyter_client/template       | 27 ++++++++++++
 4 files changed, 42 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/python-jupyter_client/template
 delete mode 120000 srcpkgs/python3-jupyter_client
 create mode 100644 srcpkgs/python3-jupyter_client/patches/test_session.patch
 create mode 100644 srcpkgs/python3-jupyter_client/template

diff --git a/srcpkgs/python-jupyter_client/template b/srcpkgs/python-jupyter_client/template
deleted file mode 100644
index 6365dd9e175..00000000000
--- a/srcpkgs/python-jupyter_client/template
+++ /dev/null
@@ -1,42 +0,0 @@
-# Template file for 'python-jupyter_client'
-pkgname=python-jupyter_client
-version=5.2.4
-revision=2
-archs=noarch
-wrksrc="jupyter_client-${version}"
-build_style=python-module
-pycompile_module="jupyter_client"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-traitlets python-jupyter_core
- python-pyzmq python-dateutil python-tornado python-simplejson"
-short_desc="Jupyter protocol client APIs (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/jupyter/jupyter_client"
-distfiles="${PYPI_SITE}/j/jupyter_client/jupyter_client-${version}.tar.gz"
-checksum=b5f9cb06105c1d2d30719db5ffb3ea67da60919fb68deaefa583deccd8813551
-alternatives="
- jupyter-client:jupyter-kernel:/usr/bin/jupyter-kernel2
- jupyter-client:jupyter-kernelspec:/usr/bin/jupyter-kernelspec2
- jupyter-client:jupyter-run:/usr/bin/jupyter-run2"
-
-post_install() {
-	vlicense COPYING.md LICENSE
-}
-
-python3-jupyter_client_package() {
-	archs=noarch
-	pycompile_module="jupyter_client"
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3-setuptools python3-traitlets python3-jupyter_core
-	 python3-pyzmq python3-dateutil python3-tornado python3-simplejson"
-	alternatives="
-	 jupyter-client:jupyter-kernel:/usr/bin/jupyter-kernel3
-	 jupyter-client:jupyter-kernelspec:/usr/bin/jupyter-kernelspec3
-	 jupyter-client:jupyter-run:/usr/bin/jupyter-run3"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense COPYING.md LICENSE
-	}
-}
diff --git a/srcpkgs/python3-jupyter_client b/srcpkgs/python3-jupyter_client
deleted file mode 120000
index 1bbcedc9a15..00000000000
--- a/srcpkgs/python3-jupyter_client
+++ /dev/null
@@ -1 +0,0 @@
-python-jupyter_client
\ No newline at end of file
diff --git a/srcpkgs/python3-jupyter_client/patches/test_session.patch b/srcpkgs/python3-jupyter_client/patches/test_session.patch
new file mode 100644
index 00000000000..2febffe28cf
--- /dev/null
+++ b/srcpkgs/python3-jupyter_client/patches/test_session.patch
@@ -0,0 +1,15 @@
+encoding option is removed from msgpack.unpackb
+See: https://pypi.org/project/msgpack/
+diff --git jupyter_client/tests/test_session.py jupyter_client/tests/test_session.py
+index 82d63df..d8636ff 100644
+--- jupyter_client/tests/test_session.py
++++ jupyter_client/tests/test_session.py
+@@ -311,7 +311,7 @@ class TestSession(SessionTestCase):
+ 
+         session = ss.Session(
+             pack=msgpack.packb,
+-            unpack=lambda buf: msgpack.unpackb(buf, encoding='utf8'),
++            unpack=lambda buf: msgpack.unpackb(buf),
+         )
+         self._datetime_test(session)
+ 
diff --git a/srcpkgs/python3-jupyter_client/template b/srcpkgs/python3-jupyter_client/template
new file mode 100644
index 00000000000..ed8ea565883
--- /dev/null
+++ b/srcpkgs/python3-jupyter_client/template
@@ -0,0 +1,27 @@
+# Template file for 'python3-jupyter_client'
+pkgname=python3-jupyter_client
+version=5.2.4
+revision=3
+archs=noarch
+wrksrc="jupyter_client-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-traitlets python3-jupyter_core
+ python3-pyzmq python3-dateutil python3-tornado python3-simplejson"
+checkdepends="$depends python3-pytest python3-ipython_ipykernel
+ python3-msgpack python3-Sphinx"
+short_desc="Jupyter protocol client APIs"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyter/jupyter_client"
+distfiles="${PYPI_SITE}/j/jupyter_client/jupyter_client-${version}.tar.gz"
+checksum=b5f9cb06105c1d2d30719db5ffb3ea67da60919fb68deaefa583deccd8813551
+conflicts="python-jupyter_client<=5.2.4_2"
+
+do_check() {
+	pytest -k 'not test_install_kernel_spec_prefix'
+}
+
+post_install() {
+	vlicense COPYING.md LICENSE
+}

From b8b6c765882f73df150985ba38a4b390ca461375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:51 +0700
Subject: [PATCH 19/38] python-jupyter_core: drop python 2

---
 srcpkgs/python-jupyter_core/template  | 46 ---------------------------
 srcpkgs/python3-jupyter_core          |  1 -
 srcpkgs/python3-jupyter_core/template | 36 +++++++++++++++++++++
 3 files changed, 36 insertions(+), 47 deletions(-)
 delete mode 100644 srcpkgs/python-jupyter_core/template
 delete mode 120000 srcpkgs/python3-jupyter_core
 create mode 100644 srcpkgs/python3-jupyter_core/template

diff --git a/srcpkgs/python-jupyter_core/template b/srcpkgs/python-jupyter_core/template
deleted file mode 100644
index 07c270fa77f..00000000000
--- a/srcpkgs/python-jupyter_core/template
+++ /dev/null
@@ -1,46 +0,0 @@
-# Template file for 'python-jupyter_core'
-pkgname=python-jupyter_core
-version=4.4.0
-revision=3
-archs=noarch
-wrksrc="jupyter_core-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-traitlets"
-short_desc="Jupyter core package (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://jupyter.org"
-distfiles="${PYPI_SITE}/j/jupyter_core/jupyter_core-${version}.tar.gz"
-checksum=ba70754aa680300306c699790128f6fbd8c306ee5927976cbe48adacf240c0b7
-
-alternatives="
- jupyter-core:jupyter:/usr/bin/jupyter2
- jupyter-core:jupyter-migrate:/usr/bin/jupyter-migrate2"
-
-post_install() {
-	vlicense COPYING.md LICENSE
-}
-
-python3-jupyter_core_package() {
-	alternatives="
-	 jupyter-core:jupyter:/usr/bin/jupyter3
-	 jupyter-core:jupyter-migrate:/usr/bin/jupyter-migrate3"
-	archs=noarch
-	depends="python3-traitlets"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/jupyter3
-		vmove usr/bin/jupyter-migrate3
-		vmove usr/lib/python3*
-		vlicense COPYING.md LICENSE
-	}
-}
-
-python3-jupyter_package() {
-	build_style=meta
-	archs=noarch
-	depends="python3-jupyter_notebook python3-jupyter_console
-	 python3-jupyter_ipywidgets"
-	short_desc="Jupyter metapackage for Void Linux"
-}
diff --git a/srcpkgs/python3-jupyter_core b/srcpkgs/python3-jupyter_core
deleted file mode 120000
index 9672d649470..00000000000
--- a/srcpkgs/python3-jupyter_core
+++ /dev/null
@@ -1 +0,0 @@
-python-jupyter_core
\ No newline at end of file
diff --git a/srcpkgs/python3-jupyter_core/template b/srcpkgs/python3-jupyter_core/template
new file mode 100644
index 00000000000..497087f56c2
--- /dev/null
+++ b/srcpkgs/python3-jupyter_core/template
@@ -0,0 +1,36 @@
+# Template file for 'python3-jupyter_core'
+pkgname=python3-jupyter_core
+version=4.4.0
+revision=4
+archs=noarch
+wrksrc="jupyter_core-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-traitlets"
+checkdepends="$depends python3-pytest python3-six python3-ipython_genutils
+ python3-ipython_ipykernel python3-decorator python3-nose"
+short_desc="Jupyter core package"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://jupyter.org"
+distfiles="${PYPI_SITE}/j/jupyter_core/jupyter_core-${version}.tar.gz"
+checksum=ba70754aa680300306c699790128f6fbd8c306ee5927976cbe48adacf240c0b7
+conflicts="python-jupyter_core<=4.4.0_3"
+
+do_check() {
+	# Those 2 test cases will be fixed in 4.6.3
+	PYTHONPATH=$(pwd)/build/lib py.test -k \
+		'not test_not_on_path and not test_path_priority'
+}
+
+post_install() {
+	vlicense COPYING.md LICENSE
+}
+
+python3-jupyter_package() {
+	build_style=meta
+	archs=noarch
+	depends="python3-jupyter_notebook python3-jupyter_console
+	 python3-jupyter_ipywidgets"
+	short_desc="Jupyter metapackage for Void Linux"
+}

From 40c79c079dcb46756c394e828fa58ff34a770a6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:52 +0700
Subject: [PATCH 20/38] python-traitlets: drop package

---
 srcpkgs/python-traitlets/template             | 31 -------------------
 srcpkgs/python3-traitlets                     |  1 -
 .../patches/python3.8-warning.patch           | 22 +++++++++++++
 srcpkgs/python3-traitlets/template            | 24 ++++++++++++++
 .../update                                    |  0
 5 files changed, 46 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-traitlets/template
 delete mode 120000 srcpkgs/python3-traitlets
 create mode 100644 srcpkgs/python3-traitlets/patches/python3.8-warning.patch
 create mode 100644 srcpkgs/python3-traitlets/template
 rename srcpkgs/{python-traitlets => python3-traitlets}/update (100%)

diff --git a/srcpkgs/python-traitlets/template b/srcpkgs/python-traitlets/template
deleted file mode 100644
index 797dd0268da..00000000000
--- a/srcpkgs/python-traitlets/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-traitlets'
-pkgname=python-traitlets
-version=4.3.3
-revision=2
-archs=noarch
-wrksrc="traitlets-${version}"
-build_style=python-module
-pycompile_module="traitlets"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-decorator python-ipython_genutils python-six python-enum34"
-short_desc="Configuration system for Python2 applications"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/ipython/traitlets"
-distfiles="${PYPI_SITE}/t/traitlets/traitlets-${version}.tar.gz"
-checksum=d023ee369ddd2763310e4c3eae1ff649689440d4ae59d7485eb4cfbbe3e359f7
-
-post_install() {
-	vlicense COPYING.md LICENSE
-}
-
-python3-traitlets_package() {
-	archs=noarch
-	depends="python3-decorator python3-ipython_genutils python3-six"
-	pycompile_module="traitlets"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense COPYING.md LICENSE
-	}
-}
diff --git a/srcpkgs/python3-traitlets b/srcpkgs/python3-traitlets
deleted file mode 120000
index 8c3427bfe9c..00000000000
--- a/srcpkgs/python3-traitlets
+++ /dev/null
@@ -1 +0,0 @@
-python-traitlets
\ No newline at end of file
diff --git a/srcpkgs/python3-traitlets/patches/python3.8-warning.patch b/srcpkgs/python3-traitlets/patches/python3.8-warning.patch
new file mode 100644
index 00000000000..02fdd037842
--- /dev/null
+++ b/srcpkgs/python3-traitlets/patches/python3.8-warning.patch
@@ -0,0 +1,22 @@
+diff --git traitlets/config/loader.py traitlets/config/loader.py
+index 803b362..ae7e6c9 100644
+--- traitlets/config/loader.py
++++ traitlets/config/loader.py
+@@ -792,7 +792,7 @@ class KVArgParseConfigLoader(ArgParseConfigLoader):
+                 nargs = '?'
+             else:
+                 nargs = None
+-            if len(key) is 1:
++            if len(key) == 1:
+                 paa('-'+key, '--'+key, type=text_type, dest=value, nargs=nargs)
+             else:
+                 paa('--'+key, type=text_type, dest=value, nargs=nargs)
+@@ -801,7 +801,7 @@ class KVArgParseConfigLoader(ArgParseConfigLoader):
+                 #
+                 self.alias_flags[self.aliases[key]] = value
+                 continue
+-            if len(key) is 1:
++            if len(key) == 1:
+                 paa('-'+key, '--'+key, action='append_const', dest='_flags', const=value)
+             else:
+                 paa('--'+key, action='append_const', dest='_flags', const=value)
diff --git a/srcpkgs/python3-traitlets/template b/srcpkgs/python3-traitlets/template
new file mode 100644
index 00000000000..92a11a42629
--- /dev/null
+++ b/srcpkgs/python3-traitlets/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-traitlets'
+pkgname=python3-traitlets
+version=4.3.3
+revision=3
+archs=noarch
+wrksrc="traitlets-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-decorator python3-ipython_genutils python3-six"
+checkdepends="$depends python3-pytest"
+short_desc="Configuration system for Python applications"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/ipython/traitlets"
+distfiles="${PYPI_SITE}/t/traitlets/traitlets-${version}.tar.gz"
+checksum=d023ee369ddd2763310e4c3eae1ff649689440d4ae59d7485eb4cfbbe3e359f7
+
+do_check() {
+	pytest
+}
+
+post_install() {
+	vlicense COPYING.md LICENSE
+}
diff --git a/srcpkgs/python-traitlets/update b/srcpkgs/python3-traitlets/update
similarity index 100%
rename from srcpkgs/python-traitlets/update
rename to srcpkgs/python3-traitlets/update

From b511245636d64df8ad57677c7a500f79b4443823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:53 +0700
Subject: [PATCH 21/38] python-ipython: drop package

---
 srcpkgs/python-ipython/template | 34 ---------------------------------
 srcpkgs/python-ipython/update   |  1 -
 2 files changed, 35 deletions(-)
 delete mode 100644 srcpkgs/python-ipython/template
 delete mode 100644 srcpkgs/python-ipython/update

diff --git a/srcpkgs/python-ipython/template b/srcpkgs/python-ipython/template
deleted file mode 100644
index 0d7e936c61c..00000000000
--- a/srcpkgs/python-ipython/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-ipython'
-pkgname=python-ipython
-version=5.8.0
-revision=2
-archs=noarch
-wrksrc="ipython-${version}"
-build_style=python2-module
-pycompile_module="IPython"
-hostmakedepends="python-setuptools"
-depends="python-pickleshare python-simplegeneric python-traitlets python-pexpect
- python-prompt_toolkit1 python-Pygments python-backports.shutil_get_terminal_size"
-short_desc="Enhanced interactive Python2 shell"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://ipython.org/"
-distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=4bac649857611baaaf76bc82c173aa542f7486446c335fe1a6c05d0d491c8906
-
-alternatives="
- ipython:ipython:/usr/bin/ipython2
- ipython:ipython.1:/usr/share/man/man1/ipython2.1"
-
-post_install() {
-	# use decorators of numpy
-	rm -f ${DESTDIR}/usr/lib/python*/site-packages/IPython/external/decorators/_decorators.py
-	# remove iptest
-	rm -f ${DESTDIR}/usr/bin/iptest*
-	# remove ipython for alternatives
-	rm -f ${DESTDIR}/usr/bin/ipython
-	# create versioned man pages
-	mv ${DESTDIR}/usr/share/man/man1/ipython{,2}.1
-
-	vlicense COPYING.rst LICENSE
-}
diff --git a/srcpkgs/python-ipython/update b/srcpkgs/python-ipython/update
deleted file mode 100644
index 8de67c0ec87..00000000000
--- a/srcpkgs/python-ipython/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b* *rc* 6.* 7.*"

From 768d6c1997f18d055e296747c17a522245f7fe8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Mar 2020 12:14:54 +0700
Subject: [PATCH 22/38] python3-ipython: drop alternatives

---
 srcpkgs/python3-ipython/template | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 03743187c5e..d7c28bc5a4f 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
 version=7.12.0
-revision=1
+revision=2
 archs=noarch
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -9,26 +9,24 @@ hostmakedepends="python3-setuptools"
 depends="python3-pickleshare python3-simplegeneric python3-traitlets
  python3-pexpect python3-prompt_toolkit2 python3-Pygments python3-jedi
  python3-backcall"
+checkdepends="$depends python3-pytest python3-nose python3-matplotlib
+ python3-requests python3-testpath python3-numpy python3-ipython_ipykernel
+ python3-jupyter_nbformat python3-Pygments"
 short_desc="Enhanced interactive Python3 shell"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
 checksum=d9459e7237e2e5858738ff9c3e26504b79899b58a6d49e574d352493d80684c6
+conflicts="python-ipython<=5.8.0_2"
 
-alternatives="
- ipython:ipython:/usr/bin/ipython3
- ipython:ipython.1:/usr/share/man/man1/ipython3.1"
+do_check() {
+	pytest
+}
 
 post_install() {
-	# use decorators of numpy
-	rm -f ${DESTDIR}/usr/lib/python*/site-packages/IPython/external/decorators/_decorators.py
 	# remove iptest
 	rm -f ${DESTDIR}/usr/bin/iptest*
-	# remove ipython for alternatives
-	rm -f ${DESTDIR}/usr/bin/ipython
-	# create versioned man pages
-	mv ${DESTDIR}/usr/share/man/man1/ipython{,3}.1
 
 	vlicense COPYING.rst LICENSE
 }

From 1dffbf69b21a4f75407f2aa81a972095203cd96d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:55 +0700
Subject: [PATCH 23/38] python-ipython_genutils: drop package

---
 srcpkgs/python-ipython_genutils/template  | 31 -----------------------
 srcpkgs/python3-ipython_genutils          |  1 -
 srcpkgs/python3-ipython_genutils/template | 19 ++++++++++++++
 3 files changed, 19 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-ipython_genutils/template
 delete mode 120000 srcpkgs/python3-ipython_genutils
 create mode 100644 srcpkgs/python3-ipython_genutils/template

diff --git a/srcpkgs/python-ipython_genutils/template b/srcpkgs/python-ipython_genutils/template
deleted file mode 100644
index d46a3b0b716..00000000000
--- a/srcpkgs/python-ipython_genutils/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-ipython_genutils'
-pkgname=python-ipython_genutils
-version=0.2.0
-revision=3
-archs=noarch
-wrksrc="ipython_genutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-pycompile_module="ipython_genutils"
-short_desc="Vestigial utilities from IPython (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/ipython/ipython_genutils"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/i/ipython_genutils/ipython_genutils-${version}.tar.gz"
-checksum=eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8
-
-post_install() {
-	vlicense COPYING.md LICENSE
-}
-
-python3-ipython_genutils_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="ipython_genutils"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense COPYING.md LICENSE
-	}
-}
diff --git a/srcpkgs/python3-ipython_genutils b/srcpkgs/python3-ipython_genutils
deleted file mode 120000
index 5e64c01d190..00000000000
--- a/srcpkgs/python3-ipython_genutils
+++ /dev/null
@@ -1 +0,0 @@
-python-ipython_genutils
\ No newline at end of file
diff --git a/srcpkgs/python3-ipython_genutils/template b/srcpkgs/python3-ipython_genutils/template
new file mode 100644
index 00000000000..b2754424178
--- /dev/null
+++ b/srcpkgs/python3-ipython_genutils/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-ipython_genutils'
+pkgname=python3-ipython_genutils
+version=0.2.0
+revision=4
+archs=noarch
+wrksrc="ipython_genutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Vestigial utilities from IPython"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/ipython/ipython_genutils"
+distfiles="${PYPI_SITE}/i/ipython_genutils/ipython_genutils-${version}.tar.gz"
+checksum=eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8
+
+post_install() {
+	vlicense COPYING.md LICENSE
+}

From 896ae1eb229a84fb9e9bca7e0ea6a39798d651f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:56 +0700
Subject: [PATCH 24/38] python3-ipython: update to 7.13.0.

---
 srcpkgs/python3-ipython/template | 6 +++---
 srcpkgs/python3-ipython/update   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index d7c28bc5a4f..1948a3a6a97 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.12.0
-revision=2
+version=7.13.0
+revision=1
 archs=noarch
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -17,7 +17,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=d9459e7237e2e5858738ff9c3e26504b79899b58a6d49e574d352493d80684c6
+checksum=ca478e52ae1f88da0102360e57e528b92f3ae4316aabac80a2cd7f7ab2efb48a
 conflicts="python-ipython<=5.8.0_2"
 
 do_check() {
diff --git a/srcpkgs/python3-ipython/update b/srcpkgs/python3-ipython/update
index 9802cfc2cb8..25ef51d109a 100644
--- a/srcpkgs/python3-ipython/update
+++ b/srcpkgs/python3-ipython/update
@@ -1 +1 @@
-ignore="*b* *rc*"
+ignore="*a* *b* *rc*"

From 911c95b367db1830d5fc5e0db12db7e7c99d0342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Mar 2020 12:14:58 +0700
Subject: [PATCH 25/38] python3-jupyter_core: update to 4.6.3.

---
 srcpkgs/python3-jupyter_core/template | 10 ++++------
 srcpkgs/python3-jupyter_core/update   |  1 +
 2 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/python3-jupyter_core/update

diff --git a/srcpkgs/python3-jupyter_core/template b/srcpkgs/python3-jupyter_core/template
index 497087f56c2..ea75fa510a7 100644
--- a/srcpkgs/python3-jupyter_core/template
+++ b/srcpkgs/python3-jupyter_core/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_core'
 pkgname=python3-jupyter_core
-version=4.4.0
-revision=4
+version=4.6.3
+revision=1
 archs=noarch
 wrksrc="jupyter_core-${version}"
 build_style=python3-module
@@ -14,13 +14,11 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter_core/jupyter_core-${version}.tar.gz"
-checksum=ba70754aa680300306c699790128f6fbd8c306ee5927976cbe48adacf240c0b7
+checksum=394fd5dd787e7c8861741880bdf8a00ce39f95de5d18e579c74b882522219e7e
 conflicts="python-jupyter_core<=4.4.0_3"
 
 do_check() {
-	# Those 2 test cases will be fixed in 4.6.3
-	PYTHONPATH=$(pwd)/build/lib py.test -k \
-		'not test_not_on_path and not test_path_priority'
+	PYTHONPATH=$(pwd)/build/lib py.test
 }
 
 post_install() {
diff --git a/srcpkgs/python3-jupyter_core/update b/srcpkgs/python3-jupyter_core/update
new file mode 100644
index 00000000000..25ef51d109a
--- /dev/null
+++ b/srcpkgs/python3-jupyter_core/update
@@ -0,0 +1 @@
+ignore="*a* *b* *rc*"

From 57086423949e9b61080ae6177f556b1b8a57be0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Mar 2020 12:14:59 +0700
Subject: [PATCH 26/38] python3-jupyter_client: update to 6.1.0.

---
 srcpkgs/python3-jupyter_client/template | 20 +++++++++++++-------
 srcpkgs/python3-jupyter_client/update   |  1 +
 2 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/python3-jupyter_client/update

diff --git a/srcpkgs/python3-jupyter_client/template b/srcpkgs/python3-jupyter_client/template
index ed8ea565883..6cba34ab0b8 100644
--- a/srcpkgs/python3-jupyter_client/template
+++ b/srcpkgs/python3-jupyter_client/template
@@ -1,24 +1,30 @@
 # Template file for 'python3-jupyter_client'
 pkgname=python3-jupyter_client
-version=5.2.4
-revision=3
+version=6.1.0
+revision=1
 archs=noarch
 wrksrc="jupyter_client-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-traitlets python3-jupyter_core
- python3-pyzmq python3-dateutil python3-tornado python3-simplejson"
-checkdepends="$depends python3-pytest python3-ipython_ipykernel
- python3-msgpack python3-Sphinx"
+depends="python3-setuptools python3-traitlets python3-jupyter_core>=4.6.0
+ python3-pyzmq>=13 python3-dateutil>=2.1 python3-tornado>=3.5
+ python3-simplejson"
+checkdepends="python3-pytest python3-ipython_ipykernel
+ python3-setuptools python3-traitlets python3-jupyter_core
+ python3-pyzmq python3-dateutil python3-tornado
+ python3-simplejson python3-msgpack python3-Sphinx"
 short_desc="Jupyter protocol client APIs"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/jupyter/jupyter_client"
 distfiles="${PYPI_SITE}/j/jupyter_client/jupyter_client-${version}.tar.gz"
-checksum=b5f9cb06105c1d2d30719db5ffb3ea67da60919fb68deaefa583deccd8813551
+checksum=61429e7d2c4b385135d31054944dd3f23a1c6affb0ca3d4328d42fc9ba82b7f5
 conflicts="python-jupyter_client<=5.2.4_2"
 
 do_check() {
+	# test_install_kernel_spec_prefix is problematic
+	# The test is fine when run in-tree,
+	# but it's failing in ./xbps-src check
 	pytest -k 'not test_install_kernel_spec_prefix'
 }
 
diff --git a/srcpkgs/python3-jupyter_client/update b/srcpkgs/python3-jupyter_client/update
new file mode 100644
index 00000000000..25ef51d109a
--- /dev/null
+++ b/srcpkgs/python3-jupyter_client/update
@@ -0,0 +1 @@
+ignore="*a* *b* *rc*"

From 939457087ea7a82e13918e794717ca1eaa120c43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Mar 2020 12:15:00 +0700
Subject: [PATCH 27/38] python3-jupyter_console: update to 6.1.0.

---
 srcpkgs/python3-jupyter_console/template | 11 ++++++++---
 srcpkgs/python3-jupyter_console/update   |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-jupyter_console/template b/srcpkgs/python3-jupyter_console/template
index cc06132ec85..85cdf4df567 100644
--- a/srcpkgs/python3-jupyter_console/template
+++ b/srcpkgs/python3-jupyter_console/template
@@ -1,22 +1,27 @@
 # Template file for 'python3-jupyter_console'
 pkgname=python3-jupyter_console
-version=6.0.0
-revision=3
+version=6.1.0
+revision=1
 archs=noarch
 wrksrc="jupyter_console-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-ipython python3-ipython_ipykernel python3-jupyter_client
  python3-prompt_toolkit2 python3-Pygments"
+checkdepends="$depends python3-pytest"
 short_desc="Jupyter terminal console (Python3)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/jupyter/jupyter_console"
 distfiles="${PYPI_SITE}/j/jupyter_console/jupyter_console-${version}.tar.gz"
-checksum=308ce876354924fb6c540b41d5d6d08acfc946984bf0c97777c1ddcb42e0b2f5
+checksum=6f6ead433b0534909df789ea64f0a14cdf9b6b2360757756f08182be4b9e431b
 # alternatives will be a conflict
 conflicts="python-jupyter_console<=6.0.0_2"
 
+do_check() {
+	: pytest reports Stdin is not a terminal.
+}
+
 post_install() {
 	vlicense COPYING.md LICENSE
 }
diff --git a/srcpkgs/python3-jupyter_console/update b/srcpkgs/python3-jupyter_console/update
index e9b0a0a5ea4..25ef51d109a 100644
--- a/srcpkgs/python3-jupyter_console/update
+++ b/srcpkgs/python3-jupyter_console/update
@@ -1 +1 @@
-ignore="*b*"
+ignore="*a* *b* *rc*"

From 70176621bfe2123977a211e04db104527d7c32da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Mar 2020 12:15:01 +0700
Subject: [PATCH 28/38] python3-jupyter_nbconvert: update to 5.6.1.

---
 .../patches/test-timeout.patch                | 16 +++++++++++
 srcpkgs/python3-jupyter_nbconvert/template    | 27 +++++++++++++------
 srcpkgs/python3-jupyter_nbconvert/update      |  1 +
 3 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/python3-jupyter_nbconvert/patches/test-timeout.patch
 create mode 100644 srcpkgs/python3-jupyter_nbconvert/update

diff --git a/srcpkgs/python3-jupyter_nbconvert/patches/test-timeout.patch b/srcpkgs/python3-jupyter_nbconvert/patches/test-timeout.patch
new file mode 100644
index 00000000000..172692d3438
--- /dev/null
+++ b/srcpkgs/python3-jupyter_nbconvert/patches/test-timeout.patch
@@ -0,0 +1,16 @@
+This test is used to test other errors instead of TimeoutError,
+according to the attached comment, increase timeout should be fine.
+I run into the timeout 1 out of 10 run.
+diff --git nbconvert/preprocessors/tests/test_execute.py nbconvert/preprocessors/tests/test_execute.py
+index 243a725..a55116e 100644
+--- nbconvert/preprocessors/tests/test_execute.py
++++ nbconvert/preprocessors/tests/test_execute.py
+@@ -317,7 +317,7 @@ def test_many_parallel_notebooks(capfd):
+     with ProcessPool(max_workers=4) as pool:
+         futures = [
+             # Travis needs a lot more time even though 10s is enough on most dev machines
+-            pool.schedule(run_notebook, args=(input_file, opts, res), timeout=30)
++            pool.schedule(run_notebook, args=(input_file, opts, res), timeout=60)
+             for i in range(0, 8)
+         ]
+         for index, future in enumerate(futures):
diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template
index e10a2048b2a..dba1d5a980e 100644
--- a/srcpkgs/python3-jupyter_nbconvert/template
+++ b/srcpkgs/python3-jupyter_nbconvert/template
@@ -1,26 +1,37 @@
 # Template file for 'python3-jupyter_nbconvert'
 pkgname=python3-jupyter_nbconvert
-version=5.4.1
-revision=3
+version=5.6.1
+revision=1
 archs=noarch
 wrksrc="nbconvert-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-mistune python3-Jinja2 python3-Pygments python3-traitlets
- python3-jupyter_core python3-jupyter_nbformat python3-entrypoints
- python3-testpath python3-bleach python3-pandocfilters python3-defusedxml"
-checkdepends="$depends python3-pytest python3-ipython_ipykernel
+depends="python3-mistune python3-Jinja2>=2.4 python3-Pygments
+ python3-traitlets>=4.2 python3-jupyter_core python3-jupyter_nbformat>=4.4
+ python3-entrypoints>=0.2.2 python3-testpath python3-bleach
+ python3-pandocfilters>=1.4.1 python3-defusedxml"
+checkdepends="python3-pytest python3-ipython_ipykernel
+ python3-mistune python3-Jinja2 python3-Pygments
+ python3-traitlets python3-jupyter_core python3-jupyter_nbformat
+ python3-entrypoints python3-testpath python3-bleach
+ python3-pandocfilters python3-defusedxml
  python3-jupyter_ipywidgets python3-Pebble pandoc inkscape"
 short_desc="Converting Jupyter notebooks"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/jupyter/nbconvert"
 distfiles="${PYPI_SITE}/n/nbconvert/nbconvert-${version}.tar.gz"
-checksum=302554a2e219bc0fc84f3edd3e79953f3767b46ab67626fdec16e38ba3f7efe4
+checksum=21fb48e700b43e82ba0e3142421a659d7739b65568cc832a13976a77be16b523
 conflicts="python-jupyter_nbconvert<=5.4.1_2"
 
+post_patch() {
+	# only 1 test cases in test_nbconvertapp is failing,
+	# but disable it will make everything run into trouble
+	rm -f nbconvert/tests/test_nbconvertapp.py
+}
+
 do_check() {
-	: this version fail badly
+	pytest -k 'not test_run_all_notebooks[SVG.ipynb-opts9]'
 }
 
 post_install() {
diff --git a/srcpkgs/python3-jupyter_nbconvert/update b/srcpkgs/python3-jupyter_nbconvert/update
new file mode 100644
index 00000000000..25ef51d109a
--- /dev/null
+++ b/srcpkgs/python3-jupyter_nbconvert/update
@@ -0,0 +1 @@
+ignore="*a* *b* *rc*"

From d7f38122aff1c6ad3a82b7320b0e0485dd78537f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Mar 2020 12:15:02 +0700
Subject: [PATCH 29/38] python3-jupyter_nbformat: update to 5.0.4.

---
 srcpkgs/python3-jupyter_nbformat/template | 14 ++++++++------
 srcpkgs/python3-jupyter_nbformat/update   |  1 +
 2 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/python3-jupyter_nbformat/update

diff --git a/srcpkgs/python3-jupyter_nbformat/template b/srcpkgs/python3-jupyter_nbformat/template
index 6e9966c3793..a46c5697212 100644
--- a/srcpkgs/python3-jupyter_nbformat/template
+++ b/srcpkgs/python3-jupyter_nbformat/template
@@ -1,20 +1,22 @@
 # Template file for 'python3-jupyter_nbformat'
 pkgname=python3-jupyter_nbformat
-version=4.4.0
-revision=4
+version=5.0.4
+revision=1
 archs=noarch
 wrksrc="nbformat-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jsonschema python3-ipython_genutils python3-traitlets
- python3-jupyter_core"
-checkdepends="$depends python3-pytest python3-testpath"
+depends="python3-jsonschema>=2.6.0 python3-traitlets>=4.1
+ python3-ipython_genutils python3-jupyter_core"
+checkdepends="python3-pytest python3-testpath
+ python3-jsonschema python3-traitlets
+ python3-ipython_genutils python3-jupyter_core"
 short_desc="Jupyter notebook format"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/jupyter/nbformat"
 distfiles="${PYPI_SITE}/n/nbformat/nbformat-${version}.tar.gz"
-checksum=f7494ef0df60766b7cabe0a3651556345a963b74dbc16bc7c18479041170d402
+checksum=562de41fc7f4f481b79ab5d683279bf3a168858268d4387b489b7b02be0b324a
 conflicts="python-jupyter_nbformat<=4.4.0_3"
 
 do_check() {
diff --git a/srcpkgs/python3-jupyter_nbformat/update b/srcpkgs/python3-jupyter_nbformat/update
new file mode 100644
index 00000000000..25ef51d109a
--- /dev/null
+++ b/srcpkgs/python3-jupyter_nbformat/update
@@ -0,0 +1 @@
+ignore="*a* *b* *rc*"

From 207b3768cf79ee20a5ef99c60d53381b65a04b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Mar 2020 12:15:03 +0700
Subject: [PATCH 30/38] python3-jupyter_qtconsole: update to 4.7.1.

---
 srcpkgs/python3-jupyter_qtconsole/template | 13 +++++++------
 srcpkgs/python3-jupyter_qtconsole/update   |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/python3-jupyter_qtconsole/update

diff --git a/srcpkgs/python3-jupyter_qtconsole/template b/srcpkgs/python3-jupyter_qtconsole/template
index 44e8639e502..0c062662763 100644
--- a/srcpkgs/python3-jupyter_qtconsole/template
+++ b/srcpkgs/python3-jupyter_qtconsole/template
@@ -1,25 +1,26 @@
 # Template file for 'python3-jupyter_qtconsole'
 pkgname=python3-jupyter_qtconsole
-version=4.4.3
-revision=3
+version=4.7.1
+revision=1
 archs=noarch
 wrksrc="qtconsole-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-traitlets python3-jupyter_core python3-jupyter_client
  python3-Pygments python3-ipython_ipykernel python3-ipython_genutils
- python3-PyQt5-svg"
-checkdepends="$depends python3-pytest"
+ python3-PyQt5-svg python3-QtPy"
+checkdepends="$depends python3-pytest-qt python3-flaky"
 short_desc="Jupyter Qt console"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/jupyter/qtconsole"
 distfiles="${PYPI_SITE}/q/qtconsole/qtconsole-${version}.tar.gz"
-checksum=bc1ba15f50c29ed50f1268ad823bb6543be263c18dd093b80495e9df63b003ac
+checksum=d51c1c51c81fbd1fac62b2d4bdc8b54fb6b7cbe6cbf70c3baeea11516525c956
 conflicts="python-jupyter_qtconsole<=4.4.3_2"
 
 do_check() {
-	QT_QPA_PLATFORM=offscreen pytest
+	# flaky test
+	QT_QPA_PLATFORM=offscreen pytest -k 'not test_frontend_to_kernel'
 }
 
 post_install() {
diff --git a/srcpkgs/python3-jupyter_qtconsole/update b/srcpkgs/python3-jupyter_qtconsole/update
new file mode 100644
index 00000000000..25ef51d109a
--- /dev/null
+++ b/srcpkgs/python3-jupyter_qtconsole/update
@@ -0,0 +1 @@
+ignore="*a* *b* *rc*"

From 628b70b50e9ab2813435e16f4532d1ba6863253f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:15:05 +0700
Subject: [PATCH 31/38] python3-plotly: update to 4.5.4.

---
 srcpkgs/python3-plotly/patches/py3.8.patch | 99 ----------------------
 srcpkgs/python3-plotly/template            | 17 ++--
 2 files changed, 8 insertions(+), 108 deletions(-)
 delete mode 100644 srcpkgs/python3-plotly/patches/py3.8.patch

diff --git a/srcpkgs/python3-plotly/patches/py3.8.patch b/srcpkgs/python3-plotly/patches/py3.8.patch
deleted file mode 100644
index e8acfb4bd00..00000000000
--- a/srcpkgs/python3-plotly/patches/py3.8.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git plotly/figure_factory/_candlestick.py plotly/figure_factory/_candlestick.py
-index 925b4c1..c0847b3 100644
---- plotly/figure_factory/_candlestick.py
-+++ plotly/figure_factory/_candlestick.py
-@@ -211,11 +211,11 @@ def create_candlestick(open, high, low, close, dates=None, direction='both',
-         utils.validate_equal_length(open, high, low, close)
-     validate_ohlc(open, high, low, close, direction, **kwargs)
- 
--    if direction is 'increasing':
-+    if direction == 'increasing':
-         candle_incr_data = make_increasing_candle(open, high, low, close,
-                                                   dates, **kwargs)
-         data = candle_incr_data
--    elif direction is 'decreasing':
-+    elif direction == 'decreasing':
-         candle_decr_data = make_decreasing_candle(open, high, low, close,
-                                                   dates, **kwargs)
-         data = candle_decr_data
-diff --git plotly/figure_factory/_facet_grid.py plotly/figure_factory/_facet_grid.py
-index 61af2b1..d0eb2bc 100644
---- plotly/figure_factory/_facet_grid.py
-+++ plotly/figure_factory/_facet_grid.py
-@@ -751,7 +751,7 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
-         x='wt',
-         y='mpg',
-         facet_col='cyl',
--        facet_col_labels={4: "$\\alpha$", 6: '$\\beta$', 8: '$\sqrt[y]{x}$'},
-+        facet_col_labels={4: "$\\alpha$", 6: '$\\beta$', 8: '$\\sqrt[y]{x}$'},
-     )
- 
-     py.iplot(fig, filename='facet_grid_mtcars_custom_labels')
-diff --git plotly/figure_factory/_ohlc.py plotly/figure_factory/_ohlc.py
-index b5e84cd..0c41430 100644
---- plotly/figure_factory/_ohlc.py
-+++ plotly/figure_factory/_ohlc.py
-@@ -264,11 +264,11 @@ def create_ohlc(open, high, low, close, dates=None, direction='both',
-         utils.validate_equal_length(open, high, low, close)
-     validate_ohlc(open, high, low, close, direction, **kwargs)
- 
--    if direction is 'increasing':
-+    if direction == 'increasing':
-         ohlc_incr = make_increasing_ohlc(open, high, low, close, dates,
-                                          **kwargs)
-         data = [ohlc_incr]
--    elif direction is 'decreasing':
-+    elif direction == 'decreasing':
-         ohlc_decr = make_decreasing_ohlc(open, high, low, close, dates,
-                                          **kwargs)
-         data = [ohlc_decr]
-diff --git plotly/matplotlylib/renderer.py plotly/matplotlylib/renderer.py
-index 548ae74..9eb3fd2 100644
---- plotly/matplotlylib/renderer.py
-+++ plotly/matplotlylib/renderer.py
-@@ -428,7 +428,7 @@ class PlotlyRenderer(Renderer):
- 
-         """
-         self.msg += "    Attempting to draw a path collection\n"
--        if props['offset_coordinates'] is 'data':
-+        if props['offset_coordinates'] == 'data':
-             markerstyle = mpltools.get_markerstyle_from_collection(props)
-             scatter_props = {
-                 'coordinates': 'data',
-@@ -536,7 +536,7 @@ class PlotlyRenderer(Renderer):
-             self.draw_title(**props)
-         else:  # just a regular text annotation...
-             self.msg += "      Text object is a normal annotation\n"
--            if props['coordinates'] is not 'data':
-+            if props['coordinates'] != 'data':
-                 self.msg += "        Text object isn't linked to 'data' " \
-                             "coordinates\n"
-                 x_px, y_px = props['mplobj'].get_transform().transform(
-diff --git plotly/tools.py plotly/tools.py
-index ba6aae7..db8eaa2 100644
---- plotly/tools.py
-+++ plotly/tools.py
-@@ -319,7 +319,7 @@ def get_embed(file_owner_or_url, file_id=None, width="100%", height=525):
-         raise exceptions.PlotlyError(
-             "The 'file_id' argument must be a non-negative number."
-         )
--    if share_key is '':
-+    if share_key == '':
-         s = ("<iframe id=\"igraph\" scrolling=\"no\" style=\"border:none;\" "
-              "seamless=\"seamless\" "
-              "src=\"{plotly_rest_url}/"
-diff --git plotly/utils.py plotly/utils.py
-index 7d62301..f600402 100644
---- plotly/utils.py
-+++ plotly/utils.py
-@@ -84,8 +84,8 @@ def ensure_dir_exists(directory):
- def iso_to_plotly_time_string(iso_string):
-     """Remove timezone info and replace 'T' delimeter with ' ' (ws)."""
-     # make sure we don't send timezone info to plotly
--    if (iso_string.split('-')[:3] is '00:00') or\
--            (iso_string.split('+')[0] is '00:00'):
-+    if (iso_string.split('-')[:3] == '00:00') or\
-+            (iso_string.split('+')[0] == '00:00'):
-         raise Exception("Plotly won't accept timestrings with timezone info.\n"
-                         "All timestrings are assumed to be in UTC.")
- 
diff --git a/srcpkgs/python3-plotly/template b/srcpkgs/python3-plotly/template
index 78ed7967db9..e49c2d2e1bc 100644
--- a/srcpkgs/python3-plotly/template
+++ b/srcpkgs/python3-plotly/template
@@ -1,9 +1,9 @@
 # Template file for 'python3-plotly'
 pkgname=python3-plotly
-version=2.2.0
-revision=3
+version=4.5.4
+revision=1
 archs=noarch
-wrksrc="plotly.py-${version}"
+wrksrc="plotly-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-six python3-requests python3-pytz
@@ -12,16 +12,15 @@ short_desc="Python plotting library for collaborative, interactive graphs"
 maintainer="pulux <pulux@pf4sh.de>"
 license="MIT"
 homepage="https://plot.ly/python/"
-#odistfiles="${PYPI_SITE}/p/plotly/plotly-${version}.tar.gz"
-#checksum=aee7044a5c70989940d24bbbb12469b2ab2dbf41b9dff652052327fe1168b3cc
-#pypi has no LICENSE.txt
-distfiles="https://github.com/plotly/plotly.py/archive/v${version}.tar.gz"
-checksum=dad2a49fe355dddb6ae159e96c10ac22413a33cbac513b4dbf3791e63ec33c1f
+distfiles="${PYPI_SITE}/p/plotly/plotly-${version}.tar.gz"
+checksum=e6eab2b6010921f5fb998860125b90748e581de66ebc6107b686829417d98fc4
+conf_files="etc/jupyter/nbconfig/notebook.d/plotlywidget.json"
 
 do_check() {
-	: alot of failures
+	: no test is shipped
 }
 
 post_install() {
+	mv ${DESTDIR}/usr/etc ${DESTDIR}
 	vlicense LICENSE.txt
 }

From 6a42fac027220dd48ed01ff890e04463794fa106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:15:06 +0700
Subject: [PATCH 32/38] python-msgpack: correct homepage

---
 srcpkgs/python-msgpack/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python-msgpack/template b/srcpkgs/python-msgpack/template
index 567b36a4c61..a792957533b 100644
--- a/srcpkgs/python-msgpack/template
+++ b/srcpkgs/python-msgpack/template
@@ -1,21 +1,22 @@
 # Template file for 'python-msgpack'
 pkgname=python-msgpack
 version=1.0.0
-revision=1
+revision=2
 wrksrc="msgpack-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
 makedepends="python-devel python3-devel"
-checkdepends="python3-pytest"
+checkdepends="python-pytest python3-pytest"
 short_desc="Python module for Msgpack serializer (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
-homepage="https://github.com/msgpack/msgpack-python"
+homepage="https://msgpack.org/"
 distfiles="${PYPI_SITE}/m/msgpack/msgpack-${version}.tar.gz"
 checksum=9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0
 
 do_check() {
-	python3 -m pytest
+	PYTHONPATH=$(pwd)/build-$py2_ver/lib python2 -m pytest
+	PYTHONPATH=$(pwd)/build-$py3_ver/lib python3 -m pytest
 }
 
 python3-msgpack_package() {

From fe79752b7aa26a3355bf7bb851b573c431e17e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Mar 2020 12:15:07 +0700
Subject: [PATCH 33/38] python3-jupyter_notebook: update to 6.0.3.

---
 srcpkgs/python3-jupyter_notebook/template | 8 ++++----
 srcpkgs/python3-jupyter_notebook/update   | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/python3-jupyter_notebook/update

diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template
index d35ec7da3c3..cc1727d2ee0 100644
--- a/srcpkgs/python3-jupyter_notebook/template
+++ b/srcpkgs/python3-jupyter_notebook/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_notebook'
 pkgname=python3-jupyter_notebook
-version=5.7.0
-revision=3
+version=6.0.3
+revision=1
 archs=noarch
 wrksrc="notebook-${version}"
 build_style=python3-module
@@ -17,11 +17,11 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org/"
 distfiles="${PYPI_SITE}/n/notebook/notebook-${version}.tar.gz"
-checksum=b85e4de3d54cf4f14fe1d0515a980ccb49ddd4cdd21250cc0d4fb6374d50b1a7
+checksum=47a9092975c9e7965ada00b9a20f0cf637d001db60d241d479f53c0be117ad48
 conflicts="python-jupyter_notebook<=5.7.0_2"
 
 post_install() {
-	vlicense COPYING.md LICENSE
+	vlicense LICENSE
 	# use system mathjax
 	rm -rf ${DESTDIR}/${py3_sitelib}/notebook/static/components/MathJax
 	ln -sf /usr/share/mathjax ${DESTDIR}/${py3_sitelib}/notebook/static/components/MathJax
diff --git a/srcpkgs/python3-jupyter_notebook/update b/srcpkgs/python3-jupyter_notebook/update
new file mode 100644
index 00000000000..1bb284fed49
--- /dev/null
+++ b/srcpkgs/python3-jupyter_notebook/update
@@ -0,0 +1,2 @@
+pkgname=notebook
+ignore="*a* *b* *rc*"

From 8ac8467d8c880130b0c70f103326f9dd9c90d421 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:15:08 +0700
Subject: [PATCH 34/38] python3-jupyter_widgetsnbextension: update to 3.5.1.

---
 srcpkgs/python3-jupyter_widgetsnbextension/template | 6 +++---
 srcpkgs/python3-jupyter_widgetsnbextension/update   | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/python3-jupyter_widgetsnbextension/update

diff --git a/srcpkgs/python3-jupyter_widgetsnbextension/template b/srcpkgs/python3-jupyter_widgetsnbextension/template
index 40a5f33daae..e1fe046894c 100644
--- a/srcpkgs/python3-jupyter_widgetsnbextension/template
+++ b/srcpkgs/python3-jupyter_widgetsnbextension/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_widgetsnbextension'
 pkgname=python3-jupyter_widgetsnbextension
-version=3.4.2
-revision=3
+version=3.5.1
+revision=1
 archs=noarch
 wrksrc="widgetsnbextension-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://pypi.org/project/widgetsnbextension/"
 distfiles="${PYPI_SITE}/w/widgetsnbextension/widgetsnbextension-${version}.tar.gz"
-checksum=fa618be8435447a017fd1bf2c7ae922d0428056cfc7449f7a8641edf76b48265
+checksum=079f87d87270bce047512400efd70238820751a11d2d8cb137a5a5bdbaf255c7
 replaces="python-jupyter_widgetsnbextension-data>=0"
 conf_files="/etc/jupyter/nbconfig/notebook.d/widgetsnbextension.json"
 
diff --git a/srcpkgs/python3-jupyter_widgetsnbextension/update b/srcpkgs/python3-jupyter_widgetsnbextension/update
new file mode 100644
index 00000000000..d6944b34c12
--- /dev/null
+++ b/srcpkgs/python3-jupyter_widgetsnbextension/update
@@ -0,0 +1,2 @@
+pkgname=widgetsnbextension
+ignore="*a* *b* *rc*"

From 5a20bc949b6a860cb37f008f54698f3140adf593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Mar 2020 12:15:09 +0700
Subject: [PATCH 35/38] python3-ipython_ipykernel: update to 5.2.0.

---
 srcpkgs/python3-ipython_ipykernel/template | 12 ++++++------
 srcpkgs/python3-ipython_ipykernel/update   |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/python3-ipython_ipykernel/update

diff --git a/srcpkgs/python3-ipython_ipykernel/template b/srcpkgs/python3-ipython_ipykernel/template
index a7d266b8b32..c3c0232c14a 100644
--- a/srcpkgs/python3-ipython_ipykernel/template
+++ b/srcpkgs/python3-ipython_ipykernel/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ipython_ipykernel'
 pkgname=python3-ipython_ipykernel
-version=4.10.0
-revision=3
+version=5.2.0
+revision=1
 archs=noarch
 wrksrc="ipykernel-${version}"
 build_style=python3-module
@@ -14,14 +14,14 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/ipython/ipykernel"
 distfiles="${PYPI_SITE}/i/ipykernel/ipykernel-${version}.tar.gz"
-checksum=699103c8e64886e3ec7053f2a6aa83bb90426063526f63a818732ff385202bad
+checksum=37c65d2e2da3326e5cf114405df6d47d997b8a3eba99e2cc4b75833bf71a5e18
 
 do_check() {
-	: requires IPython/external/decorators/_decorators of python3-ipython
+	# Those two tests are problematic in python 3.8,
+	# Old versions of ipykernel are more problematic
+	pytest -k 'not ipykernel/inprocess'
 }
 
 post_install() {
-	vsed -i -e "s/python/&3/" \
-		${DESTDIR}/usr/share/jupyter/kernels/python3/kernel.json
 	vlicense COPYING.md LICENSE
 }
diff --git a/srcpkgs/python3-ipython_ipykernel/update b/srcpkgs/python3-ipython_ipykernel/update
new file mode 100644
index 00000000000..7290dc1b56f
--- /dev/null
+++ b/srcpkgs/python3-ipython_ipykernel/update
@@ -0,0 +1,2 @@
+pkgname=ipykernel
+ignore="*a* *b* *rc*"

From 8648f0820e37c1d6fe7acb2542b69bedce98323a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:15:10 +0700
Subject: [PATCH 36/38] python3-jupyter_ipywidgets: update to 7.5.1.

---
 srcpkgs/python3-jupyter_ipywidgets/template | 14 ++++++++++----
 srcpkgs/python3-jupyter_ipywidgets/update   |  2 ++
 2 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/python3-jupyter_ipywidgets/update

diff --git a/srcpkgs/python3-jupyter_ipywidgets/template b/srcpkgs/python3-jupyter_ipywidgets/template
index 4d81b7844c4..7e64279aeec 100644
--- a/srcpkgs/python3-jupyter_ipywidgets/template
+++ b/srcpkgs/python3-jupyter_ipywidgets/template
@@ -1,20 +1,26 @@
 # Template file for 'python3-jupyter_ipywidgets'
 pkgname=python3-jupyter_ipywidgets
-version=7.4.2
-revision=3
+version=7.5.1
+revision=1
 archs=noarch
-_widgetsnbextver=3.4.0
+_widgetsnbextver=3.5.0
 wrksrc="ipywidgets-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-jupyter_widgetsnbextension>=${_widgetsnbextver}
  python3-ipython_ipykernel python3-traitlets"
+checkdepends="python3-pytest python3-jupyter_widgetsnbextension
+ python3-ipython_ipykernel python3-traitlets"
 short_desc="IPython widgets for the Jupyter notebook"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/jupyter-widgets/ipywidgets"
 distfiles="${PYPI_SITE}/i/ipywidgets/ipywidgets-${version}.tar.gz"
-checksum=a3e224f430163f767047ab9a042fc55adbcab0c24bbe6cf9f306c4f89fdf0ba3
+checksum=e945f6e02854a74994c596d9db83444a1850c01648f1574adf144fbbabe05c97
+
+do_check() {
+	pytest
+}
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-jupyter_ipywidgets/update b/srcpkgs/python3-jupyter_ipywidgets/update
new file mode 100644
index 00000000000..44da8f2e3c5
--- /dev/null
+++ b/srcpkgs/python3-jupyter_ipywidgets/update
@@ -0,0 +1,2 @@
+pkgname=ipywidgets
+ignore="*a* *b* *rc*"

From 9ae7ae0061763c3fc31a4a1f6c57fac4c4ee26e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:15:12 +0700
Subject: [PATCH 37/38] python-sphinx_rtd_theme: drop package

---
 srcpkgs/python-sphinx_rtd_theme/template      | 31 -------------------
 srcpkgs/python3-sphinx_rtd_theme              |  1 -
 srcpkgs/python3-sphinx_rtd_theme/template     | 20 ++++++++++++
 .../update                                    |  0
 4 files changed, 20 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-sphinx_rtd_theme/template
 delete mode 120000 srcpkgs/python3-sphinx_rtd_theme
 create mode 100644 srcpkgs/python3-sphinx_rtd_theme/template
 rename srcpkgs/{python-sphinx_rtd_theme => python3-sphinx_rtd_theme}/update (100%)

diff --git a/srcpkgs/python-sphinx_rtd_theme/template b/srcpkgs/python-sphinx_rtd_theme/template
deleted file mode 100644
index ebd4f13da8f..00000000000
--- a/srcpkgs/python-sphinx_rtd_theme/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-sphinx_rtd_theme'
-pkgname=python-sphinx_rtd_theme
-version=0.4.3
-revision=2
-archs=noarch
-wrksrc="sphinx_rtd_theme-${version}"
-build_style=python-module
-pycompile_module="sphinx_rtd_theme"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-Sphinx"
-short_desc="ReadTheDocs.org theme for Sphinx (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/snide/sphinx_rtd_theme/"
-distfiles="${PYPI_SITE}/s/sphinx_rtd_theme/sphinx_rtd_theme-${version}.tar.gz"
-checksum=728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-sphinx_rtd_theme_package() {
-	archs=noarch
-	depends="python3-Sphinx"
-	pycompile_module="sphinx_rtd_theme"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-sphinx_rtd_theme b/srcpkgs/python3-sphinx_rtd_theme
deleted file mode 120000
index 0974a11bf46..00000000000
--- a/srcpkgs/python3-sphinx_rtd_theme
+++ /dev/null
@@ -1 +0,0 @@
-python-sphinx_rtd_theme
\ No newline at end of file
diff --git a/srcpkgs/python3-sphinx_rtd_theme/template b/srcpkgs/python3-sphinx_rtd_theme/template
new file mode 100644
index 00000000000..c7f46e3da4c
--- /dev/null
+++ b/srcpkgs/python3-sphinx_rtd_theme/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-sphinx_rtd_theme'
+pkgname=python3-sphinx_rtd_theme
+version=0.4.3
+revision=3
+archs=noarch
+wrksrc="sphinx_rtd_theme-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Sphinx"
+checkdepends="python3-Sphinx python3-pytest"
+short_desc="ReadTheDocs.org theme for Sphinx (Python 3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/snide/sphinx_rtd_theme/"
+distfiles="${PYPI_SITE}/s/sphinx_rtd_theme/sphinx_rtd_theme-${version}.tar.gz"
+checksum=728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python-sphinx_rtd_theme/update b/srcpkgs/python3-sphinx_rtd_theme/update
similarity index 100%
rename from srcpkgs/python-sphinx_rtd_theme/update
rename to srcpkgs/python3-sphinx_rtd_theme/update

From b65aa77381295eb39dbba23231b3abed0784a024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:15:13 +0700
Subject: [PATCH 38/38] python-Sphinx: drop package

---
 srcpkgs/python-Sphinx/template | 32 --------------------------------
 srcpkgs/python-Sphinx/update   |  1 -
 2 files changed, 33 deletions(-)
 delete mode 100644 srcpkgs/python-Sphinx/template
 delete mode 100644 srcpkgs/python-Sphinx/update

diff --git a/srcpkgs/python-Sphinx/template b/srcpkgs/python-Sphinx/template
deleted file mode 100644
index ec04e91c9a6..00000000000
--- a/srcpkgs/python-Sphinx/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-Sphinx'
-pkgname=python-Sphinx
-version=1.8.5
-revision=2
-archs=noarch
-wrksrc="Sphinx-${version}"
-build_style=python2-module
-pycompile_module="sphinx"
-hostmakedepends="python-setuptools"
-depends="python-setuptools python-docutils python-Jinja2 python-Pygments
- python-six python-Babel python-alabaster python-snowballstemmer python-imagesize
- python-requests python-packaging python-sphinxcontrib-websupport python-typing"
-short_desc="Python 2 documentation generator"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-2-Clause"
-homepage="http://sphinx-doc.org/"
-distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz"
-checksum=c7658aab75c920288a8cf6f09f244c6cfdae30d82d803ac1634d9f223a80ca08
-
-alternatives="
- sphinx:sphinx-apidoc:/usr/bin/sphinx-apidoc2
- sphinx:sphinx-autogen:/usr/bin/sphinx-autogen2
- sphinx:sphinx-build:/usr/bin/sphinx-build2
- sphinx:sphinx-quickstart:/usr/bin/sphinx-quickstart2"
-
-post_install() {
-	mv ${DESTDIR}/usr/bin/sphinx-apidoc ${DESTDIR}/usr/bin/sphinx-apidoc2
-	mv ${DESTDIR}/usr/bin/sphinx-autogen ${DESTDIR}/usr/bin/sphinx-autogen2
-	mv ${DESTDIR}/usr/bin/sphinx-build ${DESTDIR}/usr/bin/sphinx-build2
-	mv ${DESTDIR}/usr/bin/sphinx-quickstart ${DESTDIR}/usr/bin/sphinx-quickstart2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python-Sphinx/update b/srcpkgs/python-Sphinx/update
deleted file mode 100644
index 88d11751195..00000000000
--- a/srcpkgs/python-Sphinx/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2*"