From: tornaria <tornaria@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [RFC] [WIP] updates to jupyter, jupyterlab, notebook, etc.
Date: Fri, 29 Sep 2023 02:48:41 +0200 [thread overview]
Message-ID: <20230929004841.pHIloHK2TAyAlYfW9jOcZ6twF8UD_F8KRiq0dfPEmss@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-44160@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages jupyter
https://github.com/void-linux/void-packages/pull/44160
[RFC] [WIP] updates to jupyter, jupyterlab, notebook, etc.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/44160.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jupyter-44160.patch --]
[-- Type: text/x-diff, Size: 49341 bytes --]
From e5913c268b7145ae246dfebf2c4f74b6cd5ceb86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 26 Sep 2023 12:31:11 -0300
Subject: [PATCH 01/25] python3-send2trash: update to 1.8.2.
---
srcpkgs/python3-send2trash/template | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/python3-send2trash/template b/srcpkgs/python3-send2trash/template
index 826a078e1d2f2..34c635ff1e178 100644
--- a/srcpkgs/python3-send2trash/template
+++ b/srcpkgs/python3-send2trash/template
@@ -1,17 +1,25 @@
# Template file for 'python3-send2trash'
pkgname=python3-send2trash
-version=1.8.0
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools python3-pytest"
+version=1.8.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
depends="python3"
+checkdepends="python3-pytest"
short_desc="Python3 library to natively send files to trash"
maintainer="Eloi Torrents <eloitor@disroot.org>"
license="BSD-3-Clause"
homepage="https://github.com/hsoft/send2trash"
-distfiles="https://github.com/hsoft/send2trash/archive/${version}.tar.gz"
-checksum=937b038abd9f1e7b8c5d7a116be5dc4663beb71df74dcccffe56cacf992c7a9c
-make_check=ci-skip # fails "test_trash_topdir_failure" due to root
+changelog="https://raw.githubusercontent.com/arsenetar/send2trash/master/CHANGES.rst"
+distfiles="${PYPI_SITE}/S/Send2Trash/Send2Trash-${version}.tar.gz"
+checksum=c132d59fa44b9ca2b1699af5c86f57ce9f4c5eb56629d5d55fbb7a35f84e2312
+
+if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+ # this test fails on CI (due to root)
+ make_check_args="
+ --deselect=tests/test_plat_other.py::test_trash_topdir_failure
+ "
+fi
post_install() {
vlicense LICENSE
From f1a023f83bbfd67acfa3395504e9609e58ed9568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 26 Sep 2023 10:30:14 -0300
Subject: [PATCH 02/25] python3-comm: update to 0.1.4.
---
srcpkgs/python3-comm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-comm/template b/srcpkgs/python3-comm/template
index 29ebd5afd7722..13ad0328ee940 100644
--- a/srcpkgs/python3-comm/template
+++ b/srcpkgs/python3-comm/template
@@ -1,6 +1,6 @@
# Template file for 'python3-comm'
pkgname=python3-comm
-version=0.1.3
+version=0.1.4
revision=1
build_style=python3-pep517
hostmakedepends="hatchling"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
homepage="https://github.com/ipython/comm/"
changelog="https://raw.githubusercontent.com/ipython/comm/main/CHANGELOG.md"
distfiles="https://github.com/ipython/comm/archive/refs/tags/v$version.tar.gz"
-checksum=9bdea650a6194bf1628b17c2668bf74bf5295c87a7528a8aa4fe4472904b26f2
+checksum=4b7c0b56439d6835c1f4abf31b81c931fd6a6eba9e38f11f74ac80d1a720bed7
post_install() {
vlicense LICENSE
From e8c0827bb0f0d209eb1855ec75d1824bef82c54d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 26 Sep 2023 10:30:19 -0300
Subject: [PATCH 03/25] python3-traitlets: update to 5.10.1.
---
srcpkgs/python3-traitlets/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-traitlets/template b/srcpkgs/python3-traitlets/template
index 3bafe071d86b1..2fe71a02fb3a3 100644
--- a/srcpkgs/python3-traitlets/template
+++ b/srcpkgs/python3-traitlets/template
@@ -1,6 +1,6 @@
# Template file for 'python3-traitlets'
pkgname=python3-traitlets
-version=5.10.0
+version=5.10.1
revision=1
build_style=python3-pep517
hostmakedepends="hatchling"
@@ -10,9 +10,9 @@ short_desc="Configuration system for Python applications"
maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
homepage="https://github.com/ipython/traitlets"
-changelog="https://github.com/ipython/traitlets/raw/main/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/ipython/traitlets/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/t/traitlets/traitlets-${version}.tar.gz"
-checksum=f584ea209240466e66e91f3c81aa7d004ba4cf794990b0c775938a1544217cd1
+checksum=db9c4aa58139c3ba850101913915c042bdba86f7c8a0dda1c6f7f92c5da8e542
post_install() {
vlicense LICENSE
From 9ea9cdddf89e86047145e746ed5709236c89652b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 4 Jun 2023 16:38:21 -0300
Subject: [PATCH 04/25] python3-ipython_genutils: fix check, adopt.
---
srcpkgs/python3-ipython_genutils/template | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-ipython_genutils/template b/srcpkgs/python3-ipython_genutils/template
index c2aca9e1eaccf..31925c265c135 100644
--- a/srcpkgs/python3-ipython_genutils/template
+++ b/srcpkgs/python3-ipython_genutils/template
@@ -2,16 +2,21 @@
pkgname=python3-ipython_genutils
version=0.2.0
revision=7
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-wheel"
depends="python3"
+checkdepends="python3-nose"
short_desc="Vestigial utilities from IPython"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
homepage="https://github.com/ipython/ipython_genutils"
distfiles="${PYPI_SITE}/i/ipython_genutils/ipython_genutils-${version}.tar.gz"
checksum=eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8
+do_check() {
+ nosetests
+}
+
post_install() {
vlicense COPYING.md LICENSE
}
From ea43ae24e2ad232d0cb3a2f0c16c07dbf62a3912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 1 May 2023 21:17:12 -0300
Subject: [PATCH 05/25] python3-jupyter_core: update to 5.3.1, adopt.
---
.../patches/platform_dirs_true.patch | 24 +++++++++++++++++
srcpkgs/python3-jupyter_core/template | 26 +++++++++++++------
2 files changed, 42 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/python3-jupyter_core/patches/platform_dirs_true.patch
diff --git a/srcpkgs/python3-jupyter_core/patches/platform_dirs_true.patch b/srcpkgs/python3-jupyter_core/patches/platform_dirs_true.patch
new file mode 100644
index 0000000000000..76a1b063671d0
--- /dev/null
+++ b/srcpkgs/python3-jupyter_core/patches/platform_dirs_true.patch
@@ -0,0 +1,24 @@
+Default to using platformdirs
+
+--- a/jupyter_core/paths.py 2020-02-01 21:00:00.000000000 -0300
++++ b/jupyter_core/paths.py 2023-06-04 00:49:36.985844333 -0300
+@@ -53,7 +53,7 @@
+ We plan for this to default to False in jupyter_core version 5 and to True
+ in jupyter_core version 6.
+ """
+- return envset("JUPYTER_PLATFORM_DIRS", False) # type:ignore[return-value]
++ return envset("JUPYTER_PLATFORM_DIRS", True) # type:ignore[return-value]
+
+
+ def get_home_dir() -> str:
+--- a/tests/test_paths.py 2020-02-01 21:00:00.000000000 -0300
++++ b/tests/test_paths.py 2023-06-04 00:49:05.967219753 -0300
+@@ -86,7 +86,7 @@
+ return os.path.abspath(os.path.realpath(os.path.expanduser(path)))
+
+
+-home_jupyter = realpath("~/.jupyter")
++home_jupyter = realpath("~/.config/jupyter")
+
+
+ def test_envset():
diff --git a/srcpkgs/python3-jupyter_core/template b/srcpkgs/python3-jupyter_core/template
index 175a296b6e6ca..02f50bff4352b 100644
--- a/srcpkgs/python3-jupyter_core/template
+++ b/srcpkgs/python3-jupyter_core/template
@@ -1,20 +1,30 @@
# Template file for 'python3-jupyter_core'
pkgname=python3-jupyter_core
-version=5.0.0
-revision=2
+version=5.3.2
+revision=1
build_style=python3-pep517
-hostmakedepends="python3-flit_core hatchling"
+hostmakedepends="hatchling"
depends="python3-traitlets python3-platformdirs"
+checkdepends="$depends python3-pytest python3-pip"
short_desc="Jupyter core package"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
homepage="https://jupyter.org"
+changelog="https://raw.githubusercontent.com/jupyter/jupyter_core/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/j/jupyter_core/jupyter_core-${version}.tar.gz"
-checksum=4ed68b7c606197c7e344a24b7195eef57898157075a69655a886074b6beb7043
+checksum=0c28db6cbe2c37b5b398e1a1a5b22f84fd64cd10afc1f6c05b02fb09481ba45f
conflicts="python-jupyter_core<=4.4.0_3"
-# checks create a cycle with python3-jypter_client and python3-ipython_ipykernel
-make_check=no
+
+do_check() {
+ # Running via PYTHONPATH breaks a few tests so we use a venv
+ local testdir="${wrksrc}/.xbps-testdir/$(date +%s)"
+ python3 -m venv --system-site-packages --without-pip "${testdir}"
+
+ local testpy="${testdir}/bin/python3"
+ "${testpy}" -m installer dist/*.whl
+ PATH="${testdir}/bin:${PATH}" "${testpy}" -m pytest
+}
post_install() {
- vlicense COPYING.md LICENSE
+ vlicense LICENSE
}
From 4ab060e14b5a87610c5f574771fed7c038dbb26d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 25 May 2023 18:39:23 -0300
Subject: [PATCH 06/25] New package: python3-jupyter_events-0.7.0
---
srcpkgs/python3-jupyter_events/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-jupyter_events/template
diff --git a/srcpkgs/python3-jupyter_events/template b/srcpkgs/python3-jupyter_events/template
new file mode 100644
index 0000000000000..a2d35ce419788
--- /dev/null
+++ b/srcpkgs/python3-jupyter_events/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-jupyter_events'
+pkgname=python3-jupyter_events
+version=0.7.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="python3-jsonschema python3-json-logger python3-yaml python3-traitlets
+ python3-click python3-rich python3-rfc3339-validator python3-rfc3987"
+checkdepends="$depends python3-pytest-asyncio python3-pytest-console-scripts"
+short_desc="Configurable event system for Jupyter applications and extensions"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyter/jupyter_events"
+changelog="https://raw.githubusercontent.com/jupyter/jupyter_events/main/CHANGELOG.md"
+distfiles="${PYPI_SITE}/j/jupyter_events/jupyter_events-${version}.tar.gz"
+checksum=7be27f54b8388c03eefea123a4f79247c5b9381c49fb1cd48615ee191eb12615
+
+post_install() {
+ vlicense LICENSE
+}
From 6b7db443aafb4d2ed1f705836b34021915e2daee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 23 May 2023 23:15:56 -0300
Subject: [PATCH 07/25] python3-jupyter_nbformat: update to 5.9.2, adopt.
---
srcpkgs/python3-jupyter_nbformat/template | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/python3-jupyter_nbformat/template b/srcpkgs/python3-jupyter_nbformat/template
index 70b9db5e67054..357d1053e002a 100644
--- a/srcpkgs/python3-jupyter_nbformat/template
+++ b/srcpkgs/python3-jupyter_nbformat/template
@@ -1,21 +1,21 @@
# Template file for 'python3-jupyter_nbformat'
pkgname=python3-jupyter_nbformat
-version=5.3.0
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-jsonschema python3-traitlets
- python3-ipython_genutils python3-jupyter_core
- python3-fastjsonschema"
-checkdepends="python3-pytest python3-testpath $depends"
+version=5.9.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling hatch-nodejs-version"
+depends="python3-fastjsonschema python3-jsonschema python3-jupyter_core
+ python3-traitlets"
+checkdepends="$depends python3-pytest python3-testpath python3-pep440"
short_desc="Jupyter notebook format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
homepage="https://github.com/jupyter/nbformat"
+changelog="https://raw.githubusercontent.com/jupyter/nbformat/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/n/nbformat/nbformat-${version}.tar.gz"
-checksum=fcc5ab8cb74e20b19570b5be809e2dba9b82836fd2761a89066ad43394ba29f5
+checksum=5f98b5ba1997dff175e77e0c17d5c10a96eaed2cbd1de3533d1fc35d5e111192
conflicts="python-jupyter_nbformat<=4.4.0_3"
post_install() {
- vlicense COPYING.md LICENSE
+ vlicense LICENSE
}
From 34419097d07d20e0add793bf6fa1e05b44bc0a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 17:54:18 -0300
Subject: [PATCH 08/25] python3-jupyter_widgetsnbextension: update to 4.0.9,
adopt.
---
.../python3-jupyter_widgetsnbextension/template | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/python3-jupyter_widgetsnbextension/template b/srcpkgs/python3-jupyter_widgetsnbextension/template
index 4b6b899992a31..6015ea6e8d69a 100644
--- a/srcpkgs/python3-jupyter_widgetsnbextension/template
+++ b/srcpkgs/python3-jupyter_widgetsnbextension/template
@@ -1,19 +1,16 @@
# Template file for 'python3-jupyter_widgetsnbextension'
pkgname=python3-jupyter_widgetsnbextension
-version=3.5.1
-revision=4
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-jupyter_notebook"
-checkdepends="$depends"
+version=4.0.9
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-jupyter_packaging"
short_desc="Interactive HTML widgets for Jupyter notebooks"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
homepage="https://pypi.org/project/widgetsnbextension/"
distfiles="${PYPI_SITE}/w/widgetsnbextension/widgetsnbextension-${version}.tar.gz"
-checksum=079f87d87270bce047512400efd70238820751a11d2d8cb137a5a5bdbaf255c7
-replaces="python-jupyter_widgetsnbextension-data>=0"
-conf_files="/etc/jupyter/nbconfig/notebook.d/widgetsnbextension.json"
+checksum=3c1f5e46dc1166dfd40a42d685e6a51396fd34ff878742a3e47c6f0cc4a2a385
+make_check=no # Upstream defines no tests
post_install() {
# /usr/etc is intended for *example configuration*
From 54a2d7883f7fdb5bfc32cd2ca5cb837434d65db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 13:25:40 -0300
Subject: [PATCH 09/25] python3-jupyterlab_pygments: update to 0.2.2.
---
srcpkgs/python3-jupyterlab_pygments/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/python3-jupyterlab_pygments/template b/srcpkgs/python3-jupyterlab_pygments/template
index cb6b1aded2e60..cf382fcb45af2 100644
--- a/srcpkgs/python3-jupyterlab_pygments/template
+++ b/srcpkgs/python3-jupyterlab_pygments/template
@@ -1,18 +1,22 @@
# Template file for 'python3-jupyterlab_pygments'
pkgname=python3-jupyterlab_pygments
-version=0.1.2
-revision=3
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=0.2.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-jupyter_packaging"
depends="python3-Pygments"
short_desc="Pygments theme making use of JupyterLab CSS variables"
maintainer="dkwo <nicolopiazzalunga@gmail.com>"
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
+checksum=7405d7fde60819d905a9fa8ce89e4cd830e318cdad22a0030f7a901da705585d
+make_check=no # Upstream defines no tests
+
+post_patch() {
+ # jupyterlab not really needed for building
+ vsed -i -e 's|, "jupyterlab~=3.1"||' pyproject.toml
+}
post_install() {
vlicense LICENSE
From d9885a100791ad7d772f49dd1d9f127409660658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 1 May 2023 23:01:30 -0300
Subject: [PATCH 10/25] New package: python3-pytest-jupyter-0.7.0
---
srcpkgs/python3-pytest-jupyter/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/python3-pytest-jupyter/template
diff --git a/srcpkgs/python3-pytest-jupyter/template b/srcpkgs/python3-pytest-jupyter/template
new file mode 100644
index 0000000000000..c93ad7314446c
--- /dev/null
+++ b/srcpkgs/python3-pytest-jupyter/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-pytest-jupyter'
+pkgname=python3-pytest-jupyter
+version=0.7.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="python3-jupyter_core python3-pytest-timeout"
+checkdepends="$depends"
+short_desc="Pytest plugins for Jupyter libraries and extensions"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyter-server/pytest-jupyter"
+changelog="https://raw.githubusercontent.com/jupyter-server/pytest-jupyter/main/CHANGELOG.md"
+distfiles="${PYPI_SITE}/p/pytest_jupyter/pytest_jupyter-${version}.tar.gz"
+checksum=6403b7f6f5eaaa5a9faffd73d2ff1097106a7dc5c3204292212487fc9fb71843
+make_check=extended # avoid a circular dependency
+
+if [ "$XBPS_CHECK_PKGS" = full ]; then
+ # this would cause a check cycle
+ checkdepends+=" python3-ipython_ipykernel python3-jupyter_server"
+fi
+
+post_install() {
+ vlicense LICENSE
+}
From 699130a3dce9033303a2f6678ce315a4da2b6844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 1 May 2023 22:43:07 -0300
Subject: [PATCH 11/25] python3-jupyter_client: update to 8.3.1, adopt.
---
srcpkgs/python3-jupyter_client/template | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-jupyter_client/template b/srcpkgs/python3-jupyter_client/template
index 6839108ea9627..3484b2a96bec0 100644
--- a/srcpkgs/python3-jupyter_client/template
+++ b/srcpkgs/python3-jupyter_client/template
@@ -1,21 +1,27 @@
# Template file for 'python3-jupyter_client'
pkgname=python3-jupyter_client
-version=7.4.5
+version=8.3.1
revision=1
build_style=python3-pep517
-hostmakedepends="python3-flit_core hatchling"
-depends="python3-traitlets python3-jupyter_core python3-pyzmq
- python3-dateutil python3-tornado python3-nest_asyncio python3-entrypoints"
+hostmakedepends="hatchling"
+depends="python3-dateutil python3-jupyter_core python3-pyzmq python3-tornado"
+checkdepends="$depends inetutils-ifconfig iproute2 openssh
+ python3-pytest-jupyter python3-pytest-timeout"
short_desc="Jupyter protocol client APIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
homepage="https://github.com/jupyter/jupyter_client"
+changelog="https://raw.githubusercontent.com/jupyter/jupyter_client/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/j/jupyter_client/jupyter_client-${version}.tar.gz"
-checksum=63eae06c40e1f2d9afa14447511fddc065c95dea3f2491fda2acccf91221954a
+checksum=60294b2d5b869356c893f57b1a877ea6510d60d45cf4b38057f1672d85699ac9
conflicts="python-jupyter_client<=5.2.4_2"
-# checks create a cycle with python3-jupyter_core and python3-ipython_ipykernel
-make_check=no
+make_check=extended # avoid a circular dependency
+
+if [ "$XBPS_CHECK_PKGS" = full ]; then
+ # this would cause a build-time circular dependency
+ checkdepends+=" python3-ipython_ipykernel"
+fi
post_install() {
- vlicense COPYING.md LICENSE
+ vlicense LICENSE
}
From 9dff606965d606efb39d35c6073c01c19089e93f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 2 May 2023 01:07:04 -0300
Subject: [PATCH 12/25] python3-ipython_ipykernel: update to 6.25.2, adopt.
---
srcpkgs/python3-ipython_ipykernel/template | 38 +++++++++++++++-------
1 file changed, 27 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/python3-ipython_ipykernel/template b/srcpkgs/python3-ipython_ipykernel/template
index 4034b98a6ff50..4ee757a022802 100644
--- a/srcpkgs/python3-ipython_ipykernel/template
+++ b/srcpkgs/python3-ipython_ipykernel/template
@@ -1,21 +1,37 @@
# Template file for 'python3-ipython_ipykernel'
pkgname=python3-ipython_ipykernel
-version=6.19.2
+version=6.25.2
revision=1
build_style=python3-pep517
-hostmakedepends="hatchling python3-jupyter_client python3-jupyter_core
- python3-platformdirs"
-depends="python3-ipython python3-traitlets python3-jupyter_client python3-tornado
- python3-matplotlib-inline python3-nest_asyncio python3-packaging python3-psutil
- python3 python3-comm python3-pyzmq"
-short_desc="IPython kernel for Jupyter (Python3)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+# these tests fail in 6.25.2
+make_check_args="
+ --deselect ipykernel/tests/test_eventloop.py::test_asyncio_interrupt
+ --deselect ipykernel/tests/test_embed_kernel.py::test_embed_kernel_func
+ --deselect ipykernel/tests/test_kernelspec.py::test_install_kernelspec"
+hostmakedepends="hatchling python3-jupyter_client"
+depends="python3-comm python3-ipython python3-jupyter_client
+ python3-nest_asyncio python3-packaging python3-psutil python3-tornado"
+checkdepends="$depends python3-flaky python3-pytest-asyncio
+ python3-pytest-timeout python3-trio python3-curio python3-matplotlib"
+short_desc="IPython kernel for Jupyter"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
homepage="https://github.com/ipython/ipykernel"
+changelog="https://raw.githubusercontent.com/ipython/ipykernel/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/i/ipykernel/ipykernel-${version}.tar.gz"
-checksum=1ab68d3d3654196266baa93990055413e167263ffbe4cfe834f871bcd3d3506d
-make_check=no # cycle with python3-jupyter_core and python3-jupyter_client
+checksum=f468ddd1f17acb48c8ce67fcfa49ba6d46d4f9ac0438c1f441be7c3d1372230b
+
+if [ "$XBPS_CHECK_PKGS" = full ]; then
+ # this would cause a build-time circular dependency
+ checkdepends+=" python3-ipyparallel"
+else
+ # These tests require ipyparallel
+ make_check_args+="
+ --ignore ipykernel/tests/test_pickleutil.py
+ --deselect ipykernel/tests/test_ipkernel_direct.py::test_do_apply
+ "
+fi
post_install() {
- vlicense COPYING.md LICENSE
+ vlicense LICENSE
}
From a6a7eb54c870b54b2fea7976ff94319038edcaba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 23:03:23 -0300
Subject: [PATCH 13/25] python3-jupyter_ipywidgets: update to 8.1.1, adopt.
---
srcpkgs/python3-jupyter_ipywidgets/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/python3-jupyter_ipywidgets/template b/srcpkgs/python3-jupyter_ipywidgets/template
index dee09caf562c0..55d14cac26b21 100644
--- a/srcpkgs/python3-jupyter_ipywidgets/template
+++ b/srcpkgs/python3-jupyter_ipywidgets/template
@@ -1,17 +1,18 @@
# Template file for 'python3-jupyter_ipywidgets'
pkgname=python3-jupyter_ipywidgets
-version=7.6.3
-revision=3
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-jupyter_widgetsnbextension python3-ipython_ipykernel python3-traitlets"
-checkdepends="python3-pytest $depends"
+version=8.1.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-wheel"
+depends="python3-ipython_ipykernel"
+checkdepends="$depends python3-pytest python3-jsonschema python3-pytz"
short_desc="IPython widgets for the Jupyter notebook"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
homepage="https://github.com/jupyter-widgets/ipywidgets"
+changelog="https://raw.githubusercontent.com/jupyter-widgets/ipywidgets/main/docs/source/changelog.md"
distfiles="${PYPI_SITE}/i/ipywidgets/ipywidgets-${version}.tar.gz"
-checksum=9f1a43e620530f9e570e4a493677d25f08310118d315b00e25a18f12913c41f0
+checksum=40211efb556adec6fa450ccc2a77d59ca44a060f4f9f136833df59c9f538e6e8
post_install() {
vlicense LICENSE
From 4dabec64298d3254042a3253e90f2d23690412e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 23:14:20 -0300
Subject: [PATCH 14/25] python3-nbclient: update to 0.8.0.
---
srcpkgs/python3-nbclient/template | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/python3-nbclient/template b/srcpkgs/python3-nbclient/template
index dca1870f7b9e7..9b2556aa53670 100644
--- a/srcpkgs/python3-nbclient/template
+++ b/srcpkgs/python3-nbclient/template
@@ -1,19 +1,25 @@
# Template file for 'python3-nbclient'
pkgname=python3-nbclient
-version=0.7.0
+version=0.8.0
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-traitlets python3-jupyter_client
- python3-jupyter_nbformat python3-async_generator python3-nest_asyncio"
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="python3-jupyter_client python3-jupyter_nbformat"
+checkdepends="$depends python3-pytest-asyncio python3-testpath
+ python3-flaky python3-jupyter_ipywidgets python3-xmltodict"
short_desc="Client library for executing Jupyter notebooks"
maintainer="dkwo <nicolopiazzalunga@gmail.com>"
license="BSD-3-Clause"
homepage="https://nbclient.readthedocs.io/en/latest/"
+changelog="https://raw.githubusercontent.com/jupyter/nbclient/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/n/nbclient/nbclient-${version}.tar.gz"
-checksum=a1d844efd6da9bc39d2209bf996dbd8e07bf0f36b796edfabaa8f8a9ab77c3aa
-# Package might need to be installed for testing
-make_check=no
+checksum=f9b179cd4b2d7bca965f900a2ebf0db4a12ebff2f36a711cb66861e4ae158e55
+make_check=extended # avoid a circular dependency
+
+if [ "$XBPS_CHECK_PKGS" = full ]; then
+ # this would cause a build-time circular dependency
+ checkdepends+=" python3-jupyter_nbconvert"
+fi
post_install() {
vlicense LICENSE
From dcbe67dd90bf75e36de76c2b2989ba7c83896e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 15 Jun 2023 17:05:06 -0300
Subject: [PATCH 15/25] python3-mistune: update to 3.0.1, adopt.
---
srcpkgs/python3-mistune/template | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/python3-mistune/template b/srcpkgs/python3-mistune/template
index c9c60af0b6b47..6a8a82dde4504 100644
--- a/srcpkgs/python3-mistune/template
+++ b/srcpkgs/python3-mistune/template
@@ -1,16 +1,18 @@
# Template file for 'python3-mistune'
pkgname=python3-mistune
-version=0.8.4
-revision=6
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=3.0.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
depends="python3"
-short_desc="Fast markdown parser for Python3"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="python3-pytest"
+short_desc="Markdown parser for Python"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
-homepage="https://github.com/lepture/mistune"
+homepage="https://mistune.lepture.com/"
+changelog="https://raw.githubusercontent.com/lepture/mistune/master/docs/changes.rst"
distfiles="${PYPI_SITE}/m/mistune/mistune-${version}.tar.gz"
-checksum=59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e
+checksum=e912116c13aa0944f9dc530db38eb88f6a77087ab128f49f84a48f4c05ea163c
post_install() {
vlicense LICENSE
From d4cf8940e325b1a0789cafc5fa46741f5423f999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 25 May 2023 15:11:44 -0300
Subject: [PATCH 16/25] python3-jupyter_nbconvert: update to 7.8.0, adopt.
---
.../files/README.voidlinux | 2 -
srcpkgs/python3-jupyter_nbconvert/template | 40 +++++++++++--------
2 files changed, 24 insertions(+), 18 deletions(-)
delete mode 100644 srcpkgs/python3-jupyter_nbconvert/files/README.voidlinux
diff --git a/srcpkgs/python3-jupyter_nbconvert/files/README.voidlinux b/srcpkgs/python3-jupyter_nbconvert/files/README.voidlinux
deleted file mode 100644
index 5efba6bbb86f1..0000000000000
--- a/srcpkgs/python3-jupyter_nbconvert/files/README.voidlinux
+++ /dev/null
@@ -1,2 +0,0 @@
-To convert notebooks to formats other than HTML and markdown install
-python3-Sphinx and/or pandoc.
diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template
index f22b15735276f..5b5c1d41fedfe 100644
--- a/srcpkgs/python3-jupyter_nbconvert/template
+++ b/srcpkgs/python3-jupyter_nbconvert/template
@@ -1,26 +1,34 @@
# Template file for 'python3-jupyter_nbconvert'
pkgname=python3-jupyter_nbconvert
-version=6.4.5
-revision=2
-build_style=python3-module
-# WebPDF export depends on unpackaged pyppeteer
-make_check_args="-m not(network) -k not(test_webpdf_without_chromium)"
-hostmakedepends="python3-setuptools"
-depends="python3-mistune python3-Jinja2 python3-jupyterlab_pygments
- python3-nbclient python3-jupyter_core python3-entrypoints python3-testpath
- python3-bleach python3-pandocfilters python3-defusedxml
- python3-BeautifulSoup4"
-checkdepends="python3-pytest python3-ipython_ipykernel
- python3-jupyter_ipywidgets python3-Pebble pandoc inkscape $depends"
+version=7.8.0
+revision=1
+build_style=python3-pep517
+# these two tests require nbconvert.tests (not installed)
+make_check_args="-k not((test_convert_full_qualified_name)or(test_post_processor))"
+hostmakedepends="hatchling"
+depends="python3-BeautifulSoup4 python3-bleach python3-defusedxml
+ python3-Jinja2 python3-jupyter_core python3-jupyterlab_pygments
+ python3-MarkupSafe python3-mistune python3-nbclient
+ python3-jupyter_nbformat python3-packaging python3-pandocfilters
+ python3-tinycss2"
+checkdepends="$depends python3-pytest python3-jupyter_ipywidgets
+ asciidoc inkscape pandoc python3-flaky"
short_desc="Converting Jupyter notebooks"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
homepage="https://github.com/jupyter/nbconvert"
+changelog="https://raw.githubusercontent.com/jupyter/nbconvert/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/n/nbconvert/nbconvert-${version}.tar.gz"
-checksum=21163a8e2073c07109ca8f398836e45efdba2aacea68d6f75a8a545fef070d4e
-conflicts="python-jupyter_nbconvert<=5.4.1_2"
+checksum=f5bc15a1247e14dd41ceef0c0a3bc70020e016576eb0578da62f1c5b4f950479
+
+pre_check() {
+ # templates must be in $JUPYTER_DATA_DIR/nbconvert/templates
+ # but they are in ${wrksrc}/share/templates
+ # fix with a symlink share/nbconvert -> share/.
+ [ -d share/nbconvert ] || ln -s . share/nbconvert
+ export JUPYTER_DATA_DIR="${wrksrc}/share"
+}
post_install() {
vlicense LICENSE
- vdoc "${FILESDIR}/README.voidlinux"
}
From a4c64e6c6c859e6fa97d7173288b36e7ed3200eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 25 May 2023 19:05:16 -0300
Subject: [PATCH 17/25] New package: python3-jupyter_server_terminals-0.4.4
---
.../python3-jupyter_server_terminals/template | 26 +++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 srcpkgs/python3-jupyter_server_terminals/template
diff --git a/srcpkgs/python3-jupyter_server_terminals/template b/srcpkgs/python3-jupyter_server_terminals/template
new file mode 100644
index 0000000000000..799e4396f8325
--- /dev/null
+++ b/srcpkgs/python3-jupyter_server_terminals/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-jupyter_server_terminals'
+pkgname=python3-jupyter_server_terminals
+version=0.4.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="python3-terminado"
+checkdepends="$depends python3-pytest-jupyter"
+short_desc="Jupyter server extension providing support for terminals"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyter-server/jupyter_server_terminals"
+changelog="https://raw.githubusercontent.com/jupyter-server/jupyter_server_terminals/main/CHANGELOG.md"
+distfiles="${PYPI_SITE}/j/jupyter_server_terminals/jupyter_server_terminals-${version}.tar.gz"
+checksum=57ab779797c25a7ba68e97bcfb5d7740f2b5e8a83b5e8102b10438041a7eac5d
+make_check=extended # avoid a circular dependency
+
+if [ "$XBPS_CHECK_PKGS" = full ]; then
+ # this would cause a build-time circular dependency
+ checkdepends+=" python3-jupyter_server"
+fi
+
+post_install() {
+ mv ${DESTDIR}/usr/etc ${DESTDIR}
+ vlicense LICENSE
+}
From 866d659f8e4ff0f416e6073688e10827956bcd77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 25 May 2023 22:30:26 -0300
Subject: [PATCH 18/25] python3-jupyter_server: update to 2.7.3.
---
srcpkgs/python3-jupyter_server/template | 38 +++++++++++++++----------
1 file changed, 23 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index 798aa4af2309f..b0bd9f2f758bc 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,26 +1,34 @@
# Template file for 'python3-jupyter_server'
pkgname=python3-jupyter_server
-version=1.23.1
+version=2.7.3
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-anyio python3-jupyter_client python3-jupyter_nbformat
- python3-jupyter_nbconvert python3-terminado
- python3-prometheus_client python3-traitlets python3-tornado
- python3-Jinja2 python3-send2trash python3-websocket-client"
-checkdepends="${depends} python3-argon2 python3-packaging
- python3-coverage python3-pytest-mock python3-requests
- python3-pytest python3-pytest-timeout python3-pytest-asyncio"
+build_style=python3-pep517
+hostmakedepends="hatchling hatch-jupyter-builder"
+depends="python3-anyio python3-argon2 python3-jupyter_client
+ python3-jupyter_events python3-jupyter_nbconvert
+ python3-jupyter_server_terminals python3-overrides
+ python3-prometheus_client python3-send2trash
+ python3-websocket-client"
+checkdepends="$depends pandoc python3-ipython_ipykernel
+ python3-pytest-console-scripts python3-pytest-jupyter
+ python3-pytest-xdist python3-requests python3-flaky"
short_desc="Backend to Jupyter web applications"
maintainer="dkwo <nicolopiazzalunga@gmail.com>"
license="BSD-3-Clause"
-homepage="https://jupyter.org"
+homepage="https://github.com/jupyter-server/jupyter_server"
changelog="https://raw.githubusercontent.com/jupyter-server/jupyter_server/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=cee48d9d96cecd0f94b7cb41ecd4f0ab05b01643769f61c5d397b7873bc9a1e2
-# missing pytest-tornasync, pytest-console-scripts
-make_check=no
+checksum=d4916c8581c4ebbc534cebdaa8eca2478d9f3bfdd88eae29fcab0120eac57649
+
+if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+ # these tests fail on CI (connect to a tcp address)
+ make_check_args="
+ --deselect=tests/extension/test_launch.py::test_launch_instance
+ --deselect=tests/extension/test_launch.py::test_base_url
+ --deselect=tests/extension/test_launch.py::test_token_file
+ "
+fi
post_install() {
- vlicense COPYING.md
+ vlicense LICENSE
}
From a9b83a5768bccb1555cb86ab7690859b8200a011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 12:09:02 -0300
Subject: [PATCH 19/25] python3-notebook_shim: update to 0.2.3.
---
srcpkgs/python3-notebook_shim/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-notebook_shim/template b/srcpkgs/python3-notebook_shim/template
index 37287de8e7d2e..c1e58a8e8159a 100644
--- a/srcpkgs/python3-notebook_shim/template
+++ b/srcpkgs/python3-notebook_shim/template
@@ -1,19 +1,20 @@
# Template file for 'python3-notebook_shim'
pkgname=python3-notebook_shim
-version=0.2.2
+version=0.2.3
revision=1
build_style=python3-pep517
hostmakedepends="hatchling"
depends="python3-jupyter_server"
+checkdepends="$depends python3-pytest-jupyter"
short_desc="Shim layer for notebook traits and config"
maintainer="dkwo <npiazza@disroot.org>"
license="BSD-3-Clause"
homepage="https://github.com/jupyter/notebook_shim"
+changelog="https://raw.githubusercontent.com/jupyter/notebook_shim/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/n/notebook_shim/notebook_shim-${version}.tar.gz"
-checksum=090e0baf9a5582ff59b607af523ca2db68ff216da0c69956b62cab2ef4fc9c3f
-make_check=no # missing pytest_tornasync
+checksum=f69388ac283ae008cd506dda10d0288b09a017d822d5e8c7129a152cbd3ce7e9
post_install() {
+ mv ${DESTDIR}/usr/etc ${DESTDIR}
vlicense LICENSE
- mv "${PKGDESTDIR}/usr/etc" ${PKGDESTDIR}/etc/
}
From e3757c22eabb4a1202977a1bb25361a63dda922c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 25 May 2023 23:12:45 -0300
Subject: [PATCH 20/25] python3-nbclassic: update to 1.0.0.
---
srcpkgs/python3-nbclassic/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/python3-nbclassic/template b/srcpkgs/python3-nbclassic/template
index 4c751d222a606..6f6d16a47a4ed 100644
--- a/srcpkgs/python3-nbclassic/template
+++ b/srcpkgs/python3-nbclassic/template
@@ -1,25 +1,25 @@
# Template file for 'python3-nbclassic'
pkgname=python3-nbclassic
-version=0.4.8
+version=1.0.0
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-jupyter_notebook python3-jupyter_server"
-checkdepends="${depends} python3-pytest python3-pytest-fixture-config python3-pytest-subtests"
+build_style=python3-pep517
+make_build_args="--skip-dependency-check"
+hostmakedepends="python3-jupyter_packaging python3-jupyter_server"
+depends="mathjax2 python3-notebook_shim"
+checkdepends="$depends python3-pytest-jupyter"
short_desc="Jupyter Notebook as a Jupyter Server Extension"
maintainer="dkwo <nicolopiazzalunga@gmail.com>"
license="BSD-3-Clause"
-homepage="https://jupyter.org"
+homepage="https://github.com/jupyter/nbclassic"
+changelog="https://raw.githubusercontent.com/jupyter/nbclassic/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/n/nbclassic/nbclassic-${version}.tar.gz"
-checksum=c74d8a500f8e058d46b576a41e5bc640711e1032cf7541dde5f73ea49497e283
-# missing fixtures: jp_create_notebook jp_fetch
-make_check=no
-
-conf_files="/etc/jupyter/jupyter_server_config.d/*.json"
+checksum=0ae11eb2319455d805596bf320336cda9554b41d99ab9a3c31bf8180bffa30e3
post_install() {
vlicense LICENSE
+ mv ${DESTDIR}/usr/etc ${DESTDIR}
- # jupyter honors /etc/juypter; move config files there
- mv "${DESTDIR}/usr/etc" "${DESTDIR}/etc"
+ # use system mathjax2
+ rm -rf ${DESTDIR}/${py3_sitelib}/nbclassic/static/components/MathJax
+ ln -sf /usr/share/mathjax ${DESTDIR}/${py3_sitelib}/nbclassic/static/components/MathJax
}
From 534d02fa1b6e2ecd687973804434f700c4073891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 27 May 2023 17:50:24 -0300
Subject: [PATCH 21/25] python3-jupyterlab_server: update to 2.25.0.
---
srcpkgs/python3-jupyterlab_server/template | 28 ++++++++++++++--------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index a09205776e6cb..16b1cf6ead00b 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,18 +1,26 @@
# Template file for 'python3-jupyterlab_server'
pkgname=python3-jupyterlab_server
-version=2.10.3
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools python3-jupyter_notebook python3-jupyter_server"
-depends="python3-requests python3-json5 python3-Babel"
-short_desc="Server components for JupyterLab and -like applications"
+version=2.25.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="python3-jupyter_server python3-Babel python3-json5 python3-requests"
+checkdepends="$depends python3-pytest-jupyter python3-openapi-core
+ python3-requests-mock python3-strict-rfc3339 python3-ruamel.yaml python3-pip"
+short_desc="Server components for JupyterLab and JL-like applications"
maintainer="dkwo <nicolopiazzalunga@gmail.com>"
license="BSD-3-Clause"
-homepage="https://jupyter.org"
+homepage="https://github.com/jupyterlab/jupyterlab_server"
+changelog="https://raw.githubusercontent.com/jupyterlab/jupyterlab_server/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/j/jupyterlab_server/jupyterlab_server-${version}.tar.gz"
-checksum=3fb84a5813d6d836ceda773fb2d4e9ef3c7944dbc1b45a8d59d98641a80de80a
-# Tests require unpackaged dependencies
-make_check=no
+checksum=77c2f1f282d610f95e496e20d5bf1d2a7706826dfb7b18f3378ae2870d272fb7
+
+if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+ # the setup of this test file fails on CI (no idea why)
+ make_check_args="
+ --ignore=tests/test_settings_api.py
+ "
+fi
post_install() {
vlicense LICENSE
From 74e6cbfe83cda9231f6288f26223ae2a46a9110b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 28 May 2023 18:19:20 -0300
Subject: [PATCH 22/25] jupyterlab: update to 4.0.6.
---
srcpkgs/jupyterlab/template | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 65597d3b63d5d..360a41f3a5b26 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,22 +1,22 @@
# Template file for 'jupyterlab'
pkgname=jupyterlab
-version=3.5.0
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic
- python3-requests-unixsocket python3-jupyter_ipywidgets
- python3-notebook_shim"
+version=4.0.6
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling hatch-jupyter-builder"
+depends="nodejs python3-async-lru python3-ipython_ipykernel
+ python3-jupyterlab_server python3-notebook_shim python3-tomli"
+checkdepends="$depends python3-pytest-jupyter python3-pytest-xdist"
short_desc="JupyterLab computational environment"
maintainer="dkwo <nicolopiazzalunga@gmail.com>"
license="custom:jupyterlab"
-homepage="https://jupyter.org"
+homepage="https://github.com/jupyterlab/jupyterlab/"
+changelog="https://raw.githubusercontent.com/jupyterlab/jupyterlab/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/j/jupyterlab/jupyterlab-${version}.tar.gz"
-checksum=e02556c8ea1b386963c4b464e4618aee153c5416b07ab481425c817a033323a2
-# Tests require unpackaged dependencies
-make_check=no
+checksum=6c43ae5a6a1fd2fdfafcb3454004958bde6da76331abb44cffc6f9e436b19ba1
post_install() {
+ mv ${DESTDIR}/usr/etc ${DESTDIR}
vlicense LICENSE
vinstall "${FILESDIR}/jupyterlab.sh" 644 etc/profile.d
}
From 316bd53b9f876f044e7474cb6bbff9dc4fae13ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 29 May 2023 16:40:44 -0300
Subject: [PATCH 23/25] python3-jupyter_notebook: update to 7.0.4.
---
srcpkgs/python3-jupyter_notebook/template | 30 +++++++++--------------
srcpkgs/python3-jupyter_notebook/update | 2 +-
2 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template
index 620b6715abfc5..6e386070f27c5 100644
--- a/srcpkgs/python3-jupyter_notebook/template
+++ b/srcpkgs/python3-jupyter_notebook/template
@@ -1,27 +1,21 @@
# Template file for 'python3-jupyter_notebook'
pkgname=python3-jupyter_notebook
-version=6.4.10
-revision=3
-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
- mathjax2 python3-argon2"
+version=7.0.4
+revision=1
+build_style=python3-pep517
+make_build_args="--skip-dependency-check"
+hostmakedepends="hatchling hatch-jupyter-builder jupyterlab"
+depends="python3-jupyter_client python3-jupyter_server"
+checkdepends="$depends python3-pytest-jupyter"
short_desc="Jupyter interactive notebook"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
-homepage="https://jupyter.org/"
+homepage="https://github.com/jupyter/notebook"
+changelog="https://raw.githubusercontent.com/jupyter/notebook/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/n/notebook/notebook-${version}.tar.gz"
-checksum=2408a76bc6289283a8eecfca67e298ec83c67db51a4c2e1b713dd180bb39e90e
-conflicts="python-jupyter_notebook<=5.7.0_2"
-# Tests require unpackaged selenium
-make_check=no
+checksum=0c1b458f72ce8774445c8ef9ed2492bd0b9ce9605ac996e2b066114f69795e71
post_install() {
+ mv ${DESTDIR}/usr/etc ${DESTDIR}
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
index 1bb284fed4967..276c9bf787e58 100644
--- a/srcpkgs/python3-jupyter_notebook/update
+++ b/srcpkgs/python3-jupyter_notebook/update
@@ -1,2 +1,2 @@
pkgname=notebook
-ignore="*a* *b* *rc*"
+#ignore="*a* *b* *rc*"
From a5fbc9c0c7f298ab04f6a858d928cefb35216f74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 26 Sep 2023 17:13:52 -0300
Subject: [PATCH 24/25] python3-jupyter_console: update to 6.6.3, adopt.
---
srcpkgs/python3-jupyter_console/template | 29 +++++++++++++++---------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/python3-jupyter_console/template b/srcpkgs/python3-jupyter_console/template
index 01d79971ba197..2af1e4875ca39 100644
--- a/srcpkgs/python3-jupyter_console/template
+++ b/srcpkgs/python3-jupyter_console/template
@@ -1,22 +1,29 @@
# Template file for 'python3-jupyter_console'
pkgname=python3-jupyter_console
-version=6.4.4
+version=6.6.3
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-ipython python3-ipython_ipykernel python3-jupyter_client
- python3-prompt_toolkit python3-Pygments python3-traitlets"
-checkdepends="$depends python3-pytest"
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="python3-ipython_ipykernel python3-ipython python3-jupyter_client
+ python3-jupyter_core python3-prompt_toolkit python3-Pygments python3-pyzmq
+ python3-traitlets"
+checkdepends="$depends python3-pytest python3-flaky"
short_desc="Jupyter terminal console (Python3)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
homepage="https://github.com/jupyter/jupyter_console"
+changelog="https://raw.githubusercontent.com/jupyter/jupyter_console/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/j/jupyter_console/jupyter_console-${version}.tar.gz"
-checksum=172f5335e31d600df61613a97b7f0352f2c8250bbd1092ef2d658f77249f89fb
-# alternatives will be a conflict
+checksum=566a4bf31c87adbfadf22cdf846e3069b59a71ed5da71d6ba4d8aaad14a53539
conflicts="python-jupyter_console<=6.0.0_2"
-# Tests fail because stdin is not a terminal
-make_check=no
+
+if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+ # this test fails on CI (pexpect gets ": 5" instead of the
+ # expected "Out[1]: 5" causing a timeout)
+ make_check_args="
+ --deselect=jupyter_console/tests/test_console.py::test_console_starts
+ "
+fi
post_install() {
vlicense LICENSE
From 7bc05392cb2e213906ab2276d1b9ed5ccf4f416f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 26 Sep 2023 17:42:33 -0300
Subject: [PATCH 25/25] python3-jupyter_qtconsole: update to 5.4.4, adopt.
---
srcpkgs/python3-jupyter_qtconsole/template | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/python3-jupyter_qtconsole/template b/srcpkgs/python3-jupyter_qtconsole/template
index b0ef9ce5afbad..a7d38b0253ca9 100644
--- a/srcpkgs/python3-jupyter_qtconsole/template
+++ b/srcpkgs/python3-jupyter_qtconsole/template
@@ -1,26 +1,22 @@
# Template file for 'python3-jupyter_qtconsole'
pkgname=python3-jupyter_qtconsole
-version=4.7.1
-revision=4
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=5.4.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
depends="python3-traitlets python3-jupyter_core python3-jupyter_client
python3-Pygments python3-ipython_ipykernel python3-ipython_genutils
python3-PyQt5-svg python3-QtPy"
checkdepends="$depends python3-pytest-qt python3-flaky"
short_desc="Jupyter Qt console"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
homepage="https://github.com/jupyter/qtconsole"
+changelog="https://raw.githubusercontent.com/jupyter/qtconsole/master/docs/source/changelog.rst"
distfiles="${PYPI_SITE}/q/qtconsole/qtconsole-${version}.tar.gz"
-checksum=d51c1c51c81fbd1fac62b2d4bdc8b54fb6b7cbe6cbf70c3baeea11516525c956
+checksum=b7ffb53d74f23cee29f4cdb55dd6fabc8ec312d94f3c46ba38e1dde458693dfb
conflicts="python-jupyter_qtconsole<=4.4.3_2"
-do_check() {
- # flaky test
- pytest -k 'not test_frontend_to_kernel'
-}
-
post_install() {
vlicense LICENSE
}
next prev parent reply other threads:[~2023-09-29 0:48 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-30 2:01 [PR PATCH] " tornaria
2023-05-30 2:15 ` tornaria
2023-05-30 21:51 ` dkwo
2023-05-31 0:10 ` tornaria
2023-06-28 21:30 ` dkwo
2023-07-06 1:43 ` dkwo
2023-07-06 2:08 ` [PR REVIEW] " classabbyamp
2023-08-19 8:42 ` dkwo
2023-08-19 8:42 ` dkwo
2023-08-19 19:00 ` tornaria
2023-09-26 1:47 ` [PR PATCH] [Updated] " tornaria
2023-09-26 13:54 ` tornaria
2023-09-26 19:46 ` tornaria
2023-09-26 20:27 ` tornaria
2023-09-27 13:00 ` tornaria
2023-09-28 1:40 ` tornaria
2023-09-28 23:40 ` tornaria
2023-09-29 0:48 ` tornaria [this message]
2023-09-29 12:30 ` tornaria
2023-09-30 2:53 ` tornaria
2023-09-30 15:49 ` tornaria
2023-10-02 19:06 ` dkwo
2023-10-03 0:15 ` tornaria
2023-10-03 15:19 ` dkwo
2023-10-09 21:10 ` [PR PATCH] [Updated] " tornaria
2023-10-09 21:31 ` tornaria
2023-10-09 21:31 ` tornaria
2023-10-09 21:41 ` [PR PATCH] [Updated] " tornaria
2023-10-09 22:11 ` tornaria
2023-10-09 22:31 ` dkwo
2023-10-10 13:44 ` tornaria
2023-10-10 14:21 ` [PR PATCH] [Updated] " tornaria
2023-10-10 15:19 ` tornaria
2023-10-10 16:22 ` Updates " tornaria
2023-10-10 16:24 ` tornaria
2023-10-10 16:29 ` [PR PATCH] [Merged]: " ahesford
2023-10-10 17:34 ` dkwo
2023-10-10 20:32 ` tornaria
2023-10-10 21:00 ` dkwo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230929004841.pHIloHK2TAyAlYfW9jOcZ6twF8UD_F8KRiq0dfPEmss@z \
--to=tornaria@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).