From nobody Wed Mar 18 16:03:45 2026 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fbYXk5t01z6W14Z for ; Wed, 18 Mar 2026 16:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fbYXd4trCz3xlS for ; Wed, 18 Mar 2026 16:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773849825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pq27/douw0/f1t/CjPW5PaEp3kfSsAnBVvSMnsKp3Rk=; b=JN1oyQT2bMGNgTjGW4VQh0y/yr2yY7Oe6simRsWFIQdN6l4Syuzwj7HmbQnO88gNqKXI62 CGuM0GaWVhCEqyfK2Iia99IUSPDNQwX0sqHdTs8bqA+FRfeIH/6Uy0HHg1LkhroQCRLUN8 S9skl2T0gNEPG0ureQtXmd++8w9XvLSXqk0608hQNSbM5fcQva1934+HOGRbEYq+Hhhcv5 +jKEGPV3ia3x1+hOQbcTLOAL7DrJtee1B9Hs8tpz2oMi96F040Omj9aPTFCgDLeG2if+1M UhOhCUrICjYj7tXCV9tnErpVEGtNcUD1oP7CBaQ4abNwuBhUumJOKnAcKUomVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773849825; a=rsa-sha256; cv=none; b=iYKb39YM6F/gJxNwVHXb9aKGwDUefjP4MkzaPpekHHaoEmPuhV8qzCpRi6K1qMDJhfywhG KgpQxiQf3dJn4WGVj7HY4AKqzAvyhtj63+h+vwd9+XNVS/YR+/PR0d+JQC32CVSPoEkIl5 UK9NJop5/EWgtys1TzkuNlIFMnRdm2+PT8JsdMiO7UpeiBJgVr3mNqPs80g6T2Im205VJc BjQke/2VPAbZNkvflunlB5ae2JoQA0qSprttUNGAiU7bOhe2pyHySPWZYsKpKdr/eJULJV TeCEyZDxYQVmaW4NrubT94yuxg6KWFSF2Pjjt04BJBqS2JXzaBtH6k55EGY1oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773849825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pq27/douw0/f1t/CjPW5PaEp3kfSsAnBVvSMnsKp3Rk=; b=bb8OHWocqwKnWgoEehc0o+r4oLIL3FeZ6KULBfiRNF+K7yqXvADkISnUgXJbq/esej3d6M QmbSl03Qtof05nwzGZrKUaKny+mdfQWutiymOV8XQ37YxDFD9rkDJuvEyPqfplmYtr+yA2 2Xd+OkpokEWyL/xsi5ew21QLS2CZwj4qwWlP16Cqpt7+udm7L7b3H3o2M+MTeBrS1gt4LU vWaO2MOTEHzrbzoV6ZbhiqVfIdKoDWzqxv6B2strKlbsYt7LhgzUgXJvaOxz4xyUTlFpYQ tGBj0IfyyKsiD9PK6o0dsVNqATCUZ3VS4cbW57P/8/BA+rjYBj0qErIWzJ9vyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fbYXd4SqFzWC for ; Wed, 18 Mar 2026 16:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c700 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Mar 2026 16:03:45 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 2b0251dce16b - main - www/py-html5lib: fix build with newer setuptools List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b0251dce16b46466be31b4bc4cd41276d1ab522 Auto-Submitted: auto-generated Date: Wed, 18 Mar 2026 16:03:45 +0000 Message-Id: <69bacce1.1c700.75a52281@gitrepo.freebsd.org> The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b0251dce16b46466be31b4bc4cd41276d1ab522 commit 2b0251dce16b46466be31b4bc4cd41276d1ab522 Author: Charlie Li AuthorDate: 2026-03-12 15:42:47 +0000 Commit: Charlie Li CommitDate: 2026-03-18 16:01:03 +0000 www/py-html5lib: fix build with newer setuptools Use an upstream pull request [0] to handle ast.Str deprecation/removal, as the existing patch fails: Traceback (most recent call last): File "/usr/local/lib/python3.13t/site-packages/pyproject_hooks/_in_process/_in_process.py", line 389, in main() ~~~~^^ File "/usr/local/lib/python3.13t/site-packages/pyproject_hooks/_in_process/_in_process.py", line 373, in main json_out["return_val"] = hook(**hook_input["kwargs"]) ~~~~^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/local/lib/python3.13t/site-packages/pyproject_hooks/_in_process/_in_process.py", line 143, in get_requires_for_build_wheel return hook(config_settings) File "/usr/local/lib/python3.13t/site-packages/setuptools/build_meta.py", line 333, in get_requires_for_build_wheel return self._get_build_requires(config_settings, requirements=[]) ~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/local/lib/python3.13t/site-packages/setuptools/build_meta.py", line 301, in _get_build_requires self.run_setup() ~~~~~~~~~~~~~~^^ File "/usr/local/lib/python3.13t/site-packages/setuptools/build_meta.py", line 520, in run_setup super().run_setup(setup_script=setup_script) ~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/local/lib/python3.13t/site-packages/setuptools/build_meta.py", line 317, in run_setup exec(code, locals()) ~~~~^^^^^^^^^^^^^^^^ File "", line 96, in File "/usr/local/lib/python3.13t/site-packages/setuptools/__init__.py", line 117, in setup return distutils.core.setup(**attrs) # type: ignore[return-value] ~~~~~~~~~~~~~~~~~~~~^^^^^^^^^ File "/usr/local/lib/python3.13t/site-packages/setuptools/_distutils/core.py", line 148, in setup _setup_distribution = dist = klass(attrs) ~~~~~^^^^^^^ File "/usr/local/lib/python3.13t/site-packages/setuptools/dist.py", line 332, in __init__ self.metadata.version = self._normalize_version(self.metadata.version) ~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/local/lib/python3.13t/site-packages/setuptools/dist.py", line 368, in _normalize_version normalized = str(Version(version)) ~~~~~~~^^^^^^^^^ File "/usr/local/lib/python3.13t/site-packages/packaging/version.py", line 359, in __init__ match = self._regex.fullmatch(version) TypeError: expected string or bytes-like object, got 'Constant' While here: - remove all references to pkg_resources, removed in setuptools 82+ - switch to USE_PYTHON=pep517 [0] https://github.com/html5lib/html5lib-python/pull/589 PR: 293763 Approved by: rm (maintainer) --- www/py-html5lib/Makefile | 10 ++++++++-- www/py-html5lib/distinfo | 6 +++++- www/py-html5lib/files/patch-setup.py | 13 ------------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/www/py-html5lib/Makefile b/www/py-html5lib/Makefile index 510b856b2268..0c673849efaf 100644 --- a/www/py-html5lib/Makefile +++ b/www/py-html5lib/Makefile @@ -1,10 +1,14 @@ PORTNAME= html5lib PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PATCH_SITES= https://github.com/html5lib/html5lib-python/commit/ +PATCHFILES= b90dafff1bf342d34d539098013d0b9f318c7641.patch:-p1 \ + 2ba10ae9c0852318aee4dfece8cd8b49bfe48682.patch:-p1 + MAINTAINER= rm@FreeBSD.org COMMENT= Python based HTML parser based on the HTML5 spec WWW= https://github.com/html5lib/html5lib-python @@ -12,11 +16,13 @@ WWW= https://github.com/html5lib/html5lib-python LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webencodings>0:converters/py-webencodings@${PY_FLAVOR} NO_ARCH= yes USES= cpe python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist pep517 .include diff --git a/www/py-html5lib/distinfo b/www/py-html5lib/distinfo index e49c5e6d5e3b..469e878ab50a 100644 --- a/www/py-html5lib/distinfo +++ b/www/py-html5lib/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1681809284 +TIMESTAMP = 1773329494 SHA256 (html5lib-1.1.tar.gz) = b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f SIZE (html5lib-1.1.tar.gz) = 272215 +SHA256 (b90dafff1bf342d34d539098013d0b9f318c7641.patch) = 293065ee2c2592ff2536c43dc1aabb5e2f0753b0f986d26a3075d4650a1628b7 +SIZE (b90dafff1bf342d34d539098013d0b9f318c7641.patch) = 1465 +SHA256 (2ba10ae9c0852318aee4dfece8cd8b49bfe48682.patch) = 8c020776667b58f2306f16861ae3821c7172b564aeacc99fdfbbcf9170f9c9da +SIZE (2ba10ae9c0852318aee4dfece8cd8b49bfe48682.patch) = 2238 diff --git a/www/py-html5lib/files/patch-setup.py b/www/py-html5lib/files/patch-setup.py deleted file mode 100644 index 1dea77f968f7..000000000000 --- a/www/py-html5lib/files/patch-setup.py +++ /dev/null @@ -1,13 +0,0 @@ ---- setup.py.orig 2020-06-22 23:23:02 UTC -+++ setup.py -@@ -90,8 +90,8 @@ with open(join(here, "html5lib", "__init__.py"), "rb") - if (len(a.targets) == 1 and - isinstance(a.targets[0], ast.Name) and - a.targets[0].id == "__version__" and -- isinstance(a.value, ast.Str)): -- version = a.value.s -+ isinstance(a.value, ast.Constant)): -+ version = a.value - - setup(name='html5lib', - version=version,