[PR PATCH] [WIP] Jupyter

[PR PATCH] [WIP] Jupyter

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 916 bytes --]

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages jupyter
https://github.com/void-linux/void-packages/pull/30802

[WIP] Jupyter
This is an attempt to bring all of the jupyter stuff up to date. Currently, `jupyter notebook` works as expected, but `jupyter console` is is broken. This needs to be looked at further.

The `python3-jupyter` meta should be bumped too. I wonder whether it is possible to fold the meta into one of the dependencies as a subpackage without introducing build cycles.

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

A patch file from https://github.com/void-linux/void-packages/pull/30802.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jupyter-30802.patch --]
[-- Type: text/x-diff, Size: 21329 bytes --]

From 59f2c1d7e1541d985320fc950f89fb6bc863f6c6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 09:55:49 -0400
Subject: [PATCH 01/11] python3-ipython_ipykernel: update to 5.5.4.

---
 srcpkgs/python3-ipython_ipykernel/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-ipython_ipykernel/template b/srcpkgs/python3-ipython_ipykernel/template
index 36ef97f08d73..d9f5478dc9e0 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=5.2.0
-revision=2
+version=5.5.4
+revision=1
 wrksrc="ipykernel-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-ipython
@@ -13,12 +13,12 @@ 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=37c65d2e2da3326e5cf114405df6d47d997b8a3eba99e2cc4b75833bf71a5e18
+checksum=1ce0e83672cc3bfdc1ffb5603e1d77ab125f24b41abc4612e22bfb3e994c0db2
 
 do_check() {
 	# Those two tests are problematic in python 3.8,
 	# Old versions of ipykernel are more problematic
-	pytest -k 'not ipykernel/inprocess'
+	pytest --ignore=ipykernel/inprocess/tests
 }
 
 post_install() {

From def58589b94b206edb1be1cfd1805d9308b91604 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 10:01:11 -0400
Subject: [PATCH 02/11] python3-jupyter_ipywidgets: update to 7.6.3.

---
 srcpkgs/python3-jupyter_ipywidgets/template | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/python3-jupyter_ipywidgets/template b/srcpkgs/python3-jupyter_ipywidgets/template
index fa38f1632a83..9dd693ee4ae9 100644
--- a/srcpkgs/python3-jupyter_ipywidgets/template
+++ b/srcpkgs/python3-jupyter_ipywidgets/template
@@ -1,25 +1,18 @@
 # Template file for 'python3-jupyter_ipywidgets'
 pkgname=python3-jupyter_ipywidgets
-version=7.5.1
-revision=2
-_widgetsnbextver=3.5.0
+version=7.6.3
+revision=1
 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"
+depends="python3-jupyter_widgetsnbextension python3-ipython_ipykernel python3-traitlets"
+checkdepends="python3-pytest $depends"
 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=e945f6e02854a74994c596d9db83444a1850c01648f1574adf144fbbabe05c97
-
-do_check() {
-	pytest
-}
+checksum=9f1a43e620530f9e570e4a493677d25f08310118d315b00e25a18f12913c41f0
 
 post_install() {
 	vlicense LICENSE

From 71b3e1c4c149e2147fcdb2519c310353035a8446 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 10:15:56 -0400
Subject: [PATCH 03/11] New package: python3-nest_asyncio-1.5.1

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

diff --git a/srcpkgs/python3-nest_asyncio/template b/srcpkgs/python3-nest_asyncio/template
new file mode 100644
index 000000000000..5ad39cf7f279
--- /dev/null
+++ b/srcpkgs/python3-nest_asyncio/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-nest_asyncio'
+pkgname=python3-nest_asyncio
+version=1.5.1
+revision=1
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm python3-toml"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python asyncio patch to allow nested event loops"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/erdewit/nest_asyncio"
+distfiles="${PYPI_SITE}/n/nest_asyncio/nest_asyncio-${version}.tar.gz"
+checksum=afc5a1c515210a23c461932765691ad39e8eba6551c055ac8d5546e69250d0aa
+
+post_install() {
+	vlicense LICENSE
+}

From a53d293523264b597b99e74ef9aebebffa236d75 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 10:20:03 -0400
Subject: [PATCH 04/11] python3-jupyter_client: update to 6.2.0.

---
 .../patches/test_session.patch                | 15 -------------
 srcpkgs/python3-jupyter_client/template       | 22 ++++++++-----------
 2 files changed, 9 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/python3-jupyter_client/patches/test_session.patch

diff --git a/srcpkgs/python3-jupyter_client/patches/test_session.patch b/srcpkgs/python3-jupyter_client/patches/test_session.patch
deleted file mode 100644
index 2febffe28cf9..000000000000
--- a/srcpkgs/python3-jupyter_client/patches/test_session.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
index 9dc13b8a261f..0379755040b7 100644
--- a/srcpkgs/python3-jupyter_client/template
+++ b/srcpkgs/python3-jupyter_client/template
@@ -1,29 +1,25 @@
 # Template file for 'python3-jupyter_client'
 pkgname=python3-jupyter_client
-version=6.1.0
-revision=2
+version=6.2.0
+revision=1
 wrksrc="jupyter_client-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-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"
+depends="python3-traitlets python3-jupyter_core python3-pyzmq
+ python3-dateutil python3-tornado python3-nest_asyncio"
+checkdepends="python3-pytest python3-async_generator python3-msgpack
+ python3-ipython_ipykernel python3-Sphinx $depends"
 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=61429e7d2c4b385135d31054944dd3f23a1c6affb0ca3d4328d42fc9ba82b7f5
+checksum=e2ab61d79fbf8b56734a4c2499f19830fbd7f6fefb3e87868ef0545cb3c17eb9
 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
+	# test_install_kernel_spec_prefix runs fine in-tree but fails when
+	# running xbps-src check
 	pytest -k 'not test_install_kernel_spec_prefix'
 }
 

From df568cb49efd35fc68f999080a80e4ac737b7122 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 10:29:11 -0400
Subject: [PATCH 05/11] python3-jupyter_console: update to 6.4.0.

---
 .../python3-jupyter_console/patches/setuptools.diff   | 11 -----------
 srcpkgs/python3-jupyter_console/template              | 10 +++-------
 2 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/python3-jupyter_console/patches/setuptools.diff

diff --git a/srcpkgs/python3-jupyter_console/patches/setuptools.diff b/srcpkgs/python3-jupyter_console/patches/setuptools.diff
deleted file mode 100644
index 4c39edde077f..000000000000
--- a/srcpkgs/python3-jupyter_console/patches/setuptools.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -51,7 +51,7 @@
- import os
- from glob import glob
- 
--from distutils.core import setup
-+from setuptools import setup
- 
- pjoin = os.path.join
- here = os.path.abspath(os.path.dirname(__file__))
diff --git a/srcpkgs/python3-jupyter_console/template b/srcpkgs/python3-jupyter_console/template
index f491e1640f5c..53de02560075 100644
--- a/srcpkgs/python3-jupyter_console/template
+++ b/srcpkgs/python3-jupyter_console/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_console'
 pkgname=python3-jupyter_console
-version=6.1.0
-revision=5
+version=6.4.0
+revision=1
 wrksrc="jupyter_console-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,14 +13,10 @@ 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=6f6ead433b0534909df789ea64f0a14cdf9b6b2360757756f08182be4b9e431b
+checksum=242248e1685039cd8bff2c2ecb7ce6c1546eb50ee3b08519729e6e881aec19c7
 # 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
 }

