From f8d2fa6afb2709aef9e98064a81ac8bb1c280678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= 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 " 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?= 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 " +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?= 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 -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 " 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?= 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?= 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?= 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 , Gonzalo Tornaría " 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?= 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): - 'Comments: <!-- text -->\nEntities: &amp;') - - 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('toast', encoding='utf16') -+ self.assertXml('toast', 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?= 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 " 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?= 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 " @@ -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?= 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?= 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?= 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?= 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 " 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?= 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?= 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 " 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