* [PR PATCH] python3-jupyter_nbconvert: update to 7.16.6.
@ 2025-02-25 15:06 tornaria
2025-02-25 15:10 ` tornaria
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: tornaria @ 2025-02-25 15:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1752 bytes --]
There is a new pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages nbconvert
https://github.com/void-linux/void-packages/pull/54489
python3-jupyter_nbconvert: update to 7.16.6.
- **python3-pytest-asyncio: update to 0.25.3.**
- **python3-xmltodict: update to 0.14.2.**
- **python3-nbclient: update to 0.10.2.**
- **python3-lxml: update to 5.3.1.**
- **python3-soupsieve: update to 2.6.**
- **python3-BeautifulSoup4: update to 4.13.3.**
- **python3-six: update to 1.17.0.**
- **python3-bleach: update to 6.2.0.**
- **python3-mistune: update to 3.1.2.**
- **python3-pandocfilters: update to 1.5.1.**
- **python3-jupyter_nbconvert: update to 7.16.6.**
This also includes #54482 and #54488.
<!-- 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/54489.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nbconvert-54489.patch --]
[-- Type: text/x-diff, Size: 29411 bytes --]
From 106fae55548c892ab0d30dd06255ea38bb191d71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 24 Feb 2025 19:31:05 -0300
Subject: [PATCH 01/15] python3-jupyter_widgetsnbextension: update to 4.0.13.
---
srcpkgs/python3-jupyter_widgetsnbextension/template | 8 ++++----
srcpkgs/python3-jupyter_widgetsnbextension/update | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-jupyter_widgetsnbextension/template b/srcpkgs/python3-jupyter_widgetsnbextension/template
index 82146ccfd62d32..299a2b76f42385 100644
--- a/srcpkgs/python3-jupyter_widgetsnbextension/template
+++ b/srcpkgs/python3-jupyter_widgetsnbextension/template
@@ -1,15 +1,15 @@
# Template file for 'python3-jupyter_widgetsnbextension'
pkgname=python3-jupyter_widgetsnbextension
-version=4.0.11
-revision=2
+version=4.0.13
+revision=1
build_style=python3-pep517
hostmakedepends="python3-jupyter_packaging"
short_desc="Interactive HTML widgets for Jupyter notebooks"
maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
-homepage="https://pypi.org/project/widgetsnbextension/"
+homepage="https://github.com/jupyter-widgets/ipywidgets/tree/main/python/widgetsnbextension"
distfiles="${PYPI_SITE}/w/widgetsnbextension/widgetsnbextension-${version}.tar.gz"
-checksum=8b22a8f1910bfd188e596fe7fc05dcbd87e810c8a4ba010bdb3da86637398474
+checksum=ffcb67bc9febd10234a362795f643927f4e0c05d9342c727b65d2384f8feacb6
make_check=no # Upstream defines no tests
post_install() {
diff --git a/srcpkgs/python3-jupyter_widgetsnbextension/update b/srcpkgs/python3-jupyter_widgetsnbextension/update
index d6944b34c12eb0..0e9e4528c1915f 100644
--- a/srcpkgs/python3-jupyter_widgetsnbextension/update
+++ b/srcpkgs/python3-jupyter_widgetsnbextension/update
@@ -1,2 +1,3 @@
pkgname=widgetsnbextension
+site=https://pypi.org/simple/widgetsnbextension
ignore="*a* *b* *rc*"
From a4d524d5f212a40cabd0e83f7ee331f1133242db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 24 Feb 2025 19:36:50 -0300
Subject: [PATCH 02/15] New package: python3-jupyterlab-widgets-3.0.13
---
.../patches/no-jupyterlab.patch | 9 +++++++++
srcpkgs/python3-jupyterlab-widgets/template | 18 ++++++++++++++++++
srcpkgs/python3-jupyterlab-widgets/update | 3 +++
3 files changed, 30 insertions(+)
create mode 100644 srcpkgs/python3-jupyterlab-widgets/patches/no-jupyterlab.patch
create mode 100644 srcpkgs/python3-jupyterlab-widgets/template
create mode 100644 srcpkgs/python3-jupyterlab-widgets/update
diff --git a/srcpkgs/python3-jupyterlab-widgets/patches/no-jupyterlab.patch b/srcpkgs/python3-jupyterlab-widgets/patches/no-jupyterlab.patch
new file mode 100644
index 00000000000000..7f78d11497f9ac
--- /dev/null
+++ b/srcpkgs/python3-jupyterlab-widgets/patches/no-jupyterlab.patch
@@ -0,0 +1,9 @@
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,5 +1,5 @@
+ [build-system]
+-requires = ["jupyter_packaging~=0.10,<2", "jupyterlab~=4.0"]
++requires = ["jupyter_packaging~=0.10,<2"]
+ build-backend = "jupyter_packaging.build_api"
+
+ [tool.jupyter-packaging.options]
diff --git a/srcpkgs/python3-jupyterlab-widgets/template b/srcpkgs/python3-jupyterlab-widgets/template
new file mode 100644
index 00000000000000..d1d90c29771f30
--- /dev/null
+++ b/srcpkgs/python3-jupyterlab-widgets/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-jupyterlab-widgets'
+pkgname=python3-jupyterlab-widgets
+version=3.0.13
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-jupyter_packaging"
+depends="python3"
+short_desc="Jupyter interactive widgets for JupyterLab"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyter-widgets/ipywidgets/tree/main/python/jupyterlab_widgets"
+distfiles="${PYPI_SITE}/j/jupyterlab-widgets/jupyterlab_widgets-${version}.tar.gz"
+checksum=a2966d385328c1942b683a8cd96b89b8dd82c8b8f81dda902bb2bc06d46f5bed
+make_check=no # Upstream defines no tests
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python3-jupyterlab-widgets/update b/srcpkgs/python3-jupyterlab-widgets/update
new file mode 100644
index 00000000000000..8226cf8d087698
--- /dev/null
+++ b/srcpkgs/python3-jupyterlab-widgets/update
@@ -0,0 +1,3 @@
+pkgname=jupyterlab_widgets
+site=https://pypi.org/simple/jupyterlab_widgets
+ignore="*a* *b* *rc*"
From 5cbc44cb8759b4d0ed42d74c77325292af110c2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 24 Feb 2025 19:39:43 -0300
Subject: [PATCH 03/15] python3-jupyter_ipywidgets: update to 8.1.5.
---
.../patches/pytest8.patch | 93 -------------------
srcpkgs/python3-jupyter_ipywidgets/template | 12 ++-
srcpkgs/python3-jupyter_ipywidgets/update | 1 +
3 files changed, 8 insertions(+), 98 deletions(-)
delete mode 100644 srcpkgs/python3-jupyter_ipywidgets/patches/pytest8.patch
diff --git a/srcpkgs/python3-jupyter_ipywidgets/patches/pytest8.patch b/srcpkgs/python3-jupyter_ipywidgets/patches/pytest8.patch
deleted file mode 100644
index 2f8499a3ae76b9..00000000000000
--- a/srcpkgs/python3-jupyter_ipywidgets/patches/pytest8.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-See: https://github.com/jupyter-widgets/ipywidgets/pull/3903
-
-From bbc6c064aa797eb21bd5a9b441dbbc76925a72db Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Thu, 11 Apr 2024 11:40:15 +0200
-Subject: [PATCH] Fix compatibility with pytest 8
-
-Resolves: https://github.com/jupyter-widgets/ipywidgets/issues/3883
----
- .../ipywidgets/ipywidgets/widgets/tests/test_interaction.py | 2 --
- python/ipywidgets/ipywidgets/widgets/tests/test_link.py | 1 -
- .../ipywidgets/ipywidgets/widgets/tests/test_send_state.py | 2 +-
- .../ipywidgets/ipywidgets/widgets/tests/test_set_state.py | 2 +-
- python/ipywidgets/ipywidgets/widgets/tests/utils.py | 6 +++---
- 5 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/test_interaction.py b/python/ipywidgets/ipywidgets/widgets/tests/test_interaction.py
-index 0dc7e5fcfc..feb1afe50c 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/test_interaction.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/test_interaction.py
-@@ -19,8 +19,6 @@
- # Utility stuff
- #-----------------------------------------------------------------------------
-
--from .utils import setup, teardown
--
- def f(**kwargs):
- pass
-
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/test_link.py b/python/ipywidgets/ipywidgets/widgets/tests/test_link.py
-index 0c92dfdcb2..9301764d40 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/test_link.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/test_link.py
-@@ -4,7 +4,6 @@
- import pytest
-
- from .. import jslink, jsdlink, ToggleButton
--from .utils import setup, teardown
-
- def test_jslink_args():
- with pytest.raises(TypeError):
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/test_send_state.py b/python/ipywidgets/ipywidgets/widgets/tests/test_send_state.py
-index ec18ae4af1..98465b9b7d 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/test_send_state.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/test_send_state.py
-@@ -3,7 +3,7 @@
-
- from traitlets import Bool, Tuple, List
-
--from .utils import setup, teardown, DummyComm
-+from .utils import setup
-
- from ..widget import Widget
-
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/test_set_state.py b/python/ipywidgets/ipywidgets/widgets/tests/test_set_state.py
-index 82ecbd9311..22ec54d90f 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/test_set_state.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/test_set_state.py
-@@ -6,7 +6,7 @@
-
- from traitlets import Bool, Tuple, List, Instance, CFloat, CInt, Float, Int, TraitError, observe
-
--from .utils import setup, teardown
-+from .utils import setup
-
- import ipywidgets
- from ipywidgets import Widget
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/utils.py b/python/ipywidgets/ipywidgets/widgets/tests/utils.py
-index 260485e3f8..8dbbcb355b 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/utils.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/utils.py
-@@ -12,7 +12,7 @@
- NEW_COMM_PACKAGE = False
-
- import ipykernel.comm
--
-+import pytest
-
- class DummyComm():
- comm_id = 'a-b-c-d'
-@@ -87,10 +87,10 @@ def teardown_test_comm():
- setattr(Widget, attr, value)
- _widget_attrs.clear()
-
-+@pytest.fixture(autouse=True)
- def setup():
- setup_test_comm()
--
--def teardown():
-+ yield
- teardown_test_comm()
-
- def call_method(method, *args, **kwargs):
diff --git a/srcpkgs/python3-jupyter_ipywidgets/template b/srcpkgs/python3-jupyter_ipywidgets/template
index da7840682a6178..037c7126558b88 100644
--- a/srcpkgs/python3-jupyter_ipywidgets/template
+++ b/srcpkgs/python3-jupyter_ipywidgets/template
@@ -1,18 +1,20 @@
# Template file for 'python3-jupyter_ipywidgets'
pkgname=python3-jupyter_ipywidgets
-version=8.1.3
-revision=2
+version=8.1.5
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel"
-depends="python3-ipython_ipykernel python3-jupyter_widgetsnbextension"
-checkdepends="$depends python3-pytest python3-jsonschema python3-pytz"
+depends="python3-comm python3-ipython python3-traitlets
+ python3-jupyter_widgetsnbextension python3-jupyterlab-widgets"
+checkdepends="$depends python3-pytest python3-jsonschema python3-pytz
+ python3-ipython_ipykernel"
short_desc="IPython widgets for the Jupyter notebook"
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=f5f9eeaae082b1823ce9eac2575272952f40d748893972956dc09700a6392d9c
+checksum=870e43b1a35656a80c18c9503bbf2d16802db1cb487eec6fab27d683381dde17
# main repo `.../python/ipywidgets/ipywidgets/` is `.../ipywidgets/` here
patch_args=-Np3
diff --git a/srcpkgs/python3-jupyter_ipywidgets/update b/srcpkgs/python3-jupyter_ipywidgets/update
index 44da8f2e3c582e..eb8d6c97887770 100644
--- a/srcpkgs/python3-jupyter_ipywidgets/update
+++ b/srcpkgs/python3-jupyter_ipywidgets/update
@@ -1,2 +1,3 @@
pkgname=ipywidgets
+site=https://pypi.org/simple/ipywidgets
ignore="*a* *b* *rc*"
From a7f339d32f5e77a0e3d732d3f5be2984bd0c72e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:21:32 -0300
Subject: [PATCH 04/15] python3-pytest-asyncio: update to 0.25.3.
---
srcpkgs/python3-pytest-asyncio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pytest-asyncio/template b/srcpkgs/python3-pytest-asyncio/template
index cfb9c094d3a7b0..f1ca23d6a818d5 100644
--- a/srcpkgs/python3-pytest-asyncio/template
+++ b/srcpkgs/python3-pytest-asyncio/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pytest-asyncio'
pkgname=python3-pytest-asyncio
-version=0.25.0
+version=0.25.3
revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools_scm python3-wheel"
@@ -12,7 +12,7 @@ license="Apache-2.0"
homepage="https://github.com/pytest-dev/pytest-asyncio"
changelog="https://raw.githubusercontent.com/pytest-dev/pytest-asyncio/master/docs/source/reference/changelog.rst"
distfiles="${PYPI_SITE}/p/pytest-asyncio/pytest_asyncio-${version}.tar.gz"
-checksum=8c0610303c9e0442a5db8604505fc0f545456ba1528824842b37b4a626cbf609
+checksum=fc1da2cf9f125ada7e710b4ddad05518d4cee187ae9412e9ac9271003497f07a
if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
# these tests fail on CI (bind to a tcp address)
From 80432928619b417c205e75277a107fa7574907bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:21:39 -0300
Subject: [PATCH 05/15] python3-xmltodict: update to 0.14.2.
---
srcpkgs/python3-xmltodict/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-xmltodict/template b/srcpkgs/python3-xmltodict/template
index cf444ee312210f..abe56821b12a5e 100644
--- a/srcpkgs/python3-xmltodict/template
+++ b/srcpkgs/python3-xmltodict/template
@@ -1,8 +1,8 @@
# Template file for 'python3-xmltodict'
pkgname=python3-xmltodict
-version=0.13.0
-revision=3
-build_style=python3-module
+version=0.14.2
+revision=1
+build_style=python3-pep517
hostmakedepends="python3-setuptools"
depends="python3"
checkdepends="python3-pytest"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/martinblech/xmltodict"
changelog="https://raw.githubusercontent.com/martinblech/xmltodict/master/CHANGELOG.md"
distfiles="${PYPI_SITE}/x/xmltodict/xmltodict-${version}.tar.gz"
-checksum=341595a488e3e01a85a9d8911d8912fd922ede5fecc4dce437eb4b6c8d037e56
+checksum=201e7c28bb210e374999d1dde6382923ab0ed1a8a5faeece48ab525b7810a553
post_install() {
vlicense LICENSE
From b97340487a32905242c0967143f5b9ab0c2fc04d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:21:44 -0300
Subject: [PATCH 06/15] python3-nbclient: update to 0.10.2.
---
srcpkgs/python3-nbclient/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-nbclient/template b/srcpkgs/python3-nbclient/template
index 3bf13e904a1d0c..f0fd11b7479c83 100644
--- a/srcpkgs/python3-nbclient/template
+++ b/srcpkgs/python3-nbclient/template
@@ -1,19 +1,21 @@
# Template file for 'python3-nbclient'
pkgname=python3-nbclient
-version=0.10.0
-revision=2
+version=0.10.2
+revision=1
build_style=python3-pep517
hostmakedepends="hatchling"
-depends="python3-jupyter_client python3-jupyter_nbformat"
+depends="python3-jupyter_client python3-jupyter_core python3-jupyter_nbformat
+ python3-traitlets"
checkdepends="$depends python3-pytest-asyncio python3-testpath
- python3-flaky python3-jupyter_ipywidgets python3-xmltodict"
+ python3-flaky python3-jupyter_ipywidgets python3-xmltodict
+ python3-ipython_ipykernel"
short_desc="Client library for executing Jupyter notebooks"
maintainer="dkwo <npiazza@disroot.org>, Gonzalo Tornaría <tornaria@cmat.edu.uy>"
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=4b3f1b7dba531e498449c4db4f53da339c91d449dc11e9af3a43b4eb5c5abb09
+checksum=90b7fc6b810630db87a6d0c2250b1f0ab4cf4d3c27a299b0cde78a4ed3fd9193
make_check=extended # avoid a circular dependency
if [ "$XBPS_CHECK_PKGS" = full ]; then
From 9245bf537a1d06c2586eb0d80efad651a4316d2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:37:47 -0300
Subject: [PATCH 07/15] python3-lxml: update to 5.3.1.
---
.../patches/fix-encoding-tests-musl.patch | 19 -------------------
srcpkgs/python3-lxml/template | 13 +++++++------
2 files changed, 7 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch
diff --git a/srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch b/srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch
deleted file mode 100644
index e2d0e3b36bd572..00000000000000
--- a/srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-from alpine: https://gitlab.alpinelinux.org/alpine/aports/-/blob/3f64a63298ac78f5f2a50a52e3e3f01eef1b51ce/main/py3-lxml/tests-fix-encoding-name.patch
-
-diff --git a/src/lxml/tests/test_incremental_xmlfile.py b/src/lxml/tests/test_incremental_xmlfile.py
-index 3162155..43b79d7 100644
---- a/src/lxml/tests/test_incremental_xmlfile.py
-+++ b/src/lxml/tests/test_incremental_xmlfile.py
-@@ -177,10 +177,10 @@ class _XmlFileTestCaseBase(HelperTestCase):
- '<test>Comments: <!-- text -->\nEntities: &amp;</test>')
-
- def test_encoding(self):
-- with etree.xmlfile(self._file, encoding='utf16') as xf:
-+ with etree.xmlfile(self._file, encoding='utf-16') as xf:
- with xf.element('test'):
- xf.write('toast')
-- self.assertXml('<test>toast</test>', encoding='utf16')
-+ self.assertXml('<test>toast</test>', encoding='utf-16')
-
- def test_buffering(self):
- with etree.xmlfile(self._file, buffered=False) as xf:
diff --git a/srcpkgs/python3-lxml/template b/srcpkgs/python3-lxml/template
index 32ac3828139320..d273b29703c2dc 100644
--- a/srcpkgs/python3-lxml/template
+++ b/srcpkgs/python3-lxml/template
@@ -1,10 +1,10 @@
# Template file for 'python3-lxml'
pkgname=python3-lxml
-version=5.3.0
-revision=2
-build_style=python3-module
-make_build_args="--with-cython"
-hostmakedepends="python3-Cython python3-setuptools"
+version=5.3.1
+revision=1
+build_style=python3-pep517
+make_build_args="-C--build-option=--with-cython"
+hostmakedepends="python3-Cython python3-setuptools python3-wheel"
makedepends="libxslt-devel python3-devel"
depends="python3"
checkdepends="python3-cssselect python3-BeautifulSoup4 python3-html5lib"
@@ -14,7 +14,8 @@ license="BSD-3-Clause, custom:ElementTree"
homepage="https://lxml.de/"
changelog="https://raw.githubusercontent.com/lxml/lxml/master/CHANGES.txt"
distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz"
-checksum=eb22f7ceb319c29247cfa398435d00e6286d19a32b4870b67a8e9a38d72f2ebd
+checksum=db2ec01227b01888b6d5458fc1ade6e6bbf3cdc52a63c3b072378851b81e59f1
+make_check=extended # avoid a circular dependency
do_check() {
make test
From 14f07d0958c122bf529f6890c52853c66756bfa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:47:25 -0300
Subject: [PATCH 08/15] python3-soupsieve: update to 2.6.
---
srcpkgs/python3-soupsieve/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
index 107604fec169b0..6abd6fe83ab3b0 100644
--- a/srcpkgs/python3-soupsieve/template
+++ b/srcpkgs/python3-soupsieve/template
@@ -1,7 +1,7 @@
# Template file for 'python3-soupsieve'
pkgname=python3-soupsieve
-version=2.4.1
-revision=3
+version=2.6
+revision=1
build_style=python3-pep517
hostmakedepends="hatchling"
depends="python3"
@@ -12,7 +12,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://facelessuser.github.io/soupsieve/"
distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
-checksum=89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea
+checksum=e2e68417777af359ec65daac1057404a3c8a5455bb8abc36f1a9866ab1a51abb
+make_check=extended # avoid a circular dependency
post_install() {
vlicense LICENSE.md
From 1bd7f3ef1eb595e603d600b5c7f24f4deb689fc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:51:48 -0300
Subject: [PATCH 09/15] python3-BeautifulSoup4: update to 4.13.3.
---
srcpkgs/python3-BeautifulSoup4/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-BeautifulSoup4/template b/srcpkgs/python3-BeautifulSoup4/template
index 364445f875e54c..d8a7de45a94617 100644
--- a/srcpkgs/python3-BeautifulSoup4/template
+++ b/srcpkgs/python3-BeautifulSoup4/template
@@ -1,10 +1,10 @@
# Template file for 'python3-BeautifulSoup4'
pkgname=python3-BeautifulSoup4
-version=4.12.2
-revision=3
+version=4.13.3
+revision=1
build_style=python3-pep517
hostmakedepends="hatchling"
-depends="python3-soupsieve"
+depends="python3-soupsieve python3-typing_extensions"
checkdepends="$depends python3-pytest python3-html5lib python3-lxml"
short_desc="Python3 HTML/XML parser"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://www.crummy.com/software/BeautifulSoup"
changelog="https://git.launchpad.net/beautifulsoup/plain/CHANGELOG"
distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
-checksum=492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da
+checksum=1bd32405dacc920b42b83ba01644747ed77456a65760e285fbc47633ceddaf8b
post_install() {
vlicense LICENSE
From 46eff140075c097f853b657cd86c9efcdc7f284b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:05:07 -0300
Subject: [PATCH 10/15] python3-six: update to 1.17.0.
---
srcpkgs/python3-six/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-six/template b/srcpkgs/python3-six/template
index 2299770fb153c2..19b0812b9fd4e1 100644
--- a/srcpkgs/python3-six/template
+++ b/srcpkgs/python3-six/template
@@ -1,8 +1,8 @@
# Template file for 'python3-six'
pkgname=python3-six
-version=1.16.0
-revision=5
-build_style=python3-module
+version=1.17.0
+revision=1
+build_style=python3-pep517
hostmakedepends="python3-setuptools"
depends="python3"
checkdepends="python3-pytest"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/benjaminp/six"
changelog="https://raw.githubusercontent.com/benjaminp/six/master/CHANGES"
distfiles="${PYPI_SITE}/s/six/six-${version}.tar.gz"
-checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
+checksum=ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81
post_install() {
vlicense LICENSE
From 23efb3d03c56780662ef8d113b5c1cd8bcaa4bc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:05:22 -0300
Subject: [PATCH 11/15] python3-bleach: update to 6.2.0.
---
srcpkgs/python3-bleach/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-bleach/template b/srcpkgs/python3-bleach/template
index 8cf2201528c939..82f2797e85784b 100644
--- a/srcpkgs/python3-bleach/template
+++ b/srcpkgs/python3-bleach/template
@@ -1,7 +1,7 @@
# Template file for 'python3-bleach'
pkgname=python3-bleach
-version=6.0.0
-revision=3
+version=6.2.0
+revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
depends="python3-six python3-webencodings"
@@ -12,4 +12,4 @@ license="Apache-2.0"
homepage="https://github.com/mozilla/bleach"
changelog="https://raw.githubusercontent.com/mozilla/bleach/master/CHANGES"
distfiles="${PYPI_SITE}/b/bleach/bleach-${version}.tar.gz"
-checksum=1a1a85c1595e07d8db14c5f09f09e6433502c51c595970edc090551f0db99414
+checksum=123e894118b8a599fd80d3ec1a6d4cc7ce4e5882b1317a7e1ba69b56e95f991f
From 6f660f4fce71c58b935936c60bf2cc5fb21e6e3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:05:26 -0300
Subject: [PATCH 12/15] python3-mistune: update to 3.1.2.
---
srcpkgs/python3-mistune/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-mistune/template b/srcpkgs/python3-mistune/template
index 828db5643c7a2e..5a74a8af67c94a 100644
--- a/srcpkgs/python3-mistune/template
+++ b/srcpkgs/python3-mistune/template
@@ -1,7 +1,7 @@
# Template file for 'python3-mistune'
pkgname=python3-mistune
-version=3.0.2
-revision=2
+version=3.1.2
+revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
depends="python3"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
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=fc7f93ded930c92394ef2cb6f04a8aabab4117a91449e72dcc8dfa646a508be8
+checksum=733bf018ba007e8b5f2d3a9eb624034f6ee26c4ea769a98ec533ee111d504dff
post_install() {
vlicense LICENSE
From eebee86bff7f5751c66f5f9a1a35ee3ef40532b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:05:30 -0300
Subject: [PATCH 13/15] python3-pandocfilters: update to 1.5.1.
---
srcpkgs/python3-pandocfilters/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pandocfilters/template b/srcpkgs/python3-pandocfilters/template
index 45e58c9c94ddeb..ab7efec72a7899 100644
--- a/srcpkgs/python3-pandocfilters/template
+++ b/srcpkgs/python3-pandocfilters/template
@@ -1,8 +1,8 @@
# Template file for 'python3-pandocfilters'
pkgname=python3-pandocfilters
-version=1.5.0
-revision=2
-build_style=python3-module
+version=1.5.1
+revision=1
+build_style=python3-pep517
hostmakedepends="python3-setuptools"
depends="python3"
short_desc="Python3 module for writing pandoc filters"
@@ -10,7 +10,8 @@ maintainer="Eloi Torrents <eloitor@disroot.org>"
license="BSD-3-Clause"
homepage="http://github.com/jgm/pandocfilters"
distfiles="${PYPI_SITE}/p/pandocfilters/pandocfilters-${version}.tar.gz"
-checksum=0b679503337d233b4339a817bfc8c50064e2eff681314376a47cb582305a7a38
+checksum=002b4a555ee4ebc03f8b66307e287fa492e4a77b4ea14d3f934328297bb4939e
+make_check=no # Upstream defines no tests
post_install() {
vlicense LICENSE
From 0317242ffbb118eaa71e40bb8540d500c373999d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 11:45:59 -0300
Subject: [PATCH 14/15] hooks/pre-pkg/06-verify-python-deps: support
alternative packages
---
common/scripts/parse-py-metadata.py | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/common/scripts/parse-py-metadata.py b/common/scripts/parse-py-metadata.py
index 0d9384bf7ef36c..909244d80804f1 100644
--- a/common/scripts/parse-py-metadata.py
+++ b/common/scripts/parse-py-metadata.py
@@ -123,7 +123,8 @@ def parse_depends(args):
pkg = getpkgname(pkgver)
vpkg = map(getpkgname, vpkgvers.split())
for v in vpkg:
- vpkgs[v] = pkg
+ if pkg not in vpkgs.setdefault(v, []):
+ vpkgs[v].append(pkg)
if args.rdeps.exists():
with args.rdeps.open() as f:
@@ -149,12 +150,17 @@ def parse_depends(args):
missing = []
for k in depends.keys():
if k in vpkgs.keys():
- pkgname = vpkgs[k]
- if pkgname in rdeps:
- print(f" PYTHON: {k} <-> {pkgname}", flush=True)
- elif pkgname in global_ignore:
- print(f" PYTHON: {k} <-> {pkgname} (ignored)", flush=True)
+ for pkgname in vpkgs[k]:
+ if pkgname in rdeps:
+ print(f" PYTHON: {k} <-> {pkgname}", flush=True)
+ break
+ elif pkgname in global_ignore:
+ print(f" PYTHON: {k} <-> {pkgname} (ignored)", flush=True)
+ break
else:
+ pkgname = " OR ".join(vpkgs[k])
+ if len(vpkgs[k]) > 1:
+ pkgname = "(" + pkgname + ")"
msg_err(f" PYTHON: {k} <-> {pkgname} NOT IN depends PLEASE FIX!",
nocolor=args.nocolor, strict=args.strict)
missing.append(pkgname)
From 5ab7ebba7b2e7299b960f58c50942613a5031240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:10:39 -0300
Subject: [PATCH 15/15] python3-jupyter_nbconvert: update to 7.16.6.
---
srcpkgs/python3-jupyter_nbconvert/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template
index 3bf3da5423c28b..1f6a1be11d816d 100644
--- a/srcpkgs/python3-jupyter_nbconvert/template
+++ b/srcpkgs/python3-jupyter_nbconvert/template
@@ -1,23 +1,23 @@
# Template file for 'python3-jupyter_nbconvert'
pkgname=python3-jupyter_nbconvert
-version=7.16.4
-revision=2
+version=7.16.6
+revision=1
build_style=python3-pep517
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 python3-PyQt5"
+ python3-Pygments python3-traitlets python3-tinycss2"
+checkdepends="$depends python3-pytest-xdist python3-jupyter_ipywidgets
+ asciidoc inkscape pandoc python3-flaky python3-PyQt5 python3-ipython_ipykernel"
short_desc="Converting Jupyter notebooks"
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=86ca91ba266b0a448dc96fa6c5b9d98affabde2867b363258703536807f9f7f4
+checksum=576a7e37c6480da7b8465eefa66c17844243816ce1ccc372633c6b71c3c0f582
pre_check() {
# templates must be in $JUPYTER_DATA_DIR/nbconvert/templates
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: python3-jupyter_nbconvert: update to 7.16.6.
2025-02-25 15:06 [PR PATCH] python3-jupyter_nbconvert: update to 7.16.6 tornaria
@ 2025-02-25 15:10 ` tornaria
2025-04-18 13:47 ` [PR PATCH] [Updated] " tornaria
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: tornaria @ 2025-02-25 15:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/54489#issuecomment-2682318052
Comment:
Example run (I removed a few deps from `python3-jupyter_nbconvert` to show the output):
```
=> python3-jupyter_nbconvert-7.16.6_1: running pre-pkg hook: 06-verify-python-deps ...
PYTHON: py3:beautifulsoup4 <-> python3-BeautifulSoup4
PYTHON: py3:bleach <-> python3-bleach
PYTHON: py3:defusedxml <-> python3-defusedxml
PYTHON: py3:jinja2 <-> python3-Jinja2
PYTHON: py3:jupyter-core <-> python3-jupyter_core
PYTHON: py3:jupyterlab-pygments <-> python3-jupyterlab_pygments
PYTHON: py3:markupsafe <-> python3-MarkupSafe NOT IN depends PLEASE FIX!
PYTHON: py3:mistune <-> (python3-mistune OR python3-mistune2) NOT IN depends PLEASE FIX!
PYTHON: py3:nbclient <-> python3-nbclient NOT IN depends PLEASE FIX!
PYTHON: py3:nbformat <-> python3-jupyter_nbformat
PYTHON: py3:packaging <-> python3-packaging
PYTHON: py3:pandocfilters <-> python3-pandocfilters
PYTHON: py3:pygments <-> python3-Pygments
PYTHON: py3:traitlets <-> python3-traitlets
=> python3-jupyter_nbconvert-7.16.6_1: missing dependencies detected!
=> python3-jupyter_nbconvert-7.16.6_1: please add these packages to depends: (python3-mistune OR python3-mistune2) python3-MarkupSafe python3-nbclient
```
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] python3-jupyter_nbconvert: update to 7.16.6.
2025-02-25 15:06 [PR PATCH] python3-jupyter_nbconvert: update to 7.16.6 tornaria
2025-02-25 15:10 ` tornaria
@ 2025-04-18 13:47 ` tornaria
2025-04-19 3:37 ` tornaria
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: tornaria @ 2025-04-18 13:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1757 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages nbconvert
https://github.com/void-linux/void-packages/pull/54489
python3-jupyter_nbconvert: update to 7.16.6.
- **python3-pytest-asyncio: update to 0.25.3.**
- **python3-xmltodict: update to 0.14.2.**
- **python3-nbclient: update to 0.10.2.**
- **python3-lxml: update to 5.3.1.**
- **python3-soupsieve: update to 2.6.**
- **python3-BeautifulSoup4: update to 4.13.3.**
- **python3-six: update to 1.17.0.**
- **python3-bleach: update to 6.2.0.**
- **python3-mistune: update to 3.1.2.**
- **python3-pandocfilters: update to 1.5.1.**
- **python3-jupyter_nbconvert: update to 7.16.6.**
This also includes #54482 and #54488.
<!-- 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/54489.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nbconvert-54489.patch --]
[-- Type: text/x-diff, Size: 28063 bytes --]
From 4c80c4c932e0f4b3da8e8963d8f6f16a76c89c73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 24 Feb 2025 19:31:05 -0300
Subject: [PATCH 01/14] python3-jupyter_widgetsnbextension: update to 4.0.14.
---
srcpkgs/python3-jupyter_widgetsnbextension/template | 8 ++++----
srcpkgs/python3-jupyter_widgetsnbextension/update | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-jupyter_widgetsnbextension/template b/srcpkgs/python3-jupyter_widgetsnbextension/template
index 82146ccfd62d32..068b3364560be1 100644
--- a/srcpkgs/python3-jupyter_widgetsnbextension/template
+++ b/srcpkgs/python3-jupyter_widgetsnbextension/template
@@ -1,15 +1,15 @@
# Template file for 'python3-jupyter_widgetsnbextension'
pkgname=python3-jupyter_widgetsnbextension
-version=4.0.11
-revision=2
+version=4.0.14
+revision=1
build_style=python3-pep517
hostmakedepends="python3-jupyter_packaging"
short_desc="Interactive HTML widgets for Jupyter notebooks"
maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
-homepage="https://pypi.org/project/widgetsnbextension/"
+homepage="https://github.com/jupyter-widgets/ipywidgets/tree/main/python/widgetsnbextension"
distfiles="${PYPI_SITE}/w/widgetsnbextension/widgetsnbextension-${version}.tar.gz"
-checksum=8b22a8f1910bfd188e596fe7fc05dcbd87e810c8a4ba010bdb3da86637398474
+checksum=a3629b04e3edb893212df862038c7232f62973373869db5084aed739b437b5af
make_check=no # Upstream defines no tests
post_install() {
diff --git a/srcpkgs/python3-jupyter_widgetsnbextension/update b/srcpkgs/python3-jupyter_widgetsnbextension/update
index d6944b34c12eb0..0e9e4528c1915f 100644
--- a/srcpkgs/python3-jupyter_widgetsnbextension/update
+++ b/srcpkgs/python3-jupyter_widgetsnbextension/update
@@ -1,2 +1,3 @@
pkgname=widgetsnbextension
+site=https://pypi.org/simple/widgetsnbextension
ignore="*a* *b* *rc*"
From 08a00a55b3f9ebec3f2a6a38bdc86649496cf33b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 24 Feb 2025 19:36:50 -0300
Subject: [PATCH 02/14] New package: python3-jupyterlab_widgets-3.0.14
---
.../patches/no-jupyterlab.patch | 9 +++++++++
srcpkgs/python3-jupyterlab_widgets/template | 18 ++++++++++++++++++
srcpkgs/python3-jupyterlab_widgets/update | 3 +++
3 files changed, 30 insertions(+)
create mode 100644 srcpkgs/python3-jupyterlab_widgets/patches/no-jupyterlab.patch
create mode 100644 srcpkgs/python3-jupyterlab_widgets/template
create mode 100644 srcpkgs/python3-jupyterlab_widgets/update
diff --git a/srcpkgs/python3-jupyterlab_widgets/patches/no-jupyterlab.patch b/srcpkgs/python3-jupyterlab_widgets/patches/no-jupyterlab.patch
new file mode 100644
index 00000000000000..7f78d11497f9ac
--- /dev/null
+++ b/srcpkgs/python3-jupyterlab_widgets/patches/no-jupyterlab.patch
@@ -0,0 +1,9 @@
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,5 +1,5 @@
+ [build-system]
+-requires = ["jupyter_packaging~=0.10,<2", "jupyterlab~=4.0"]
++requires = ["jupyter_packaging~=0.10,<2"]
+ build-backend = "jupyter_packaging.build_api"
+
+ [tool.jupyter-packaging.options]
diff --git a/srcpkgs/python3-jupyterlab_widgets/template b/srcpkgs/python3-jupyterlab_widgets/template
new file mode 100644
index 00000000000000..b36a7642f2415d
--- /dev/null
+++ b/srcpkgs/python3-jupyterlab_widgets/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-jupyterlab_widgets'
+pkgname=python3-jupyterlab_widgets
+version=3.0.14
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-jupyter_packaging"
+depends="python3"
+short_desc="Jupyter interactive widgets for JupyterLab"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyter-widgets/ipywidgets/tree/main/python/jupyterlab_widgets"
+distfiles="${PYPI_SITE}/j/jupyterlab_widgets/jupyterlab_widgets-${version}.tar.gz"
+checksum=bad03e59546869f026e537e0d170e454259e6dc7048e14041707ca31e523c8a1
+make_check=no # Upstream defines no tests
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python3-jupyterlab_widgets/update b/srcpkgs/python3-jupyterlab_widgets/update
new file mode 100644
index 00000000000000..8226cf8d087698
--- /dev/null
+++ b/srcpkgs/python3-jupyterlab_widgets/update
@@ -0,0 +1,3 @@
+pkgname=jupyterlab_widgets
+site=https://pypi.org/simple/jupyterlab_widgets
+ignore="*a* *b* *rc*"
From cdb8f4a4fcf9fe21eb4d2c5f4dcabc2cf31b5eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 24 Feb 2025 19:39:43 -0300
Subject: [PATCH 03/14] python3-jupyter_ipywidgets: update to 8.1.6.
---
.../patches/pytest8.patch | 93 -------------------
srcpkgs/python3-jupyter_ipywidgets/template | 12 ++-
srcpkgs/python3-jupyter_ipywidgets/update | 1 +
3 files changed, 8 insertions(+), 98 deletions(-)
delete mode 100644 srcpkgs/python3-jupyter_ipywidgets/patches/pytest8.patch
diff --git a/srcpkgs/python3-jupyter_ipywidgets/patches/pytest8.patch b/srcpkgs/python3-jupyter_ipywidgets/patches/pytest8.patch
deleted file mode 100644
index 2f8499a3ae76b9..00000000000000
--- a/srcpkgs/python3-jupyter_ipywidgets/patches/pytest8.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-See: https://github.com/jupyter-widgets/ipywidgets/pull/3903
-
-From bbc6c064aa797eb21bd5a9b441dbbc76925a72db Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Thu, 11 Apr 2024 11:40:15 +0200
-Subject: [PATCH] Fix compatibility with pytest 8
-
-Resolves: https://github.com/jupyter-widgets/ipywidgets/issues/3883
----
- .../ipywidgets/ipywidgets/widgets/tests/test_interaction.py | 2 --
- python/ipywidgets/ipywidgets/widgets/tests/test_link.py | 1 -
- .../ipywidgets/ipywidgets/widgets/tests/test_send_state.py | 2 +-
- .../ipywidgets/ipywidgets/widgets/tests/test_set_state.py | 2 +-
- python/ipywidgets/ipywidgets/widgets/tests/utils.py | 6 +++---
- 5 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/test_interaction.py b/python/ipywidgets/ipywidgets/widgets/tests/test_interaction.py
-index 0dc7e5fcfc..feb1afe50c 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/test_interaction.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/test_interaction.py
-@@ -19,8 +19,6 @@
- # Utility stuff
- #-----------------------------------------------------------------------------
-
--from .utils import setup, teardown
--
- def f(**kwargs):
- pass
-
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/test_link.py b/python/ipywidgets/ipywidgets/widgets/tests/test_link.py
-index 0c92dfdcb2..9301764d40 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/test_link.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/test_link.py
-@@ -4,7 +4,6 @@
- import pytest
-
- from .. import jslink, jsdlink, ToggleButton
--from .utils import setup, teardown
-
- def test_jslink_args():
- with pytest.raises(TypeError):
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/test_send_state.py b/python/ipywidgets/ipywidgets/widgets/tests/test_send_state.py
-index ec18ae4af1..98465b9b7d 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/test_send_state.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/test_send_state.py
-@@ -3,7 +3,7 @@
-
- from traitlets import Bool, Tuple, List
-
--from .utils import setup, teardown, DummyComm
-+from .utils import setup
-
- from ..widget import Widget
-
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/test_set_state.py b/python/ipywidgets/ipywidgets/widgets/tests/test_set_state.py
-index 82ecbd9311..22ec54d90f 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/test_set_state.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/test_set_state.py
-@@ -6,7 +6,7 @@
-
- from traitlets import Bool, Tuple, List, Instance, CFloat, CInt, Float, Int, TraitError, observe
-
--from .utils import setup, teardown
-+from .utils import setup
-
- import ipywidgets
- from ipywidgets import Widget
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/utils.py b/python/ipywidgets/ipywidgets/widgets/tests/utils.py
-index 260485e3f8..8dbbcb355b 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/utils.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/utils.py
-@@ -12,7 +12,7 @@
- NEW_COMM_PACKAGE = False
-
- import ipykernel.comm
--
-+import pytest
-
- class DummyComm():
- comm_id = 'a-b-c-d'
-@@ -87,10 +87,10 @@ def teardown_test_comm():
- setattr(Widget, attr, value)
- _widget_attrs.clear()
-
-+@pytest.fixture(autouse=True)
- def setup():
- setup_test_comm()
--
--def teardown():
-+ yield
- teardown_test_comm()
-
- def call_method(method, *args, **kwargs):
diff --git a/srcpkgs/python3-jupyter_ipywidgets/template b/srcpkgs/python3-jupyter_ipywidgets/template
index da7840682a6178..0df8341d1e1814 100644
--- a/srcpkgs/python3-jupyter_ipywidgets/template
+++ b/srcpkgs/python3-jupyter_ipywidgets/template
@@ -1,18 +1,20 @@
# Template file for 'python3-jupyter_ipywidgets'
pkgname=python3-jupyter_ipywidgets
-version=8.1.3
-revision=2
+version=8.1.6
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel"
-depends="python3-ipython_ipykernel python3-jupyter_widgetsnbextension"
-checkdepends="$depends python3-pytest python3-jsonschema python3-pytz"
+depends="python3-comm python3-ipython python3-traitlets
+ python3-jupyter_widgetsnbextension python3-jupyterlab_widgets"
+checkdepends="$depends python3-pytest python3-jsonschema python3-pytz
+ python3-ipython_ipykernel"
short_desc="IPython widgets for the Jupyter notebook"
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=f5f9eeaae082b1823ce9eac2575272952f40d748893972956dc09700a6392d9c
+checksum=d8ace49c66f14419fc66071371b99d01bed230bbc15d8a60233b18bfbd782851
# main repo `.../python/ipywidgets/ipywidgets/` is `.../ipywidgets/` here
patch_args=-Np3
diff --git a/srcpkgs/python3-jupyter_ipywidgets/update b/srcpkgs/python3-jupyter_ipywidgets/update
index 44da8f2e3c582e..eb8d6c97887770 100644
--- a/srcpkgs/python3-jupyter_ipywidgets/update
+++ b/srcpkgs/python3-jupyter_ipywidgets/update
@@ -1,2 +1,3 @@
pkgname=ipywidgets
+site=https://pypi.org/simple/ipywidgets
ignore="*a* *b* *rc*"
From fbbdbe6c5af5b92e6ff182d9594b1e1c2bd94bab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:21:39 -0300
Subject: [PATCH 04/14] python3-xmltodict: update to 0.14.2.
---
srcpkgs/python3-xmltodict/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-xmltodict/template b/srcpkgs/python3-xmltodict/template
index cf444ee312210f..abe56821b12a5e 100644
--- a/srcpkgs/python3-xmltodict/template
+++ b/srcpkgs/python3-xmltodict/template
@@ -1,8 +1,8 @@
# Template file for 'python3-xmltodict'
pkgname=python3-xmltodict
-version=0.13.0
-revision=3
-build_style=python3-module
+version=0.14.2
+revision=1
+build_style=python3-pep517
hostmakedepends="python3-setuptools"
depends="python3"
checkdepends="python3-pytest"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/martinblech/xmltodict"
changelog="https://raw.githubusercontent.com/martinblech/xmltodict/master/CHANGELOG.md"
distfiles="${PYPI_SITE}/x/xmltodict/xmltodict-${version}.tar.gz"
-checksum=341595a488e3e01a85a9d8911d8912fd922ede5fecc4dce437eb4b6c8d037e56
+checksum=201e7c28bb210e374999d1dde6382923ab0ed1a8a5faeece48ab525b7810a553
post_install() {
vlicense LICENSE
From 48771fec2c08aaf3e510aa843400022c5efa2d76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:21:44 -0300
Subject: [PATCH 05/14] python3-nbclient: update to 0.10.2.
---
srcpkgs/python3-nbclient/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-nbclient/template b/srcpkgs/python3-nbclient/template
index 3bf13e904a1d0c..f0fd11b7479c83 100644
--- a/srcpkgs/python3-nbclient/template
+++ b/srcpkgs/python3-nbclient/template
@@ -1,19 +1,21 @@
# Template file for 'python3-nbclient'
pkgname=python3-nbclient
-version=0.10.0
-revision=2
+version=0.10.2
+revision=1
build_style=python3-pep517
hostmakedepends="hatchling"
-depends="python3-jupyter_client python3-jupyter_nbformat"
+depends="python3-jupyter_client python3-jupyter_core python3-jupyter_nbformat
+ python3-traitlets"
checkdepends="$depends python3-pytest-asyncio python3-testpath
- python3-flaky python3-jupyter_ipywidgets python3-xmltodict"
+ python3-flaky python3-jupyter_ipywidgets python3-xmltodict
+ python3-ipython_ipykernel"
short_desc="Client library for executing Jupyter notebooks"
maintainer="dkwo <npiazza@disroot.org>, Gonzalo Tornaría <tornaria@cmat.edu.uy>"
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=4b3f1b7dba531e498449c4db4f53da339c91d449dc11e9af3a43b4eb5c5abb09
+checksum=90b7fc6b810630db87a6d0c2250b1f0ab4cf4d3c27a299b0cde78a4ed3fd9193
make_check=extended # avoid a circular dependency
if [ "$XBPS_CHECK_PKGS" = full ]; then
From a46c89e9740110e9ef5f38b0224181ef54025dfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:37:47 -0300
Subject: [PATCH 06/14] python3-lxml: update to 5.3.2.
---
.../patches/fix-encoding-tests-musl.patch | 19 -------------------
srcpkgs/python3-lxml/template | 13 +++++++------
2 files changed, 7 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch
diff --git a/srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch b/srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch
deleted file mode 100644
index e2d0e3b36bd572..00000000000000
--- a/srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-from alpine: https://gitlab.alpinelinux.org/alpine/aports/-/blob/3f64a63298ac78f5f2a50a52e3e3f01eef1b51ce/main/py3-lxml/tests-fix-encoding-name.patch
-
-diff --git a/src/lxml/tests/test_incremental_xmlfile.py b/src/lxml/tests/test_incremental_xmlfile.py
-index 3162155..43b79d7 100644
---- a/src/lxml/tests/test_incremental_xmlfile.py
-+++ b/src/lxml/tests/test_incremental_xmlfile.py
-@@ -177,10 +177,10 @@ class _XmlFileTestCaseBase(HelperTestCase):
- '<test>Comments: <!-- text -->\nEntities: &amp;</test>')
-
- def test_encoding(self):
-- with etree.xmlfile(self._file, encoding='utf16') as xf:
-+ with etree.xmlfile(self._file, encoding='utf-16') as xf:
- with xf.element('test'):
- xf.write('toast')
-- self.assertXml('<test>toast</test>', encoding='utf16')
-+ self.assertXml('<test>toast</test>', encoding='utf-16')
-
- def test_buffering(self):
- with etree.xmlfile(self._file, buffered=False) as xf:
diff --git a/srcpkgs/python3-lxml/template b/srcpkgs/python3-lxml/template
index 32ac3828139320..eea77cff063281 100644
--- a/srcpkgs/python3-lxml/template
+++ b/srcpkgs/python3-lxml/template
@@ -1,10 +1,10 @@
# Template file for 'python3-lxml'
pkgname=python3-lxml
-version=5.3.0
-revision=2
-build_style=python3-module
-make_build_args="--with-cython"
-hostmakedepends="python3-Cython python3-setuptools"
+version=5.3.2
+revision=1
+build_style=python3-pep517
+make_build_args="-C--build-option=--with-cython"
+hostmakedepends="python3-Cython python3-setuptools python3-wheel"
makedepends="libxslt-devel python3-devel"
depends="python3"
checkdepends="python3-cssselect python3-BeautifulSoup4 python3-html5lib"
@@ -14,7 +14,8 @@ license="BSD-3-Clause, custom:ElementTree"
homepage="https://lxml.de/"
changelog="https://raw.githubusercontent.com/lxml/lxml/master/CHANGES.txt"
distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz"
-checksum=eb22f7ceb319c29247cfa398435d00e6286d19a32b4870b67a8e9a38d72f2ebd
+checksum=902dcb7afa740ad722a7821f307047caebc53f81a2ca15610060d493ab501c8e
+make_check=extended # avoid a circular dependency
do_check() {
make test
From 06f65afdbce0bc9545848ed3760738d7fb7aac79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:47:25 -0300
Subject: [PATCH 07/14] python3-soupsieve: update to 2.6.
---
srcpkgs/python3-soupsieve/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
index 107604fec169b0..6abd6fe83ab3b0 100644
--- a/srcpkgs/python3-soupsieve/template
+++ b/srcpkgs/python3-soupsieve/template
@@ -1,7 +1,7 @@
# Template file for 'python3-soupsieve'
pkgname=python3-soupsieve
-version=2.4.1
-revision=3
+version=2.6
+revision=1
build_style=python3-pep517
hostmakedepends="hatchling"
depends="python3"
@@ -12,7 +12,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://facelessuser.github.io/soupsieve/"
distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
-checksum=89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea
+checksum=e2e68417777af359ec65daac1057404a3c8a5455bb8abc36f1a9866ab1a51abb
+make_check=extended # avoid a circular dependency
post_install() {
vlicense LICENSE.md
From c90e519517dc29eb1abf79254f06ed3309a2760a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:51:48 -0300
Subject: [PATCH 08/14] python3-BeautifulSoup4: update to 4.13.4.
---
srcpkgs/python3-BeautifulSoup4/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-BeautifulSoup4/template b/srcpkgs/python3-BeautifulSoup4/template
index 364445f875e54c..3bb906b2405f17 100644
--- a/srcpkgs/python3-BeautifulSoup4/template
+++ b/srcpkgs/python3-BeautifulSoup4/template
@@ -1,10 +1,10 @@
# Template file for 'python3-BeautifulSoup4'
pkgname=python3-BeautifulSoup4
-version=4.12.2
-revision=3
+version=4.13.4
+revision=1
build_style=python3-pep517
hostmakedepends="hatchling"
-depends="python3-soupsieve"
+depends="python3-soupsieve python3-typing_extensions"
checkdepends="$depends python3-pytest python3-html5lib python3-lxml"
short_desc="Python3 HTML/XML parser"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://www.crummy.com/software/BeautifulSoup"
changelog="https://git.launchpad.net/beautifulsoup/plain/CHANGELOG"
distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
-checksum=492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da
+checksum=dbb3c4e1ceae6aefebdaf2423247260cd062430a410e38c66f2baa50a8437195
post_install() {
vlicense LICENSE
From 08942ec8ca43aae226333ce575504eb5deb90c29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:05:07 -0300
Subject: [PATCH 09/14] python3-six: update to 1.17.0.
---
srcpkgs/python3-six/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-six/template b/srcpkgs/python3-six/template
index 2299770fb153c2..19b0812b9fd4e1 100644
--- a/srcpkgs/python3-six/template
+++ b/srcpkgs/python3-six/template
@@ -1,8 +1,8 @@
# Template file for 'python3-six'
pkgname=python3-six
-version=1.16.0
-revision=5
-build_style=python3-module
+version=1.17.0
+revision=1
+build_style=python3-pep517
hostmakedepends="python3-setuptools"
depends="python3"
checkdepends="python3-pytest"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/benjaminp/six"
changelog="https://raw.githubusercontent.com/benjaminp/six/master/CHANGES"
distfiles="${PYPI_SITE}/s/six/six-${version}.tar.gz"
-checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
+checksum=ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81
post_install() {
vlicense LICENSE
From 37835e47baf4e5641e672d87c9d7c9d427e4a98d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:05:22 -0300
Subject: [PATCH 10/14] python3-bleach: update to 6.2.0.
---
srcpkgs/python3-bleach/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-bleach/template b/srcpkgs/python3-bleach/template
index 8cf2201528c939..82f2797e85784b 100644
--- a/srcpkgs/python3-bleach/template
+++ b/srcpkgs/python3-bleach/template
@@ -1,7 +1,7 @@
# Template file for 'python3-bleach'
pkgname=python3-bleach
-version=6.0.0
-revision=3
+version=6.2.0
+revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
depends="python3-six python3-webencodings"
@@ -12,4 +12,4 @@ license="Apache-2.0"
homepage="https://github.com/mozilla/bleach"
changelog="https://raw.githubusercontent.com/mozilla/bleach/master/CHANGES"
distfiles="${PYPI_SITE}/b/bleach/bleach-${version}.tar.gz"
-checksum=1a1a85c1595e07d8db14c5f09f09e6433502c51c595970edc090551f0db99414
+checksum=123e894118b8a599fd80d3ec1a6d4cc7ce4e5882b1317a7e1ba69b56e95f991f
From 108f705f37ee9df4864690a5bf149b2c203190df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:05:26 -0300
Subject: [PATCH 11/14] python3-mistune: update to 3.1.3.
---
srcpkgs/python3-mistune/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-mistune/template b/srcpkgs/python3-mistune/template
index 828db5643c7a2e..2aba5c34737737 100644
--- a/srcpkgs/python3-mistune/template
+++ b/srcpkgs/python3-mistune/template
@@ -1,7 +1,7 @@
# Template file for 'python3-mistune'
pkgname=python3-mistune
-version=3.0.2
-revision=2
+version=3.1.3
+revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
depends="python3"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
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=fc7f93ded930c92394ef2cb6f04a8aabab4117a91449e72dcc8dfa646a508be8
+checksum=a7035c21782b2becb6be62f8f25d3df81ccb4d6fa477a6525b15af06539f02a0
post_install() {
vlicense LICENSE
From c4162ab6451463b5a920ef521fdad695ba9071bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:05:30 -0300
Subject: [PATCH 12/14] python3-pandocfilters: update to 1.5.1.
---
srcpkgs/python3-pandocfilters/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pandocfilters/template b/srcpkgs/python3-pandocfilters/template
index 45e58c9c94ddeb..ab7efec72a7899 100644
--- a/srcpkgs/python3-pandocfilters/template
+++ b/srcpkgs/python3-pandocfilters/template
@@ -1,8 +1,8 @@
# Template file for 'python3-pandocfilters'
pkgname=python3-pandocfilters
-version=1.5.0
-revision=2
-build_style=python3-module
+version=1.5.1
+revision=1
+build_style=python3-pep517
hostmakedepends="python3-setuptools"
depends="python3"
short_desc="Python3 module for writing pandoc filters"
@@ -10,7 +10,8 @@ maintainer="Eloi Torrents <eloitor@disroot.org>"
license="BSD-3-Clause"
homepage="http://github.com/jgm/pandocfilters"
distfiles="${PYPI_SITE}/p/pandocfilters/pandocfilters-${version}.tar.gz"
-checksum=0b679503337d233b4339a817bfc8c50064e2eff681314376a47cb582305a7a38
+checksum=002b4a555ee4ebc03f8b66307e287fa492e4a77b4ea14d3f934328297bb4939e
+make_check=no # Upstream defines no tests
post_install() {
vlicense LICENSE
From c26f8c614040db04f2a04d3289c27942ff3956ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 11:45:59 -0300
Subject: [PATCH 13/14] hooks/pre-pkg/06-verify-python-deps: support
alternative packages
---
common/scripts/parse-py-metadata.py | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/common/scripts/parse-py-metadata.py b/common/scripts/parse-py-metadata.py
index 0d9384bf7ef36c..909244d80804f1 100644
--- a/common/scripts/parse-py-metadata.py
+++ b/common/scripts/parse-py-metadata.py
@@ -123,7 +123,8 @@ def parse_depends(args):
pkg = getpkgname(pkgver)
vpkg = map(getpkgname, vpkgvers.split())
for v in vpkg:
- vpkgs[v] = pkg
+ if pkg not in vpkgs.setdefault(v, []):
+ vpkgs[v].append(pkg)
if args.rdeps.exists():
with args.rdeps.open() as f:
@@ -149,12 +150,17 @@ def parse_depends(args):
missing = []
for k in depends.keys():
if k in vpkgs.keys():
- pkgname = vpkgs[k]
- if pkgname in rdeps:
- print(f" PYTHON: {k} <-> {pkgname}", flush=True)
- elif pkgname in global_ignore:
- print(f" PYTHON: {k} <-> {pkgname} (ignored)", flush=True)
+ for pkgname in vpkgs[k]:
+ if pkgname in rdeps:
+ print(f" PYTHON: {k} <-> {pkgname}", flush=True)
+ break
+ elif pkgname in global_ignore:
+ print(f" PYTHON: {k} <-> {pkgname} (ignored)", flush=True)
+ break
else:
+ pkgname = " OR ".join(vpkgs[k])
+ if len(vpkgs[k]) > 1:
+ pkgname = "(" + pkgname + ")"
msg_err(f" PYTHON: {k} <-> {pkgname} NOT IN depends PLEASE FIX!",
nocolor=args.nocolor, strict=args.strict)
missing.append(pkgname)
From dbc8e8c36cabd92ab612f2026f0c7ff3b112b8c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:10:39 -0300
Subject: [PATCH 14/14] python3-jupyter_nbconvert: update to 7.16.6.
---
srcpkgs/python3-jupyter_nbconvert/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template
index 3bf3da5423c28b..1f6a1be11d816d 100644
--- a/srcpkgs/python3-jupyter_nbconvert/template
+++ b/srcpkgs/python3-jupyter_nbconvert/template
@@ -1,23 +1,23 @@
# Template file for 'python3-jupyter_nbconvert'
pkgname=python3-jupyter_nbconvert
-version=7.16.4
-revision=2
+version=7.16.6
+revision=1
build_style=python3-pep517
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 python3-PyQt5"
+ python3-Pygments python3-traitlets python3-tinycss2"
+checkdepends="$depends python3-pytest-xdist python3-jupyter_ipywidgets
+ asciidoc inkscape pandoc python3-flaky python3-PyQt5 python3-ipython_ipykernel"
short_desc="Converting Jupyter notebooks"
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=86ca91ba266b0a448dc96fa6c5b9d98affabde2867b363258703536807f9f7f4
+checksum=576a7e37c6480da7b8465eefa66c17844243816ce1ccc372633c6b71c3c0f582
pre_check() {
# templates must be in $JUPYTER_DATA_DIR/nbconvert/templates
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] python3-jupyter_nbconvert: update to 7.16.6.
2025-02-25 15:06 [PR PATCH] python3-jupyter_nbconvert: update to 7.16.6 tornaria
2025-02-25 15:10 ` tornaria
2025-04-18 13:47 ` [PR PATCH] [Updated] " tornaria
@ 2025-04-19 3:37 ` tornaria
2025-05-01 23:25 ` tornaria
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: tornaria @ 2025-04-19 3:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1757 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages nbconvert
https://github.com/void-linux/void-packages/pull/54489
python3-jupyter_nbconvert: update to 7.16.6.
- **python3-pytest-asyncio: update to 0.25.3.**
- **python3-xmltodict: update to 0.14.2.**
- **python3-nbclient: update to 0.10.2.**
- **python3-lxml: update to 5.3.1.**
- **python3-soupsieve: update to 2.6.**
- **python3-BeautifulSoup4: update to 4.13.3.**
- **python3-six: update to 1.17.0.**
- **python3-bleach: update to 6.2.0.**
- **python3-mistune: update to 3.1.2.**
- **python3-pandocfilters: update to 1.5.1.**
- **python3-jupyter_nbconvert: update to 7.16.6.**
This also includes #54482 and #54488.
<!-- 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/54489.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nbconvert-54489.patch --]
[-- Type: text/x-diff, Size: 29533 bytes --]
From 01321669147b5a655ade9e8e77c13b07464b87b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 24 Feb 2025 19:31:05 -0300
Subject: [PATCH 01/15] python3-jupyter_widgetsnbextension: update to 4.0.14.
---
srcpkgs/python3-jupyter_widgetsnbextension/template | 8 ++++----
srcpkgs/python3-jupyter_widgetsnbextension/update | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-jupyter_widgetsnbextension/template b/srcpkgs/python3-jupyter_widgetsnbextension/template
index 82146ccfd62d32..068b3364560be1 100644
--- a/srcpkgs/python3-jupyter_widgetsnbextension/template
+++ b/srcpkgs/python3-jupyter_widgetsnbextension/template
@@ -1,15 +1,15 @@
# Template file for 'python3-jupyter_widgetsnbextension'
pkgname=python3-jupyter_widgetsnbextension
-version=4.0.11
-revision=2
+version=4.0.14
+revision=1
build_style=python3-pep517
hostmakedepends="python3-jupyter_packaging"
short_desc="Interactive HTML widgets for Jupyter notebooks"
maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
-homepage="https://pypi.org/project/widgetsnbextension/"
+homepage="https://github.com/jupyter-widgets/ipywidgets/tree/main/python/widgetsnbextension"
distfiles="${PYPI_SITE}/w/widgetsnbextension/widgetsnbextension-${version}.tar.gz"
-checksum=8b22a8f1910bfd188e596fe7fc05dcbd87e810c8a4ba010bdb3da86637398474
+checksum=a3629b04e3edb893212df862038c7232f62973373869db5084aed739b437b5af
make_check=no # Upstream defines no tests
post_install() {
diff --git a/srcpkgs/python3-jupyter_widgetsnbextension/update b/srcpkgs/python3-jupyter_widgetsnbextension/update
index d6944b34c12eb0..0e9e4528c1915f 100644
--- a/srcpkgs/python3-jupyter_widgetsnbextension/update
+++ b/srcpkgs/python3-jupyter_widgetsnbextension/update
@@ -1,2 +1,3 @@
pkgname=widgetsnbextension
+site=https://pypi.org/simple/widgetsnbextension
ignore="*a* *b* *rc*"
From 38c647957119693b00e736e47db9e2e52fb1205e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 24 Feb 2025 19:36:50 -0300
Subject: [PATCH 02/15] New package: python3-jupyterlab_widgets-3.0.14
---
.../patches/no-jupyterlab.patch | 9 +++++++++
srcpkgs/python3-jupyterlab_widgets/template | 18 ++++++++++++++++++
srcpkgs/python3-jupyterlab_widgets/update | 3 +++
3 files changed, 30 insertions(+)
create mode 100644 srcpkgs/python3-jupyterlab_widgets/patches/no-jupyterlab.patch
create mode 100644 srcpkgs/python3-jupyterlab_widgets/template
create mode 100644 srcpkgs/python3-jupyterlab_widgets/update
diff --git a/srcpkgs/python3-jupyterlab_widgets/patches/no-jupyterlab.patch b/srcpkgs/python3-jupyterlab_widgets/patches/no-jupyterlab.patch
new file mode 100644
index 00000000000000..7f78d11497f9ac
--- /dev/null
+++ b/srcpkgs/python3-jupyterlab_widgets/patches/no-jupyterlab.patch
@@ -0,0 +1,9 @@
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,5 +1,5 @@
+ [build-system]
+-requires = ["jupyter_packaging~=0.10,<2", "jupyterlab~=4.0"]
++requires = ["jupyter_packaging~=0.10,<2"]
+ build-backend = "jupyter_packaging.build_api"
+
+ [tool.jupyter-packaging.options]
diff --git a/srcpkgs/python3-jupyterlab_widgets/template b/srcpkgs/python3-jupyterlab_widgets/template
new file mode 100644
index 00000000000000..b36a7642f2415d
--- /dev/null
+++ b/srcpkgs/python3-jupyterlab_widgets/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-jupyterlab_widgets'
+pkgname=python3-jupyterlab_widgets
+version=3.0.14
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-jupyter_packaging"
+depends="python3"
+short_desc="Jupyter interactive widgets for JupyterLab"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyter-widgets/ipywidgets/tree/main/python/jupyterlab_widgets"
+distfiles="${PYPI_SITE}/j/jupyterlab_widgets/jupyterlab_widgets-${version}.tar.gz"
+checksum=bad03e59546869f026e537e0d170e454259e6dc7048e14041707ca31e523c8a1
+make_check=no # Upstream defines no tests
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python3-jupyterlab_widgets/update b/srcpkgs/python3-jupyterlab_widgets/update
new file mode 100644
index 00000000000000..8226cf8d087698
--- /dev/null
+++ b/srcpkgs/python3-jupyterlab_widgets/update
@@ -0,0 +1,3 @@
+pkgname=jupyterlab_widgets
+site=https://pypi.org/simple/jupyterlab_widgets
+ignore="*a* *b* *rc*"
From 0861a02d3cb599a70ff9cc34129d4e7cda391ef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 24 Feb 2025 19:39:43 -0300
Subject: [PATCH 03/15] python3-jupyter_ipywidgets: update to 8.1.6.
---
.../patches/pytest8.patch | 93 -------------------
srcpkgs/python3-jupyter_ipywidgets/template | 12 ++-
srcpkgs/python3-jupyter_ipywidgets/update | 1 +
3 files changed, 8 insertions(+), 98 deletions(-)
delete mode 100644 srcpkgs/python3-jupyter_ipywidgets/patches/pytest8.patch
diff --git a/srcpkgs/python3-jupyter_ipywidgets/patches/pytest8.patch b/srcpkgs/python3-jupyter_ipywidgets/patches/pytest8.patch
deleted file mode 100644
index 2f8499a3ae76b9..00000000000000
--- a/srcpkgs/python3-jupyter_ipywidgets/patches/pytest8.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-See: https://github.com/jupyter-widgets/ipywidgets/pull/3903
-
-From bbc6c064aa797eb21bd5a9b441dbbc76925a72db Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Thu, 11 Apr 2024 11:40:15 +0200
-Subject: [PATCH] Fix compatibility with pytest 8
-
-Resolves: https://github.com/jupyter-widgets/ipywidgets/issues/3883
----
- .../ipywidgets/ipywidgets/widgets/tests/test_interaction.py | 2 --
- python/ipywidgets/ipywidgets/widgets/tests/test_link.py | 1 -
- .../ipywidgets/ipywidgets/widgets/tests/test_send_state.py | 2 +-
- .../ipywidgets/ipywidgets/widgets/tests/test_set_state.py | 2 +-
- python/ipywidgets/ipywidgets/widgets/tests/utils.py | 6 +++---
- 5 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/test_interaction.py b/python/ipywidgets/ipywidgets/widgets/tests/test_interaction.py
-index 0dc7e5fcfc..feb1afe50c 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/test_interaction.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/test_interaction.py
-@@ -19,8 +19,6 @@
- # Utility stuff
- #-----------------------------------------------------------------------------
-
--from .utils import setup, teardown
--
- def f(**kwargs):
- pass
-
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/test_link.py b/python/ipywidgets/ipywidgets/widgets/tests/test_link.py
-index 0c92dfdcb2..9301764d40 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/test_link.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/test_link.py
-@@ -4,7 +4,6 @@
- import pytest
-
- from .. import jslink, jsdlink, ToggleButton
--from .utils import setup, teardown
-
- def test_jslink_args():
- with pytest.raises(TypeError):
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/test_send_state.py b/python/ipywidgets/ipywidgets/widgets/tests/test_send_state.py
-index ec18ae4af1..98465b9b7d 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/test_send_state.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/test_send_state.py
-@@ -3,7 +3,7 @@
-
- from traitlets import Bool, Tuple, List
-
--from .utils import setup, teardown, DummyComm
-+from .utils import setup
-
- from ..widget import Widget
-
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/test_set_state.py b/python/ipywidgets/ipywidgets/widgets/tests/test_set_state.py
-index 82ecbd9311..22ec54d90f 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/test_set_state.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/test_set_state.py
-@@ -6,7 +6,7 @@
-
- from traitlets import Bool, Tuple, List, Instance, CFloat, CInt, Float, Int, TraitError, observe
-
--from .utils import setup, teardown
-+from .utils import setup
-
- import ipywidgets
- from ipywidgets import Widget
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/utils.py b/python/ipywidgets/ipywidgets/widgets/tests/utils.py
-index 260485e3f8..8dbbcb355b 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/utils.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/utils.py
-@@ -12,7 +12,7 @@
- NEW_COMM_PACKAGE = False
-
- import ipykernel.comm
--
-+import pytest
-
- class DummyComm():
- comm_id = 'a-b-c-d'
-@@ -87,10 +87,10 @@ def teardown_test_comm():
- setattr(Widget, attr, value)
- _widget_attrs.clear()
-
-+@pytest.fixture(autouse=True)
- def setup():
- setup_test_comm()
--
--def teardown():
-+ yield
- teardown_test_comm()
-
- def call_method(method, *args, **kwargs):
diff --git a/srcpkgs/python3-jupyter_ipywidgets/template b/srcpkgs/python3-jupyter_ipywidgets/template
index da7840682a6178..0df8341d1e1814 100644
--- a/srcpkgs/python3-jupyter_ipywidgets/template
+++ b/srcpkgs/python3-jupyter_ipywidgets/template
@@ -1,18 +1,20 @@
# Template file for 'python3-jupyter_ipywidgets'
pkgname=python3-jupyter_ipywidgets
-version=8.1.3
-revision=2
+version=8.1.6
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel"
-depends="python3-ipython_ipykernel python3-jupyter_widgetsnbextension"
-checkdepends="$depends python3-pytest python3-jsonschema python3-pytz"
+depends="python3-comm python3-ipython python3-traitlets
+ python3-jupyter_widgetsnbextension python3-jupyterlab_widgets"
+checkdepends="$depends python3-pytest python3-jsonschema python3-pytz
+ python3-ipython_ipykernel"
short_desc="IPython widgets for the Jupyter notebook"
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=f5f9eeaae082b1823ce9eac2575272952f40d748893972956dc09700a6392d9c
+checksum=d8ace49c66f14419fc66071371b99d01bed230bbc15d8a60233b18bfbd782851
# main repo `.../python/ipywidgets/ipywidgets/` is `.../ipywidgets/` here
patch_args=-Np3
diff --git a/srcpkgs/python3-jupyter_ipywidgets/update b/srcpkgs/python3-jupyter_ipywidgets/update
index 44da8f2e3c582e..eb8d6c97887770 100644
--- a/srcpkgs/python3-jupyter_ipywidgets/update
+++ b/srcpkgs/python3-jupyter_ipywidgets/update
@@ -1,2 +1,3 @@
pkgname=ipywidgets
+site=https://pypi.org/simple/ipywidgets
ignore="*a* *b* *rc*"
From 3d64bd2e26c5aa83d010d853ee6bdb90626ece4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 18 Apr 2025 16:12:02 -0300
Subject: [PATCH 04/15] python3-pytest-asyncio: update to 0.26.0.
---
srcpkgs/python3-pytest-asyncio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pytest-asyncio/template b/srcpkgs/python3-pytest-asyncio/template
index f1ca23d6a818d5..4d067f0213566f 100644
--- a/srcpkgs/python3-pytest-asyncio/template
+++ b/srcpkgs/python3-pytest-asyncio/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pytest-asyncio'
pkgname=python3-pytest-asyncio
-version=0.25.3
+version=0.26.0
revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools_scm python3-wheel"
@@ -12,7 +12,7 @@ license="Apache-2.0"
homepage="https://github.com/pytest-dev/pytest-asyncio"
changelog="https://raw.githubusercontent.com/pytest-dev/pytest-asyncio/master/docs/source/reference/changelog.rst"
distfiles="${PYPI_SITE}/p/pytest-asyncio/pytest_asyncio-${version}.tar.gz"
-checksum=fc1da2cf9f125ada7e710b4ddad05518d4cee187ae9412e9ac9271003497f07a
+checksum=c4df2a697648241ff39e7f0e4a73050b03f123f760673956cf0d72a4990e312f
if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
# these tests fail on CI (bind to a tcp address)
From 77b342b568eba84ed00929e797b92f06bd0208c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:21:39 -0300
Subject: [PATCH 05/15] python3-xmltodict: update to 0.14.2.
---
srcpkgs/python3-xmltodict/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-xmltodict/template b/srcpkgs/python3-xmltodict/template
index cf444ee312210f..abe56821b12a5e 100644
--- a/srcpkgs/python3-xmltodict/template
+++ b/srcpkgs/python3-xmltodict/template
@@ -1,8 +1,8 @@
# Template file for 'python3-xmltodict'
pkgname=python3-xmltodict
-version=0.13.0
-revision=3
-build_style=python3-module
+version=0.14.2
+revision=1
+build_style=python3-pep517
hostmakedepends="python3-setuptools"
depends="python3"
checkdepends="python3-pytest"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/martinblech/xmltodict"
changelog="https://raw.githubusercontent.com/martinblech/xmltodict/master/CHANGELOG.md"
distfiles="${PYPI_SITE}/x/xmltodict/xmltodict-${version}.tar.gz"
-checksum=341595a488e3e01a85a9d8911d8912fd922ede5fecc4dce437eb4b6c8d037e56
+checksum=201e7c28bb210e374999d1dde6382923ab0ed1a8a5faeece48ab525b7810a553
post_install() {
vlicense LICENSE
From 37b3f6c0cee31c32cae1647ab727301a0442d2fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:21:44 -0300
Subject: [PATCH 06/15] python3-nbclient: update to 0.10.2.
---
srcpkgs/python3-nbclient/template | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/python3-nbclient/template b/srcpkgs/python3-nbclient/template
index 3bf13e904a1d0c..b2666af9d1a1d9 100644
--- a/srcpkgs/python3-nbclient/template
+++ b/srcpkgs/python3-nbclient/template
@@ -1,25 +1,21 @@
# Template file for 'python3-nbclient'
pkgname=python3-nbclient
-version=0.10.0
-revision=2
+version=0.10.2
+revision=1
build_style=python3-pep517
hostmakedepends="hatchling"
-depends="python3-jupyter_client python3-jupyter_nbformat"
+depends="python3-jupyter_client python3-jupyter_core python3-jupyter_nbformat
+ python3-traitlets"
checkdepends="$depends python3-pytest-asyncio python3-testpath
- python3-flaky python3-jupyter_ipywidgets python3-xmltodict"
+ python3-flaky python3-jupyter_ipywidgets python3-xmltodict
+ python3-ipython_ipykernel python3-jupyter_nbconvert"
short_desc="Client library for executing Jupyter notebooks"
maintainer="dkwo <npiazza@disroot.org>, Gonzalo Tornaría <tornaria@cmat.edu.uy>"
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=4b3f1b7dba531e498449c4db4f53da339c91d449dc11e9af3a43b4eb5c5abb09
-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
+checksum=90b7fc6b810630db87a6d0c2250b1f0ab4cf4d3c27a299b0cde78a4ed3fd9193
post_install() {
vlicense LICENSE
From 3a8bbbf528c42898f78295ed77be3f2b6de15c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:37:47 -0300
Subject: [PATCH 07/15] python3-lxml: update to 5.3.2.
---
.../patches/fix-encoding-tests-musl.patch | 19 -------------------
srcpkgs/python3-lxml/template | 13 +++++++------
2 files changed, 7 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch
diff --git a/srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch b/srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch
deleted file mode 100644
index e2d0e3b36bd572..00000000000000
--- a/srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-from alpine: https://gitlab.alpinelinux.org/alpine/aports/-/blob/3f64a63298ac78f5f2a50a52e3e3f01eef1b51ce/main/py3-lxml/tests-fix-encoding-name.patch
-
-diff --git a/src/lxml/tests/test_incremental_xmlfile.py b/src/lxml/tests/test_incremental_xmlfile.py
-index 3162155..43b79d7 100644
---- a/src/lxml/tests/test_incremental_xmlfile.py
-+++ b/src/lxml/tests/test_incremental_xmlfile.py
-@@ -177,10 +177,10 @@ class _XmlFileTestCaseBase(HelperTestCase):
- '<test>Comments: <!-- text -->\nEntities: &amp;</test>')
-
- def test_encoding(self):
-- with etree.xmlfile(self._file, encoding='utf16') as xf:
-+ with etree.xmlfile(self._file, encoding='utf-16') as xf:
- with xf.element('test'):
- xf.write('toast')
-- self.assertXml('<test>toast</test>', encoding='utf16')
-+ self.assertXml('<test>toast</test>', encoding='utf-16')
-
- def test_buffering(self):
- with etree.xmlfile(self._file, buffered=False) as xf:
diff --git a/srcpkgs/python3-lxml/template b/srcpkgs/python3-lxml/template
index 32ac3828139320..eea77cff063281 100644
--- a/srcpkgs/python3-lxml/template
+++ b/srcpkgs/python3-lxml/template
@@ -1,10 +1,10 @@
# Template file for 'python3-lxml'
pkgname=python3-lxml
-version=5.3.0
-revision=2
-build_style=python3-module
-make_build_args="--with-cython"
-hostmakedepends="python3-Cython python3-setuptools"
+version=5.3.2
+revision=1
+build_style=python3-pep517
+make_build_args="-C--build-option=--with-cython"
+hostmakedepends="python3-Cython python3-setuptools python3-wheel"
makedepends="libxslt-devel python3-devel"
depends="python3"
checkdepends="python3-cssselect python3-BeautifulSoup4 python3-html5lib"
@@ -14,7 +14,8 @@ license="BSD-3-Clause, custom:ElementTree"
homepage="https://lxml.de/"
changelog="https://raw.githubusercontent.com/lxml/lxml/master/CHANGES.txt"
distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz"
-checksum=eb22f7ceb319c29247cfa398435d00e6286d19a32b4870b67a8e9a38d72f2ebd
+checksum=902dcb7afa740ad722a7821f307047caebc53f81a2ca15610060d493ab501c8e
+make_check=extended # avoid a circular dependency
do_check() {
make test
From f9d155b575e379d42555b17ad04cfff0b684f3d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:47:25 -0300
Subject: [PATCH 08/15] python3-soupsieve: update to 2.6.
---
srcpkgs/python3-soupsieve/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
index 107604fec169b0..0de01088fe8c84 100644
--- a/srcpkgs/python3-soupsieve/template
+++ b/srcpkgs/python3-soupsieve/template
@@ -1,7 +1,7 @@
# Template file for 'python3-soupsieve'
pkgname=python3-soupsieve
-version=2.4.1
-revision=3
+version=2.6
+revision=1
build_style=python3-pep517
hostmakedepends="hatchling"
depends="python3"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://facelessuser.github.io/soupsieve/"
distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
-checksum=89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea
+checksum=e2e68417777af359ec65daac1057404a3c8a5455bb8abc36f1a9866ab1a51abb
post_install() {
vlicense LICENSE.md
From 2445d837f656b60d50f5897fdb39e2371153b79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:51:48 -0300
Subject: [PATCH 09/15] python3-BeautifulSoup4: update to 4.13.4.
---
srcpkgs/python3-BeautifulSoup4/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-BeautifulSoup4/template b/srcpkgs/python3-BeautifulSoup4/template
index 364445f875e54c..3bb906b2405f17 100644
--- a/srcpkgs/python3-BeautifulSoup4/template
+++ b/srcpkgs/python3-BeautifulSoup4/template
@@ -1,10 +1,10 @@
# Template file for 'python3-BeautifulSoup4'
pkgname=python3-BeautifulSoup4
-version=4.12.2
-revision=3
+version=4.13.4
+revision=1
build_style=python3-pep517
hostmakedepends="hatchling"
-depends="python3-soupsieve"
+depends="python3-soupsieve python3-typing_extensions"
checkdepends="$depends python3-pytest python3-html5lib python3-lxml"
short_desc="Python3 HTML/XML parser"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://www.crummy.com/software/BeautifulSoup"
changelog="https://git.launchpad.net/beautifulsoup/plain/CHANGELOG"
distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
-checksum=492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da
+checksum=dbb3c4e1ceae6aefebdaf2423247260cd062430a410e38c66f2baa50a8437195
post_install() {
vlicense LICENSE
From c606885b4de22e71a228c4a1c526039ef4da2310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:05:07 -0300
Subject: [PATCH 10/15] python3-six: update to 1.17.0.
---
srcpkgs/python3-six/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-six/template b/srcpkgs/python3-six/template
index 2299770fb153c2..19b0812b9fd4e1 100644
--- a/srcpkgs/python3-six/template
+++ b/srcpkgs/python3-six/template
@@ -1,8 +1,8 @@
# Template file for 'python3-six'
pkgname=python3-six
-version=1.16.0
-revision=5
-build_style=python3-module
+version=1.17.0
+revision=1
+build_style=python3-pep517
hostmakedepends="python3-setuptools"
depends="python3"
checkdepends="python3-pytest"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/benjaminp/six"
changelog="https://raw.githubusercontent.com/benjaminp/six/master/CHANGES"
distfiles="${PYPI_SITE}/s/six/six-${version}.tar.gz"
-checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
+checksum=ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81
post_install() {
vlicense LICENSE
From a7c4ae219f57963b492f4ff28d88a0c44cafc2c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:05:22 -0300
Subject: [PATCH 11/15] python3-bleach: update to 6.2.0.
---
srcpkgs/python3-bleach/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-bleach/template b/srcpkgs/python3-bleach/template
index 8cf2201528c939..82f2797e85784b 100644
--- a/srcpkgs/python3-bleach/template
+++ b/srcpkgs/python3-bleach/template
@@ -1,7 +1,7 @@
# Template file for 'python3-bleach'
pkgname=python3-bleach
-version=6.0.0
-revision=3
+version=6.2.0
+revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
depends="python3-six python3-webencodings"
@@ -12,4 +12,4 @@ license="Apache-2.0"
homepage="https://github.com/mozilla/bleach"
changelog="https://raw.githubusercontent.com/mozilla/bleach/master/CHANGES"
distfiles="${PYPI_SITE}/b/bleach/bleach-${version}.tar.gz"
-checksum=1a1a85c1595e07d8db14c5f09f09e6433502c51c595970edc090551f0db99414
+checksum=123e894118b8a599fd80d3ec1a6d4cc7ce4e5882b1317a7e1ba69b56e95f991f
From ec2b80202323a9607c485e9cc07ca8cb99fa07b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:05:26 -0300
Subject: [PATCH 12/15] python3-mistune: update to 3.1.3.
---
srcpkgs/python3-mistune/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-mistune/template b/srcpkgs/python3-mistune/template
index 828db5643c7a2e..2aba5c34737737 100644
--- a/srcpkgs/python3-mistune/template
+++ b/srcpkgs/python3-mistune/template
@@ -1,7 +1,7 @@
# Template file for 'python3-mistune'
pkgname=python3-mistune
-version=3.0.2
-revision=2
+version=3.1.3
+revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
depends="python3"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
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=fc7f93ded930c92394ef2cb6f04a8aabab4117a91449e72dcc8dfa646a508be8
+checksum=a7035c21782b2becb6be62f8f25d3df81ccb4d6fa477a6525b15af06539f02a0
post_install() {
vlicense LICENSE
From bc88dbf1267bbae7b5c7d8627aabfd82ba563284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:05:30 -0300
Subject: [PATCH 13/15] python3-pandocfilters: update to 1.5.1.
---
srcpkgs/python3-pandocfilters/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pandocfilters/template b/srcpkgs/python3-pandocfilters/template
index 45e58c9c94ddeb..ab7efec72a7899 100644
--- a/srcpkgs/python3-pandocfilters/template
+++ b/srcpkgs/python3-pandocfilters/template
@@ -1,8 +1,8 @@
# Template file for 'python3-pandocfilters'
pkgname=python3-pandocfilters
-version=1.5.0
-revision=2
-build_style=python3-module
+version=1.5.1
+revision=1
+build_style=python3-pep517
hostmakedepends="python3-setuptools"
depends="python3"
short_desc="Python3 module for writing pandoc filters"
@@ -10,7 +10,8 @@ maintainer="Eloi Torrents <eloitor@disroot.org>"
license="BSD-3-Clause"
homepage="http://github.com/jgm/pandocfilters"
distfiles="${PYPI_SITE}/p/pandocfilters/pandocfilters-${version}.tar.gz"
-checksum=0b679503337d233b4339a817bfc8c50064e2eff681314376a47cb582305a7a38
+checksum=002b4a555ee4ebc03f8b66307e287fa492e4a77b4ea14d3f934328297bb4939e
+make_check=no # Upstream defines no tests
post_install() {
vlicense LICENSE
From 05fa58a9f7ac8403885cbc19e054840dc983c8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 11:45:59 -0300
Subject: [PATCH 14/15] hooks/pre-pkg/06-verify-python-deps: support
alternative packages
---
common/scripts/parse-py-metadata.py | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/common/scripts/parse-py-metadata.py b/common/scripts/parse-py-metadata.py
index 0d9384bf7ef36c..909244d80804f1 100644
--- a/common/scripts/parse-py-metadata.py
+++ b/common/scripts/parse-py-metadata.py
@@ -123,7 +123,8 @@ def parse_depends(args):
pkg = getpkgname(pkgver)
vpkg = map(getpkgname, vpkgvers.split())
for v in vpkg:
- vpkgs[v] = pkg
+ if pkg not in vpkgs.setdefault(v, []):
+ vpkgs[v].append(pkg)
if args.rdeps.exists():
with args.rdeps.open() as f:
@@ -149,12 +150,17 @@ def parse_depends(args):
missing = []
for k in depends.keys():
if k in vpkgs.keys():
- pkgname = vpkgs[k]
- if pkgname in rdeps:
- print(f" PYTHON: {k} <-> {pkgname}", flush=True)
- elif pkgname in global_ignore:
- print(f" PYTHON: {k} <-> {pkgname} (ignored)", flush=True)
+ for pkgname in vpkgs[k]:
+ if pkgname in rdeps:
+ print(f" PYTHON: {k} <-> {pkgname}", flush=True)
+ break
+ elif pkgname in global_ignore:
+ print(f" PYTHON: {k} <-> {pkgname} (ignored)", flush=True)
+ break
else:
+ pkgname = " OR ".join(vpkgs[k])
+ if len(vpkgs[k]) > 1:
+ pkgname = "(" + pkgname + ")"
msg_err(f" PYTHON: {k} <-> {pkgname} NOT IN depends PLEASE FIX!",
nocolor=args.nocolor, strict=args.strict)
missing.append(pkgname)
From 61dfdd9effb56aafcf976cf222da63c75228edf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:10:39 -0300
Subject: [PATCH 15/15] python3-jupyter_nbconvert: update to 7.16.6.
---
srcpkgs/python3-jupyter_nbconvert/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template
index 3bf3da5423c28b..1f6a1be11d816d 100644
--- a/srcpkgs/python3-jupyter_nbconvert/template
+++ b/srcpkgs/python3-jupyter_nbconvert/template
@@ -1,23 +1,23 @@
# Template file for 'python3-jupyter_nbconvert'
pkgname=python3-jupyter_nbconvert
-version=7.16.4
-revision=2
+version=7.16.6
+revision=1
build_style=python3-pep517
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 python3-PyQt5"
+ python3-Pygments python3-traitlets python3-tinycss2"
+checkdepends="$depends python3-pytest-xdist python3-jupyter_ipywidgets
+ asciidoc inkscape pandoc python3-flaky python3-PyQt5 python3-ipython_ipykernel"
short_desc="Converting Jupyter notebooks"
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=86ca91ba266b0a448dc96fa6c5b9d98affabde2867b363258703536807f9f7f4
+checksum=576a7e37c6480da7b8465eefa66c17844243816ce1ccc372633c6b71c3c0f582
pre_check() {
# templates must be in $JUPYTER_DATA_DIR/nbconvert/templates
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] python3-jupyter_nbconvert: update to 7.16.6.
2025-02-25 15:06 [PR PATCH] python3-jupyter_nbconvert: update to 7.16.6 tornaria
` (2 preceding siblings ...)
2025-04-19 3:37 ` tornaria
@ 2025-05-01 23:25 ` tornaria
2025-05-07 23:23 ` tornaria
2025-05-07 23:23 ` [PR PATCH] [Closed]: " tornaria
5 siblings, 0 replies; 7+ messages in thread
From: tornaria @ 2025-05-01 23:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1757 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages nbconvert
https://github.com/void-linux/void-packages/pull/54489
python3-jupyter_nbconvert: update to 7.16.6.
- **python3-pytest-asyncio: update to 0.25.3.**
- **python3-xmltodict: update to 0.14.2.**
- **python3-nbclient: update to 0.10.2.**
- **python3-lxml: update to 5.3.1.**
- **python3-soupsieve: update to 2.6.**
- **python3-BeautifulSoup4: update to 4.13.3.**
- **python3-six: update to 1.17.0.**
- **python3-bleach: update to 6.2.0.**
- **python3-mistune: update to 3.1.2.**
- **python3-pandocfilters: update to 1.5.1.**
- **python3-jupyter_nbconvert: update to 7.16.6.**
This also includes #54482 and #54488.
<!-- 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/54489.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nbconvert-54489.patch --]
[-- Type: text/x-diff, Size: 29674 bytes --]
From f8d2fa6afb2709aef9e98064a81ac8bb1c280678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 24 Feb 2025 19:31:05 -0300
Subject: [PATCH 01/15] python3-jupyter_widgetsnbextension: update to 4.0.14.
---
srcpkgs/python3-jupyter_widgetsnbextension/template | 8 ++++----
srcpkgs/python3-jupyter_widgetsnbextension/update | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-jupyter_widgetsnbextension/template b/srcpkgs/python3-jupyter_widgetsnbextension/template
index 82146ccfd62d32..068b3364560be1 100644
--- a/srcpkgs/python3-jupyter_widgetsnbextension/template
+++ b/srcpkgs/python3-jupyter_widgetsnbextension/template
@@ -1,15 +1,15 @@
# Template file for 'python3-jupyter_widgetsnbextension'
pkgname=python3-jupyter_widgetsnbextension
-version=4.0.11
-revision=2
+version=4.0.14
+revision=1
build_style=python3-pep517
hostmakedepends="python3-jupyter_packaging"
short_desc="Interactive HTML widgets for Jupyter notebooks"
maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
-homepage="https://pypi.org/project/widgetsnbextension/"
+homepage="https://github.com/jupyter-widgets/ipywidgets/tree/main/python/widgetsnbextension"
distfiles="${PYPI_SITE}/w/widgetsnbextension/widgetsnbextension-${version}.tar.gz"
-checksum=8b22a8f1910bfd188e596fe7fc05dcbd87e810c8a4ba010bdb3da86637398474
+checksum=a3629b04e3edb893212df862038c7232f62973373869db5084aed739b437b5af
make_check=no # Upstream defines no tests
post_install() {
diff --git a/srcpkgs/python3-jupyter_widgetsnbextension/update b/srcpkgs/python3-jupyter_widgetsnbextension/update
index d6944b34c12eb0..0e9e4528c1915f 100644
--- a/srcpkgs/python3-jupyter_widgetsnbextension/update
+++ b/srcpkgs/python3-jupyter_widgetsnbextension/update
@@ -1,2 +1,3 @@
pkgname=widgetsnbextension
+site=https://pypi.org/simple/widgetsnbextension
ignore="*a* *b* *rc*"
From 840394bf5f897835bd48d2ccfe113b3e017c0bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 24 Feb 2025 19:36:50 -0300
Subject: [PATCH 02/15] New package: python3-jupyterlab_widgets-3.0.14
---
.../patches/no-jupyterlab.patch | 9 +++++++++
srcpkgs/python3-jupyterlab_widgets/template | 18 ++++++++++++++++++
srcpkgs/python3-jupyterlab_widgets/update | 3 +++
3 files changed, 30 insertions(+)
create mode 100644 srcpkgs/python3-jupyterlab_widgets/patches/no-jupyterlab.patch
create mode 100644 srcpkgs/python3-jupyterlab_widgets/template
create mode 100644 srcpkgs/python3-jupyterlab_widgets/update
diff --git a/srcpkgs/python3-jupyterlab_widgets/patches/no-jupyterlab.patch b/srcpkgs/python3-jupyterlab_widgets/patches/no-jupyterlab.patch
new file mode 100644
index 00000000000000..7f78d11497f9ac
--- /dev/null
+++ b/srcpkgs/python3-jupyterlab_widgets/patches/no-jupyterlab.patch
@@ -0,0 +1,9 @@
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,5 +1,5 @@
+ [build-system]
+-requires = ["jupyter_packaging~=0.10,<2", "jupyterlab~=4.0"]
++requires = ["jupyter_packaging~=0.10,<2"]
+ build-backend = "jupyter_packaging.build_api"
+
+ [tool.jupyter-packaging.options]
diff --git a/srcpkgs/python3-jupyterlab_widgets/template b/srcpkgs/python3-jupyterlab_widgets/template
new file mode 100644
index 00000000000000..b36a7642f2415d
--- /dev/null
+++ b/srcpkgs/python3-jupyterlab_widgets/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-jupyterlab_widgets'
+pkgname=python3-jupyterlab_widgets
+version=3.0.14
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-jupyter_packaging"
+depends="python3"
+short_desc="Jupyter interactive widgets for JupyterLab"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyter-widgets/ipywidgets/tree/main/python/jupyterlab_widgets"
+distfiles="${PYPI_SITE}/j/jupyterlab_widgets/jupyterlab_widgets-${version}.tar.gz"
+checksum=bad03e59546869f026e537e0d170e454259e6dc7048e14041707ca31e523c8a1
+make_check=no # Upstream defines no tests
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python3-jupyterlab_widgets/update b/srcpkgs/python3-jupyterlab_widgets/update
new file mode 100644
index 00000000000000..8226cf8d087698
--- /dev/null
+++ b/srcpkgs/python3-jupyterlab_widgets/update
@@ -0,0 +1,3 @@
+pkgname=jupyterlab_widgets
+site=https://pypi.org/simple/jupyterlab_widgets
+ignore="*a* *b* *rc*"
From 19a347ceb713595ae476f0b76087d287137da23a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 24 Feb 2025 19:39:43 -0300
Subject: [PATCH 03/15] python3-jupyter_ipywidgets: update to 8.1.6.
---
.../patches/pytest8.patch | 93 -------------------
srcpkgs/python3-jupyter_ipywidgets/template | 12 ++-
srcpkgs/python3-jupyter_ipywidgets/update | 1 +
3 files changed, 8 insertions(+), 98 deletions(-)
delete mode 100644 srcpkgs/python3-jupyter_ipywidgets/patches/pytest8.patch
diff --git a/srcpkgs/python3-jupyter_ipywidgets/patches/pytest8.patch b/srcpkgs/python3-jupyter_ipywidgets/patches/pytest8.patch
deleted file mode 100644
index 2f8499a3ae76b9..00000000000000
--- a/srcpkgs/python3-jupyter_ipywidgets/patches/pytest8.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-See: https://github.com/jupyter-widgets/ipywidgets/pull/3903
-
-From bbc6c064aa797eb21bd5a9b441dbbc76925a72db Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Thu, 11 Apr 2024 11:40:15 +0200
-Subject: [PATCH] Fix compatibility with pytest 8
-
-Resolves: https://github.com/jupyter-widgets/ipywidgets/issues/3883
----
- .../ipywidgets/ipywidgets/widgets/tests/test_interaction.py | 2 --
- python/ipywidgets/ipywidgets/widgets/tests/test_link.py | 1 -
- .../ipywidgets/ipywidgets/widgets/tests/test_send_state.py | 2 +-
- .../ipywidgets/ipywidgets/widgets/tests/test_set_state.py | 2 +-
- python/ipywidgets/ipywidgets/widgets/tests/utils.py | 6 +++---
- 5 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/test_interaction.py b/python/ipywidgets/ipywidgets/widgets/tests/test_interaction.py
-index 0dc7e5fcfc..feb1afe50c 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/test_interaction.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/test_interaction.py
-@@ -19,8 +19,6 @@
- # Utility stuff
- #-----------------------------------------------------------------------------
-
--from .utils import setup, teardown
--
- def f(**kwargs):
- pass
-
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/test_link.py b/python/ipywidgets/ipywidgets/widgets/tests/test_link.py
-index 0c92dfdcb2..9301764d40 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/test_link.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/test_link.py
-@@ -4,7 +4,6 @@
- import pytest
-
- from .. import jslink, jsdlink, ToggleButton
--from .utils import setup, teardown
-
- def test_jslink_args():
- with pytest.raises(TypeError):
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/test_send_state.py b/python/ipywidgets/ipywidgets/widgets/tests/test_send_state.py
-index ec18ae4af1..98465b9b7d 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/test_send_state.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/test_send_state.py
-@@ -3,7 +3,7 @@
-
- from traitlets import Bool, Tuple, List
-
--from .utils import setup, teardown, DummyComm
-+from .utils import setup
-
- from ..widget import Widget
-
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/test_set_state.py b/python/ipywidgets/ipywidgets/widgets/tests/test_set_state.py
-index 82ecbd9311..22ec54d90f 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/test_set_state.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/test_set_state.py
-@@ -6,7 +6,7 @@
-
- from traitlets import Bool, Tuple, List, Instance, CFloat, CInt, Float, Int, TraitError, observe
-
--from .utils import setup, teardown
-+from .utils import setup
-
- import ipywidgets
- from ipywidgets import Widget
-diff --git a/python/ipywidgets/ipywidgets/widgets/tests/utils.py b/python/ipywidgets/ipywidgets/widgets/tests/utils.py
-index 260485e3f8..8dbbcb355b 100644
---- a/python/ipywidgets/ipywidgets/widgets/tests/utils.py
-+++ b/python/ipywidgets/ipywidgets/widgets/tests/utils.py
-@@ -12,7 +12,7 @@
- NEW_COMM_PACKAGE = False
-
- import ipykernel.comm
--
-+import pytest
-
- class DummyComm():
- comm_id = 'a-b-c-d'
-@@ -87,10 +87,10 @@ def teardown_test_comm():
- setattr(Widget, attr, value)
- _widget_attrs.clear()
-
-+@pytest.fixture(autouse=True)
- def setup():
- setup_test_comm()
--
--def teardown():
-+ yield
- teardown_test_comm()
-
- def call_method(method, *args, **kwargs):
diff --git a/srcpkgs/python3-jupyter_ipywidgets/template b/srcpkgs/python3-jupyter_ipywidgets/template
index da7840682a6178..0df8341d1e1814 100644
--- a/srcpkgs/python3-jupyter_ipywidgets/template
+++ b/srcpkgs/python3-jupyter_ipywidgets/template
@@ -1,18 +1,20 @@
# Template file for 'python3-jupyter_ipywidgets'
pkgname=python3-jupyter_ipywidgets
-version=8.1.3
-revision=2
+version=8.1.6
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel"
-depends="python3-ipython_ipykernel python3-jupyter_widgetsnbextension"
-checkdepends="$depends python3-pytest python3-jsonschema python3-pytz"
+depends="python3-comm python3-ipython python3-traitlets
+ python3-jupyter_widgetsnbextension python3-jupyterlab_widgets"
+checkdepends="$depends python3-pytest python3-jsonschema python3-pytz
+ python3-ipython_ipykernel"
short_desc="IPython widgets for the Jupyter notebook"
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=f5f9eeaae082b1823ce9eac2575272952f40d748893972956dc09700a6392d9c
+checksum=d8ace49c66f14419fc66071371b99d01bed230bbc15d8a60233b18bfbd782851
# main repo `.../python/ipywidgets/ipywidgets/` is `.../ipywidgets/` here
patch_args=-Np3
diff --git a/srcpkgs/python3-jupyter_ipywidgets/update b/srcpkgs/python3-jupyter_ipywidgets/update
index 44da8f2e3c582e..eb8d6c97887770 100644
--- a/srcpkgs/python3-jupyter_ipywidgets/update
+++ b/srcpkgs/python3-jupyter_ipywidgets/update
@@ -1,2 +1,3 @@
pkgname=ipywidgets
+site=https://pypi.org/simple/ipywidgets
ignore="*a* *b* *rc*"
From 4f132e1f9a347bf64613104f957f92d53f845e78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 18 Apr 2025 16:12:02 -0300
Subject: [PATCH 04/15] python3-pytest-asyncio: update to 0.26.0.
---
srcpkgs/python3-pytest-asyncio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pytest-asyncio/template b/srcpkgs/python3-pytest-asyncio/template
index f1ca23d6a818d5..4d067f0213566f 100644
--- a/srcpkgs/python3-pytest-asyncio/template
+++ b/srcpkgs/python3-pytest-asyncio/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pytest-asyncio'
pkgname=python3-pytest-asyncio
-version=0.25.3
+version=0.26.0
revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools_scm python3-wheel"
@@ -12,7 +12,7 @@ license="Apache-2.0"
homepage="https://github.com/pytest-dev/pytest-asyncio"
changelog="https://raw.githubusercontent.com/pytest-dev/pytest-asyncio/master/docs/source/reference/changelog.rst"
distfiles="${PYPI_SITE}/p/pytest-asyncio/pytest_asyncio-${version}.tar.gz"
-checksum=fc1da2cf9f125ada7e710b4ddad05518d4cee187ae9412e9ac9271003497f07a
+checksum=c4df2a697648241ff39e7f0e4a73050b03f123f760673956cf0d72a4990e312f
if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
# these tests fail on CI (bind to a tcp address)
From 759fcaec0cb00d43171c2a3a65fbf74062678bf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:21:39 -0300
Subject: [PATCH 05/15] python3-xmltodict: update to 0.14.2.
---
srcpkgs/python3-xmltodict/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-xmltodict/template b/srcpkgs/python3-xmltodict/template
index cf444ee312210f..abe56821b12a5e 100644
--- a/srcpkgs/python3-xmltodict/template
+++ b/srcpkgs/python3-xmltodict/template
@@ -1,8 +1,8 @@
# Template file for 'python3-xmltodict'
pkgname=python3-xmltodict
-version=0.13.0
-revision=3
-build_style=python3-module
+version=0.14.2
+revision=1
+build_style=python3-pep517
hostmakedepends="python3-setuptools"
depends="python3"
checkdepends="python3-pytest"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/martinblech/xmltodict"
changelog="https://raw.githubusercontent.com/martinblech/xmltodict/master/CHANGELOG.md"
distfiles="${PYPI_SITE}/x/xmltodict/xmltodict-${version}.tar.gz"
-checksum=341595a488e3e01a85a9d8911d8912fd922ede5fecc4dce437eb4b6c8d037e56
+checksum=201e7c28bb210e374999d1dde6382923ab0ed1a8a5faeece48ab525b7810a553
post_install() {
vlicense LICENSE
From 13460243f5684d43d2d31c4461f7d5e02023754d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:21:44 -0300
Subject: [PATCH 06/15] python3-nbclient: update to 0.10.2.
---
srcpkgs/python3-nbclient/template | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/python3-nbclient/template b/srcpkgs/python3-nbclient/template
index 3bf13e904a1d0c..b2666af9d1a1d9 100644
--- a/srcpkgs/python3-nbclient/template
+++ b/srcpkgs/python3-nbclient/template
@@ -1,25 +1,21 @@
# Template file for 'python3-nbclient'
pkgname=python3-nbclient
-version=0.10.0
-revision=2
+version=0.10.2
+revision=1
build_style=python3-pep517
hostmakedepends="hatchling"
-depends="python3-jupyter_client python3-jupyter_nbformat"
+depends="python3-jupyter_client python3-jupyter_core python3-jupyter_nbformat
+ python3-traitlets"
checkdepends="$depends python3-pytest-asyncio python3-testpath
- python3-flaky python3-jupyter_ipywidgets python3-xmltodict"
+ python3-flaky python3-jupyter_ipywidgets python3-xmltodict
+ python3-ipython_ipykernel python3-jupyter_nbconvert"
short_desc="Client library for executing Jupyter notebooks"
maintainer="dkwo <npiazza@disroot.org>, Gonzalo Tornaría <tornaria@cmat.edu.uy>"
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=4b3f1b7dba531e498449c4db4f53da339c91d449dc11e9af3a43b4eb5c5abb09
-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
+checksum=90b7fc6b810630db87a6d0c2250b1f0ab4cf4d3c27a299b0cde78a4ed3fd9193
post_install() {
vlicense LICENSE
From 1134b9199d8cd0d89425438fcb26c648418a7c22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:37:47 -0300
Subject: [PATCH 07/15] python3-lxml: update to 5.4.0.
---
.../patches/fix-encoding-tests-musl.patch | 19 -------------------
srcpkgs/python3-lxml/template | 12 ++++++------
2 files changed, 6 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch
diff --git a/srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch b/srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch
deleted file mode 100644
index e2d0e3b36bd572..00000000000000
--- a/srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-from alpine: https://gitlab.alpinelinux.org/alpine/aports/-/blob/3f64a63298ac78f5f2a50a52e3e3f01eef1b51ce/main/py3-lxml/tests-fix-encoding-name.patch
-
-diff --git a/src/lxml/tests/test_incremental_xmlfile.py b/src/lxml/tests/test_incremental_xmlfile.py
-index 3162155..43b79d7 100644
---- a/src/lxml/tests/test_incremental_xmlfile.py
-+++ b/src/lxml/tests/test_incremental_xmlfile.py
-@@ -177,10 +177,10 @@ class _XmlFileTestCaseBase(HelperTestCase):
- '<test>Comments: <!-- text -->\nEntities: &amp;</test>')
-
- def test_encoding(self):
-- with etree.xmlfile(self._file, encoding='utf16') as xf:
-+ with etree.xmlfile(self._file, encoding='utf-16') as xf:
- with xf.element('test'):
- xf.write('toast')
-- self.assertXml('<test>toast</test>', encoding='utf16')
-+ self.assertXml('<test>toast</test>', encoding='utf-16')
-
- def test_buffering(self):
- with etree.xmlfile(self._file, buffered=False) as xf:
diff --git a/srcpkgs/python3-lxml/template b/srcpkgs/python3-lxml/template
index 32ac3828139320..8fdf77220f37a5 100644
--- a/srcpkgs/python3-lxml/template
+++ b/srcpkgs/python3-lxml/template
@@ -1,10 +1,10 @@
# Template file for 'python3-lxml'
pkgname=python3-lxml
-version=5.3.0
-revision=2
-build_style=python3-module
-make_build_args="--with-cython"
-hostmakedepends="python3-Cython python3-setuptools"
+version=5.4.0
+revision=1
+build_style=python3-pep517
+make_build_args="-C--build-option=--with-cython"
+hostmakedepends="python3-Cython python3-setuptools python3-wheel"
makedepends="libxslt-devel python3-devel"
depends="python3"
checkdepends="python3-cssselect python3-BeautifulSoup4 python3-html5lib"
@@ -14,7 +14,7 @@ license="BSD-3-Clause, custom:ElementTree"
homepage="https://lxml.de/"
changelog="https://raw.githubusercontent.com/lxml/lxml/master/CHANGES.txt"
distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz"
-checksum=eb22f7ceb319c29247cfa398435d00e6286d19a32b4870b67a8e9a38d72f2ebd
+checksum=12ed971a99bd07977e236bf59314cfd53fbf5d59f39d4a13caad901c7fceb0a2
do_check() {
make test
From 236f8672678c359cfb71dbf096e9ca66b3ed55f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:47:25 -0300
Subject: [PATCH 08/15] python3-soupsieve: update to 2.7.
---
srcpkgs/python3-soupsieve/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
index 107604fec169b0..6e645de8048b71 100644
--- a/srcpkgs/python3-soupsieve/template
+++ b/srcpkgs/python3-soupsieve/template
@@ -1,7 +1,7 @@
# Template file for 'python3-soupsieve'
pkgname=python3-soupsieve
-version=2.4.1
-revision=3
+version=2.7
+revision=1
build_style=python3-pep517
hostmakedepends="hatchling"
depends="python3"
@@ -11,8 +11,9 @@ short_desc="CSS4 selector implementation for Python3 Beautiful Soup"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://facelessuser.github.io/soupsieve/"
+changelog="https://raw.githubusercontent.com/facelessuser/soupsieve/refs/heads/main/docs/src/markdown/about/changelog.md"
distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
-checksum=89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea
+checksum=ad282f9b6926286d2ead4750552c8a6142bc4c783fd66b0293547c8fe6ae126a
post_install() {
vlicense LICENSE.md
From 73bc6961a0fe0727c2035ba100a3175ed13b94ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 03:51:48 -0300
Subject: [PATCH 09/15] python3-BeautifulSoup4: update to 4.13.4.
---
srcpkgs/python3-BeautifulSoup4/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-BeautifulSoup4/template b/srcpkgs/python3-BeautifulSoup4/template
index 364445f875e54c..3bb906b2405f17 100644
--- a/srcpkgs/python3-BeautifulSoup4/template
+++ b/srcpkgs/python3-BeautifulSoup4/template
@@ -1,10 +1,10 @@
# Template file for 'python3-BeautifulSoup4'
pkgname=python3-BeautifulSoup4
-version=4.12.2
-revision=3
+version=4.13.4
+revision=1
build_style=python3-pep517
hostmakedepends="hatchling"
-depends="python3-soupsieve"
+depends="python3-soupsieve python3-typing_extensions"
checkdepends="$depends python3-pytest python3-html5lib python3-lxml"
short_desc="Python3 HTML/XML parser"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://www.crummy.com/software/BeautifulSoup"
changelog="https://git.launchpad.net/beautifulsoup/plain/CHANGELOG"
distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
-checksum=492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da
+checksum=dbb3c4e1ceae6aefebdaf2423247260cd062430a410e38c66f2baa50a8437195
post_install() {
vlicense LICENSE
From 22a3d42e8153426bdc0121bffc22935b11e02117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:05:07 -0300
Subject: [PATCH 10/15] python3-six: update to 1.17.0.
---
srcpkgs/python3-six/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-six/template b/srcpkgs/python3-six/template
index 2299770fb153c2..19b0812b9fd4e1 100644
--- a/srcpkgs/python3-six/template
+++ b/srcpkgs/python3-six/template
@@ -1,8 +1,8 @@
# Template file for 'python3-six'
pkgname=python3-six
-version=1.16.0
-revision=5
-build_style=python3-module
+version=1.17.0
+revision=1
+build_style=python3-pep517
hostmakedepends="python3-setuptools"
depends="python3"
checkdepends="python3-pytest"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/benjaminp/six"
changelog="https://raw.githubusercontent.com/benjaminp/six/master/CHANGES"
distfiles="${PYPI_SITE}/s/six/six-${version}.tar.gz"
-checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
+checksum=ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81
post_install() {
vlicense LICENSE
From 02fa2dd0fc2a427db833de47389d7346c31ad601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:05:22 -0300
Subject: [PATCH 11/15] python3-bleach: update to 6.2.0.
---
srcpkgs/python3-bleach/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-bleach/template b/srcpkgs/python3-bleach/template
index 8cf2201528c939..82f2797e85784b 100644
--- a/srcpkgs/python3-bleach/template
+++ b/srcpkgs/python3-bleach/template
@@ -1,7 +1,7 @@
# Template file for 'python3-bleach'
pkgname=python3-bleach
-version=6.0.0
-revision=3
+version=6.2.0
+revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
depends="python3-six python3-webencodings"
@@ -12,4 +12,4 @@ license="Apache-2.0"
homepage="https://github.com/mozilla/bleach"
changelog="https://raw.githubusercontent.com/mozilla/bleach/master/CHANGES"
distfiles="${PYPI_SITE}/b/bleach/bleach-${version}.tar.gz"
-checksum=1a1a85c1595e07d8db14c5f09f09e6433502c51c595970edc090551f0db99414
+checksum=123e894118b8a599fd80d3ec1a6d4cc7ce4e5882b1317a7e1ba69b56e95f991f
From 23d1821df35cb18d58c8bce7f83207d0a6033c1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:05:26 -0300
Subject: [PATCH 12/15] python3-mistune: update to 3.1.3.
---
srcpkgs/python3-mistune/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-mistune/template b/srcpkgs/python3-mistune/template
index 828db5643c7a2e..2aba5c34737737 100644
--- a/srcpkgs/python3-mistune/template
+++ b/srcpkgs/python3-mistune/template
@@ -1,7 +1,7 @@
# Template file for 'python3-mistune'
pkgname=python3-mistune
-version=3.0.2
-revision=2
+version=3.1.3
+revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
depends="python3"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
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=fc7f93ded930c92394ef2cb6f04a8aabab4117a91449e72dcc8dfa646a508be8
+checksum=a7035c21782b2becb6be62f8f25d3df81ccb4d6fa477a6525b15af06539f02a0
post_install() {
vlicense LICENSE
From f75a4d9c4fc58bcbf1e14960242d025b7d3c9eb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:05:30 -0300
Subject: [PATCH 13/15] python3-pandocfilters: update to 1.5.1.
---
srcpkgs/python3-pandocfilters/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pandocfilters/template b/srcpkgs/python3-pandocfilters/template
index 45e58c9c94ddeb..ab7efec72a7899 100644
--- a/srcpkgs/python3-pandocfilters/template
+++ b/srcpkgs/python3-pandocfilters/template
@@ -1,8 +1,8 @@
# Template file for 'python3-pandocfilters'
pkgname=python3-pandocfilters
-version=1.5.0
-revision=2
-build_style=python3-module
+version=1.5.1
+revision=1
+build_style=python3-pep517
hostmakedepends="python3-setuptools"
depends="python3"
short_desc="Python3 module for writing pandoc filters"
@@ -10,7 +10,8 @@ maintainer="Eloi Torrents <eloitor@disroot.org>"
license="BSD-3-Clause"
homepage="http://github.com/jgm/pandocfilters"
distfiles="${PYPI_SITE}/p/pandocfilters/pandocfilters-${version}.tar.gz"
-checksum=0b679503337d233b4339a817bfc8c50064e2eff681314376a47cb582305a7a38
+checksum=002b4a555ee4ebc03f8b66307e287fa492e4a77b4ea14d3f934328297bb4939e
+make_check=no # Upstream defines no tests
post_install() {
vlicense LICENSE
From 922d2154731dcab3e6692134d9219fdc5c0b7fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 11:45:59 -0300
Subject: [PATCH 14/15] hooks/pre-pkg/06-verify-python-deps: support
alternative packages
---
common/scripts/parse-py-metadata.py | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/common/scripts/parse-py-metadata.py b/common/scripts/parse-py-metadata.py
index 0d9384bf7ef36c..909244d80804f1 100644
--- a/common/scripts/parse-py-metadata.py
+++ b/common/scripts/parse-py-metadata.py
@@ -123,7 +123,8 @@ def parse_depends(args):
pkg = getpkgname(pkgver)
vpkg = map(getpkgname, vpkgvers.split())
for v in vpkg:
- vpkgs[v] = pkg
+ if pkg not in vpkgs.setdefault(v, []):
+ vpkgs[v].append(pkg)
if args.rdeps.exists():
with args.rdeps.open() as f:
@@ -149,12 +150,17 @@ def parse_depends(args):
missing = []
for k in depends.keys():
if k in vpkgs.keys():
- pkgname = vpkgs[k]
- if pkgname in rdeps:
- print(f" PYTHON: {k} <-> {pkgname}", flush=True)
- elif pkgname in global_ignore:
- print(f" PYTHON: {k} <-> {pkgname} (ignored)", flush=True)
+ for pkgname in vpkgs[k]:
+ if pkgname in rdeps:
+ print(f" PYTHON: {k} <-> {pkgname}", flush=True)
+ break
+ elif pkgname in global_ignore:
+ print(f" PYTHON: {k} <-> {pkgname} (ignored)", flush=True)
+ break
else:
+ pkgname = " OR ".join(vpkgs[k])
+ if len(vpkgs[k]) > 1:
+ pkgname = "(" + pkgname + ")"
msg_err(f" PYTHON: {k} <-> {pkgname} NOT IN depends PLEASE FIX!",
nocolor=args.nocolor, strict=args.strict)
missing.append(pkgname)
From 459cb98738db53d112e783f94e09dec2fcf2472c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 25 Feb 2025 04:10:39 -0300
Subject: [PATCH 15/15] python3-jupyter_nbconvert: update to 7.16.6.
---
srcpkgs/python3-jupyter_nbconvert/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template
index 3bf3da5423c28b..1f6a1be11d816d 100644
--- a/srcpkgs/python3-jupyter_nbconvert/template
+++ b/srcpkgs/python3-jupyter_nbconvert/template
@@ -1,23 +1,23 @@
# Template file for 'python3-jupyter_nbconvert'
pkgname=python3-jupyter_nbconvert
-version=7.16.4
-revision=2
+version=7.16.6
+revision=1
build_style=python3-pep517
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 python3-PyQt5"
+ python3-Pygments python3-traitlets python3-tinycss2"
+checkdepends="$depends python3-pytest-xdist python3-jupyter_ipywidgets
+ asciidoc inkscape pandoc python3-flaky python3-PyQt5 python3-ipython_ipykernel"
short_desc="Converting Jupyter notebooks"
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=86ca91ba266b0a448dc96fa6c5b9d98affabde2867b363258703536807f9f7f4
+checksum=576a7e37c6480da7b8465eefa66c17844243816ce1ccc372633c6b71c3c0f582
pre_check() {
# templates must be in $JUPYTER_DATA_DIR/nbconvert/templates
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: python3-jupyter_nbconvert: update to 7.16.6.
2025-02-25 15:06 [PR PATCH] python3-jupyter_nbconvert: update to 7.16.6 tornaria
` (3 preceding siblings ...)
2025-05-01 23:25 ` tornaria
@ 2025-05-07 23:23 ` tornaria
2025-05-07 23:23 ` [PR PATCH] [Closed]: " tornaria
5 siblings, 0 replies; 7+ messages in thread
From: tornaria @ 2025-05-07 23:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/54489#issuecomment-2860682546
Comment:
Included in #55117
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Closed]: python3-jupyter_nbconvert: update to 7.16.6.
2025-02-25 15:06 [PR PATCH] python3-jupyter_nbconvert: update to 7.16.6 tornaria
` (4 preceding siblings ...)
2025-05-07 23:23 ` tornaria
@ 2025-05-07 23:23 ` tornaria
5 siblings, 0 replies; 7+ messages in thread
From: tornaria @ 2025-05-07 23:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1597 bytes --]
There's a closed pull request on the void-packages repository
python3-jupyter_nbconvert: update to 7.16.6.
https://github.com/void-linux/void-packages/pull/54489
Description:
- **python3-pytest-asyncio: update to 0.25.3.**
- **python3-xmltodict: update to 0.14.2.**
- **python3-nbclient: update to 0.10.2.**
- **python3-lxml: update to 5.3.1.**
- **python3-soupsieve: update to 2.6.**
- **python3-BeautifulSoup4: update to 4.13.3.**
- **python3-six: update to 1.17.0.**
- **python3-bleach: update to 6.2.0.**
- **python3-mistune: update to 3.1.2.**
- **python3-pandocfilters: update to 1.5.1.**
- **python3-jupyter_nbconvert: update to 7.16.6.**
This also includes #54482 and #54488.
<!-- 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
-->
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-05-07 23:23 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-25 15:06 [PR PATCH] python3-jupyter_nbconvert: update to 7.16.6 tornaria
2025-02-25 15:10 ` tornaria
2025-04-18 13:47 ` [PR PATCH] [Updated] " tornaria
2025-04-19 3:37 ` tornaria
2025-05-01 23:25 ` tornaria
2025-05-07 23:23 ` tornaria
2025-05-07 23:23 ` [PR PATCH] [Closed]: " tornaria
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).