From 125857dc22f022a4bdfba2c8ef1076e4dcd1c446 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] 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"
+}