From 4afac2cc99f84314b5d9e43486751e78e003ebd4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 10:38:51 -0400
Subject: [PATCH 06/11] python3-jupyter_core: update to 4.7.1.

---
 srcpkgs/python3-jupyter_core/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-jupyter_core/template b/srcpkgs/python3-jupyter_core/template
index 413be27873f2..61c6e81360ad 100644
--- a/srcpkgs/python3-jupyter_core/template
+++ b/srcpkgs/python3-jupyter_core/template
@@ -1,23 +1,22 @@
 # Template file for 'python3-jupyter_core'
 pkgname=python3-jupyter_core
-version=4.6.3
-revision=2
+version=4.7.1
+revision=1
 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"
+checkdepends="$depends python3-pytest python3-ipython_ipykernel"
 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=394fd5dd787e7c8861741880bdf8a00ce39f95de5d18e579c74b882522219e7e
+checksum=79025cb3225efcd36847d0840f3fc672c0abd7afd0de83ba8a1d3837619122b4
 conflicts="python-jupyter_core<=4.4.0_3"
 
 do_check() {
-	PYTHONPATH=$(pwd)/build/lib py.test
+	python3 -m pytest -k 'not test_jupyter_path_prefer_env'
 }
 
 post_install() {

From 6924c14c14247edadcd34160f4861bbfac190a64 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 11:09:34 -0400
Subject: [PATCH 07/11] New package: python3-jupyterlab_pygments-0.1.2

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

diff --git a/srcpkgs/python3-jupyterlab_pygments/template b/srcpkgs/python3-jupyterlab_pygments/template
new file mode 100644
index 000000000000..0d341b4e5e28
--- /dev/null
+++ b/srcpkgs/python3-jupyterlab_pygments/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-jupyterlab_pygments'
+pkgname=python3-jupyterlab_pygments
+version=0.1.2
+revision=1
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments"
+short_desc="Pygments theme making use of JupyterLab CSS variables"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyterlab/jupyterlab_pygments"
+distfiles="${PYPI_SITE}/j/jupyterlab_pygments/jupyterlab_pygments-${version}.tar.gz"
+checksum=cfcda0873626150932f438eccf0f8bf22bfa92345b814890ab360d666b254146
+# Upstream defines no tests
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 6f79691f32c4739e39b2f555a3e81ce22d67957d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 11:09:37 -0400
Subject: [PATCH 08/11] New package: python3-nbclient-0.5.3

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

diff --git a/srcpkgs/python3-nbclient/template b/srcpkgs/python3-nbclient/template
new file mode 100644
index 000000000000..4abf04331bca
--- /dev/null
+++ b/srcpkgs/python3-nbclient/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-nbclient'
+pkgname=python3-nbclient
+version=0.5.3
+revision=1
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-traitlets python3-jupyter_client
+ python3-jupyter_nbformat python3-async_generator python3-nest_asyncio"
+short_desc="Client library for executing Jupyter notebooks"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://nbclient.readthedocs.io/en/latest/"
+distfiles="${PYPI_SITE}/n/nbclient/nbclient-${version}.tar.gz"
+checksum=db17271330c68c8c88d46d72349e24c147bb6f34ec82d8481a8f025c4d26589c
+# Package might need to be installed for testing
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From c479d41c14308d4ebdcda13c6ddd65b223b4d0f3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 11:17:49 -0400
Subject: [PATCH 09/11] python3-jupyter_nbconvert: update to 6.0.7.

---
 .../patches/test-timeout.patch                | 16 -----------
 srcpkgs/python3-jupyter_nbconvert/template    | 28 ++++++-------------
 2 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/python3-jupyter_nbconvert/patches/test-timeout.patch

diff --git a/srcpkgs/python3-jupyter_nbconvert/patches/test-timeout.patch b/srcpkgs/python3-jupyter_nbconvert/patches/test-timeout.patch
deleted file mode 100644
index 172692d34384..000000000000
--- a/srcpkgs/python3-jupyter_nbconvert/patches/test-timeout.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 fd3a27576358..59d7d2c5014a 100644
--- a/srcpkgs/python3-jupyter_nbconvert/template
+++ b/srcpkgs/python3-jupyter_nbconvert/template
@@ -1,36 +1,26 @@
 # Template file for 'python3-jupyter_nbconvert'
 pkgname=python3-jupyter_nbconvert
-version=5.6.1
-revision=2
+version=6.0.7
+revision=1
 wrksrc="nbconvert-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-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"
+depends="python3-mistune python3-Jinja2 python3-jupyterlab_pygments
+ python3-nbclient python3-jupyter_core python3-entrypoints python3-testpath
+ python3-bleach python3-pandocfilters 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"
+ python3-jupyter_ipywidgets python3-Pebble pandoc inkscape $depends"
 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=21fb48e700b43e82ba0e3142421a659d7739b65568cc832a13976a77be16b523
+checksum=cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002
 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() {
-	pytest -k 'not test_run_all_notebooks[SVG.ipynb-opts9]'
+	# WebPDF export depends on unpackaged pyppeteer
+	python3 -m pytest -k 'not TestWebPDFExporter and not test_webpdf_with_chromium'
 }
 
 post_install() {

From 43b144d91340140800cef5e86e749bfc8fb84af0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 11:22:38 -0400
Subject: [PATCH 10/11] python3-jupyter_nbformat: update to 5.1.3.

---
 srcpkgs/python3-jupyter_nbformat/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-jupyter_nbformat/template b/srcpkgs/python3-jupyter_nbformat/template
index 4a04f11f5fb3..f8d21d621bd8 100644
--- a/srcpkgs/python3-jupyter_nbformat/template
+++ b/srcpkgs/python3-jupyter_nbformat/template
@@ -1,25 +1,24 @@
 # Template file for 'python3-jupyter_nbformat'
 pkgname=python3-jupyter_nbformat
-version=5.0.4
-revision=2
+version=5.1.3
+revision=1
 wrksrc="nbformat-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-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
+depends="python3-jsonschema python3-traitlets
  python3-ipython_genutils python3-jupyter_core"
+checkdepends="python3-pytest python3-testpath $depends"
 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=562de41fc7f4f481b79ab5d683279bf3a168858268d4387b489b7b02be0b324a
+checksum=b516788ad70771c6250977c1374fcca6edebe6126fd2adb5a69aa5c2356fd1c8
 conflicts="python-jupyter_nbformat<=4.4.0_3"
 
 do_check() {
-	pytest
+	# Tests require a non-existent notebook file
+	python3 -m pytest -k 'not test_upgrade_v4_to_4_dot_5 and not test_sample_notebook'
 }
 
 post_install() {

From 7307a49dc38794a61709b32adf4c99eed09291e2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 11:24:44 -0400
Subject: [PATCH 11/11] python3-jupyter_notebook: update to 6.3.0.

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

diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template
index c7a8b2d03904..1f6853e5e5b3 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=6.0.3
-revision=2
+version=6.3.0
+revision=1
 wrksrc="notebook-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,14 +10,15 @@ depends="python3-Jinja2 python3-terminado python3-tornado
  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=47a9092975c9e7965ada00b9a20f0cf637d001db60d241d479f53c0be117ad48
+checksum=cbc9398d6c81473e9cdb891d2cae9c0d3718fca289dda6d26df5cb660fcadc7d
 conflicts="python-jupyter_notebook<=5.7.0_2"
+# Tests require unpackaged selenium
+make_check=no
 
 post_install() {
 	vlicense LICENSE
@@ -25,7 +26,3 @@ post_install() {
 	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
-}

Re: [PR PATCH] [Updated] [WIP] Jupyter

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 921 bytes --]

There is an updated pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages jupyter
https://github.com/void-linux/void-packages/pull/30802

[WIP] Jupyter
This is an attempt to bring all of the jupyter stuff up to date. Currently, `jupyter notebook` works as expected, but `jupyter console` is is broken. This needs to be looked at further.

The `python3-jupyter` meta should be bumped too. I wonder whether it is possible to fold the meta into one of the dependencies as a subpackage without introducing build cycles.

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

A patch file from https://github.com/void-linux/void-packages/pull/30802.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jupyter-30802.patch --]
[-- Type: text/x-diff, Size: 21329 bytes --]

From 195da81363e55440ed2b884d74b3a704e394820a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 09:55:49 -0400
Subject: [PATCH 01/11] python3-ipython_ipykernel: update to 5.5.4.

---
 srcpkgs/python3-ipython_ipykernel/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-ipython_ipykernel/template b/srcpkgs/python3-ipython_ipykernel/template
index 36ef97f08d73..d9f5478dc9e0 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=5.2.0
-revision=2
+version=5.5.4
+revision=1
 wrksrc="ipykernel-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-ipython
@@ -13,12 +13,12 @@ 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=37c65d2e2da3326e5cf114405df6d47d997b8a3eba99e2cc4b75833bf71a5e18
+checksum=1ce0e83672cc3bfdc1ffb5603e1d77ab125f24b41abc4612e22bfb3e994c0db2
 
 do_check() {
 	# Those two tests are problematic in python 3.8,
 	# Old versions of ipykernel are more problematic
-	pytest -k 'not ipykernel/inprocess'
+	pytest --ignore=ipykernel/inprocess/tests
 }
 
 post_install() {

From 1003db28b188b8871e528ca7af0bc9df7141f5e1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 10:01:11 -0400
Subject: [PATCH 02/11] python3-jupyter_ipywidgets: update to 7.6.3.

---
 srcpkgs/python3-jupyter_ipywidgets/template | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/python3-jupyter_ipywidgets/template b/srcpkgs/python3-jupyter_ipywidgets/template
index fa38f1632a83..9dd693ee4ae9 100644
--- a/srcpkgs/python3-jupyter_ipywidgets/template
+++ b/srcpkgs/python3-jupyter_ipywidgets/template
@@ -1,25 +1,18 @@
 # Template file for 'python3-jupyter_ipywidgets'
 pkgname=python3-jupyter_ipywidgets
-version=7.5.1
-revision=2
-_widgetsnbextver=3.5.0
+version=7.6.3
+revision=1
 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"
+depends="python3-jupyter_widgetsnbextension python3-ipython_ipykernel python3-traitlets"
+checkdepends="python3-pytest $depends"
 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=e945f6e02854a74994c596d9db83444a1850c01648f1574adf144fbbabe05c97
-
-do_check() {
-	pytest
-}
+checksum=9f1a43e620530f9e570e4a493677d25f08310118d315b00e25a18f12913c41f0
 
 post_install() {
 	vlicense LICENSE

From a9b130e908846376aa3c2e6707373998a7b8e0a0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 10:15:56 -0400
Subject: [PATCH 03/11] New package: python3-nest_asyncio-1.5.1

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

diff --git a/srcpkgs/python3-nest_asyncio/template b/srcpkgs/python3-nest_asyncio/template
new file mode 100644
index 000000000000..5ad39cf7f279
--- /dev/null
+++ b/srcpkgs/python3-nest_asyncio/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-nest_asyncio'
+pkgname=python3-nest_asyncio
+version=1.5.1
+revision=1
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm python3-toml"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python asyncio patch to allow nested event loops"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/erdewit/nest_asyncio"
+distfiles="${PYPI_SITE}/n/nest_asyncio/nest_asyncio-${version}.tar.gz"
+checksum=afc5a1c515210a23c461932765691ad39e8eba6551c055ac8d5546e69250d0aa
+
+post_install() {
+	vlicense LICENSE
+}

From b3819143d4ef16a77e408dd84438f8a6ae267529 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 10:20:03 -0400
Subject: [PATCH 04/11] python3-jupyter_client: update to 6.2.0.

---
 .../patches/test_session.patch                | 15 -------------
 srcpkgs/python3-jupyter_client/template       | 22 ++++++++-----------
 2 files changed, 9 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/python3-jupyter_client/patches/test_session.patch

diff --git a/srcpkgs/python3-jupyter_client/patches/test_session.patch b/srcpkgs/python3-jupyter_client/patches/test_session.patch
deleted file mode 100644
index 2febffe28cf9..000000000000
--- a/srcpkgs/python3-jupyter_client/patches/test_session.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
index 9dc13b8a261f..0379755040b7 100644
--- a/srcpkgs/python3-jupyter_client/template
+++ b/srcpkgs/python3-jupyter_client/template
@@ -1,29 +1,25 @@
 # Template file for 'python3-jupyter_client'
 pkgname=python3-jupyter_client
-version=6.1.0
-revision=2
+version=6.2.0
+revision=1
 wrksrc="jupyter_client-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-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"
+depends="python3-traitlets python3-jupyter_core python3-pyzmq
+ python3-dateutil python3-tornado python3-nest_asyncio"
+checkdepends="python3-pytest python3-async_generator python3-msgpack
+ python3-ipython_ipykernel python3-Sphinx $depends"
 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=61429e7d2c4b385135d31054944dd3f23a1c6affb0ca3d4328d42fc9ba82b7f5
+checksum=e2ab61d79fbf8b56734a4c2499f19830fbd7f6fefb3e87868ef0545cb3c17eb9
 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
+	# test_install_kernel_spec_prefix runs fine in-tree but fails when
+	# running xbps-src check
 	pytest -k 'not test_install_kernel_spec_prefix'
 }
 

From 19bea910392a6924405a0bb5838c7a54f8fff1cf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 10:29:11 -0400
Subject: [PATCH 05/11] python3-jupyter_console: update to 6.4.0.

---
 .../python3-jupyter_console/patches/setuptools.diff   | 11 -----------
 srcpkgs/python3-jupyter_console/template              | 10 +++-------
 2 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/python3-jupyter_console/patches/setuptools.diff

diff --git a/srcpkgs/python3-jupyter_console/patches/setuptools.diff b/srcpkgs/python3-jupyter_console/patches/setuptools.diff
deleted file mode 100644
index 4c39edde077f..000000000000
--- a/srcpkgs/python3-jupyter_console/patches/setuptools.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -51,7 +51,7 @@
- import os
- from glob import glob
- 
--from distutils.core import setup
-+from setuptools import setup
- 
- pjoin = os.path.join
- here = os.path.abspath(os.path.dirname(__file__))
diff --git a/srcpkgs/python3-jupyter_console/template b/srcpkgs/python3-jupyter_console/template
index f491e1640f5c..53de02560075 100644
--- a/srcpkgs/python3-jupyter_console/template
+++ b/srcpkgs/python3-jupyter_console/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_console'
 pkgname=python3-jupyter_console
-version=6.1.0
-revision=5
+version=6.4.0
+revision=1
 wrksrc="jupyter_console-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,14 +13,10 @@ 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=6f6ead433b0534909df789ea64f0a14cdf9b6b2360757756f08182be4b9e431b
+checksum=242248e1685039cd8bff2c2ecb7ce6c1546eb50ee3b08519729e6e881aec19c7
 # 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
 }

From 5fd5fcf7a837173b90b0a4b54c772e8e572b9ac7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 10:38:51 -0400
Subject: [PATCH 06/11] python3-jupyter_core: update to 4.7.1.

---
 srcpkgs/python3-jupyter_core/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-jupyter_core/template b/srcpkgs/python3-jupyter_core/template
index 413be27873f2..61c6e81360ad 100644
--- a/srcpkgs/python3-jupyter_core/template
+++ b/srcpkgs/python3-jupyter_core/template
@@ -1,23 +1,22 @@
 # Template file for 'python3-jupyter_core'
 pkgname=python3-jupyter_core
-version=4.6.3
-revision=2
+version=4.7.1
+revision=1
 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"
+checkdepends="$depends python3-pytest python3-ipython_ipykernel"
 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=394fd5dd787e7c8861741880bdf8a00ce39f95de5d18e579c74b882522219e7e
+checksum=79025cb3225efcd36847d0840f3fc672c0abd7afd0de83ba8a1d3837619122b4
 conflicts="python-jupyter_core<=4.4.0_3"
 
 do_check() {
-	PYTHONPATH=$(pwd)/build/lib py.test
+	python3 -m pytest -k 'not test_jupyter_path_prefer_env'
 }
 
 post_install() {

From 0fdd22775ac67d6fd44b9e8a9ad69398b2f5f2f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 11:09:34 -0400
Subject: [PATCH 07/11] New package: python3-jupyterlab_pygments-0.1.2

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

diff --git a/srcpkgs/python3-jupyterlab_pygments/template b/srcpkgs/python3-jupyterlab_pygments/template
new file mode 100644
index 000000000000..0d341b4e5e28
--- /dev/null
+++ b/srcpkgs/python3-jupyterlab_pygments/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-jupyterlab_pygments'
+pkgname=python3-jupyterlab_pygments
+version=0.1.2
+revision=1
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments"
+short_desc="Pygments theme making use of JupyterLab CSS variables"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyterlab/jupyterlab_pygments"
+distfiles="${PYPI_SITE}/j/jupyterlab_pygments/jupyterlab_pygments-${version}.tar.gz"
+checksum=cfcda0873626150932f438eccf0f8bf22bfa92345b814890ab360d666b254146
+# Upstream defines no tests
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From b9198c45e16b65fcd32e5429ab10b50d588bae4b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 11:09:37 -0400
Subject: [PATCH 08/11] New package: python3-nbclient-0.5.3

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

diff --git a/srcpkgs/python3-nbclient/template b/srcpkgs/python3-nbclient/template
new file mode 100644
index 000000000000..4abf04331bca
--- /dev/null
+++ b/srcpkgs/python3-nbclient/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-nbclient'
+pkgname=python3-nbclient
+version=0.5.3
+revision=1
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-traitlets python3-jupyter_client
+ python3-jupyter_nbformat python3-async_generator python3-nest_asyncio"
+short_desc="Client library for executing Jupyter notebooks"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://nbclient.readthedocs.io/en/latest/"
+distfiles="${PYPI_SITE}/n/nbclient/nbclient-${version}.tar.gz"
+checksum=db17271330c68c8c88d46d72349e24c147bb6f34ec82d8481a8f025c4d26589c
+# Package might need to be installed for testing
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 4edf892dbef7be60e3e503c5e9e08d935974c523 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 11:17:49 -0400
Subject: [PATCH 09/11] python3-jupyter_nbconvert: update to 6.0.7.

---
 .../patches/test-timeout.patch                | 16 -----------
 srcpkgs/python3-jupyter_nbconvert/template    | 28 ++++++-------------
 2 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/python3-jupyter_nbconvert/patches/test-timeout.patch

diff --git a/srcpkgs/python3-jupyter_nbconvert/patches/test-timeout.patch b/srcpkgs/python3-jupyter_nbconvert/patches/test-timeout.patch
deleted file mode 100644
index 172692d34384..000000000000
--- a/srcpkgs/python3-jupyter_nbconvert/patches/test-timeout.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 fd3a27576358..59d7d2c5014a 100644
--- a/srcpkgs/python3-jupyter_nbconvert/template
+++ b/srcpkgs/python3-jupyter_nbconvert/template
@@ -1,36 +1,26 @@
 # Template file for 'python3-jupyter_nbconvert'
 pkgname=python3-jupyter_nbconvert
-version=5.6.1
-revision=2
+version=6.0.7
+revision=1
 wrksrc="nbconvert-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-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"
+depends="python3-mistune python3-Jinja2 python3-jupyterlab_pygments
+ python3-nbclient python3-jupyter_core python3-entrypoints python3-testpath
+ python3-bleach python3-pandocfilters 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"
+ python3-jupyter_ipywidgets python3-Pebble pandoc inkscape $depends"
 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=21fb48e700b43e82ba0e3142421a659d7739b65568cc832a13976a77be16b523
+checksum=cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002
 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() {
-	pytest -k 'not test_run_all_notebooks[SVG.ipynb-opts9]'
+	# WebPDF export depends on unpackaged pyppeteer
+	python3 -m pytest -k 'not TestWebPDFExporter and not test_webpdf_with_chromium'
 }
 
 post_install() {

From 9472c0d4a4d867803c60a81882b0d7cbcacf547b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 11:22:38 -0400
Subject: [PATCH 10/11] python3-jupyter_nbformat: update to 5.1.3.

---
 srcpkgs/python3-jupyter_nbformat/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-jupyter_nbformat/template b/srcpkgs/python3-jupyter_nbformat/template
index 4a04f11f5fb3..f8d21d621bd8 100644
--- a/srcpkgs/python3-jupyter_nbformat/template
+++ b/srcpkgs/python3-jupyter_nbformat/template
@@ -1,25 +1,24 @@
 # Template file for 'python3-jupyter_nbformat'
 pkgname=python3-jupyter_nbformat
-version=5.0.4
-revision=2
+version=5.1.3
+revision=1
 wrksrc="nbformat-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-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
+depends="python3-jsonschema python3-traitlets
  python3-ipython_genutils python3-jupyter_core"
+checkdepends="python3-pytest python3-testpath $depends"
 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=562de41fc7f4f481b79ab5d683279bf3a168858268d4387b489b7b02be0b324a
+checksum=b516788ad70771c6250977c1374fcca6edebe6126fd2adb5a69aa5c2356fd1c8
 conflicts="python-jupyter_nbformat<=4.4.0_3"
 
 do_check() {
-	pytest
+	# Tests require a non-existent notebook file
+	python3 -m pytest -k 'not test_upgrade_v4_to_4_dot_5 and not test_sample_notebook'
 }
 
 post_install() {

From c6e497e2839ec6ef3c200c8fe39c8238a6ee548d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 11 May 2021 11:24:44 -0400
Subject: [PATCH 11/11] python3-jupyter_notebook: update to 6.3.0.

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

diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template
index c7a8b2d03904..1f6853e5e5b3 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=6.0.3
-revision=2
+version=6.3.0
+revision=1
 wrksrc="notebook-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,14 +10,15 @@ depends="python3-Jinja2 python3-terminado python3-tornado
  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=47a9092975c9e7965ada00b9a20f0cf637d001db60d241d479f53c0be117ad48
+checksum=cbc9398d6c81473e9cdb891d2cae9c0d3718fca289dda6d26df5cb660fcadc7d
 conflicts="python-jupyter_notebook<=5.7.0_2"
+# Tests require unpackaged selenium
+make_check=no
 
 post_install() {
 	vlicense LICENSE
@@ -25,7 +26,3 @@ post_install() {
 	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
-}

Re: [WIP] Jupyter

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 487 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/30802#issuecomment-839536155

Comment:
Would it make sense to add `jupyterlab` https://github.com/jupyterlab/jupyterlab at this point?

It's the next-generation user interface for Jupyter offering all the familiar building blocks of the classic Notebook, which it will eventually replace. Moreover it's adding nice features like RTC or cell output update.

I would be willing to help.

Re: [WIP] Jupyter

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30802#issuecomment-839682082

Comment:
Sure, add a JupyterLab package. 

Re: [WIP] Jupyter

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 247 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/30802#issuecomment-841109007

Comment:
I will rely on some updates that you made. Should I still open a new PR, or is there a way to add stuff here?

Re: [WIP] Jupyter

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 465 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30802#issuecomment-841200040

Comment:
I think the easiest thing is for you to pull this branch into your own fork, add JupyterLab as appropriate and PR the whole thing. Tag me and I'll close this when that happens.

As for the `argon2` dependency: it seems to be a hard dependency of `notebook`, so adding it is appropriate. You can change that in your fork. 

Re: [WIP] Jupyter

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30802#issuecomment-841811643

Comment:
Superseded by #30873.

Re: [PR PATCH] [Closed]: [WIP] Jupyter

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 763 bytes --]

There's a closed pull request on the void-packages repository

[WIP] Jupyter
https://github.com/void-linux/void-packages/pull/30802

Description:
This is an attempt to bring all of the jupyter stuff up to date. Currently, `jupyter notebook` works as expected, but `jupyter console` is is broken. This needs to be looked at further.

The `python3-jupyter` meta should be bumped too. I wonder whether it is possible to fold the meta into one of the dependencies as a subpackage without introducing build cycles.

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR