CVS commit: pkgsrc/textproc/py-html5lib

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Feb 16 19:01:02 UTC 2026

Modified Files:
        pkgsrc/textproc/py-html5lib: Makefile distinfo
        pkgsrc/textproc/py-html5lib/patches: patch-html5lib_tests_conftest.py
            patch-setup.py

Log Message:
py-html5lib: Fix build with latest setuptools.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/textproc/py-html5lib/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/textproc/py-html5lib/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/py-html5lib/patches/patch-html5lib_tests_conftest.py \
    pkgsrc/textproc/py-html5lib/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/py-html5lib/Makefile
diff -u pkgsrc/textproc/py-html5lib/Makefile:1.21 pkgsrc/textproc/py-html5lib/Makefile:1.22
--- pkgsrc/textproc/py-html5lib/Makefile:1.21   Thu Oct  9 07:57:59 2025
+++ pkgsrc/textproc/py-html5lib/Makefile        Mon Feb 16 19:01:02 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2025/10/09 07:57:59 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2026/02/16 19:01:02 wiz Exp $
 
 DISTNAME=      html5lib-1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    textproc www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=h/html5lib/}
 

Index: pkgsrc/textproc/py-html5lib/distinfo
diff -u pkgsrc/textproc/py-html5lib/distinfo:1.14 pkgsrc/textproc/py-html5lib/distinfo:1.15
--- pkgsrc/textproc/py-html5lib/distinfo:1.14   Thu Oct  9 11:59:29 2025
+++ pkgsrc/textproc/py-html5lib/distinfo        Mon Feb 16 19:01:02 2026
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.14 2025/10/09 11:59:29 wiz Exp $
+$NetBSD: distinfo,v 1.15 2026/02/16 19:01:02 wiz Exp $
 
 BLAKE2s (html5lib-1.1.tar.gz) = de98dc78f784829b373e37ad38851c062983d16b91322a32a2a77113e34b3240
 SHA512 (html5lib-1.1.tar.gz) = af7c29591007fded99be6c38e3d0ae5a4ac32d71d26046a615918ae732cb1c1ecbf754f47ceca1a53726c3843f3ecea7af87a7362281b45ff3af495815818626
 Size (html5lib-1.1.tar.gz) = 272215 bytes
-SHA1 (patch-html5lib_tests_conftest.py) = 7aefd6920c5b490e0d033003aef2a31cc0b87b86
+SHA1 (patch-html5lib_tests_conftest.py) = 06e0f98f0ed4520e93366e4eba3d954daaa044d9
 SHA1 (patch-html5lib_tests_sanitizer.py) = 7ef8278779354a83b59001b1c4eb726e668b58ef
 SHA1 (patch-html5lib_tests_tokenizer.py) = 069535e27579ab9e297986da60ea5072ea15c4f8
 SHA1 (patch-html5lib_tests_tree__construction.py) = 471730a2408cb7c46e1d76448101f6a708b298f4
 SHA1 (patch-requirements-test.txt) = e9c89a4bbd6fac87f5143bc4b1f0016993c14450
-SHA1 (patch-setup.py) = 7bb1360dfb5a355b3b6b26acdcb3f8e46b5553ac
+SHA1 (patch-setup.py) = a2f6c4d074f33342b3f34295d4db80ad62649282

Index: pkgsrc/textproc/py-html5lib/patches/patch-html5lib_tests_conftest.py
diff -u pkgsrc/textproc/py-html5lib/patches/patch-html5lib_tests_conftest.py:1.1 pkgsrc/textproc/py-html5lib/patches/patch-html5lib_tests_conftest.py:1.2
--- pkgsrc/textproc/py-html5lib/patches/patch-html5lib_tests_conftest.py:1.1    Tue Apr 30 09:01:14 2024
+++ pkgsrc/textproc/py-html5lib/patches/patch-html5lib_tests_conftest.py        Mon Feb 16 19:01:02 2026
@@ -1,10 +1,36 @@
-$NetBSD: patch-html5lib_tests_conftest.py,v 1.1 2024/04/30 09:01:14 wiz Exp $
+$NetBSD: patch-html5lib_tests_conftest.py,v 1.2 2026/02/16 19:01:02 wiz Exp $
 
 https://github.com/html5lib/html5lib-python/pull/506
 
 --- html5lib/tests/conftest.py.orig    2020-06-22 23:23:02.000000000 +0000
 +++ html5lib/tests/conftest.py
-@@ -99,10 +99,19 @@ def pytest_collect_file(path, parent):
+@@ -2,7 +2,6 @@ import sys
+ import os.path
+ import sys
+ 
+-import pkg_resources
+ import pytest
+ 
+ from .tree_construction import TreeConstructionFile
+@@ -63,17 +62,6 @@ def pytest_configure(config):
+                             spec, marker = line.strip().split(";", 1)
+                         else:
+                             spec, marker = line.strip(), None
+-                        req = pkg_resources.Requirement.parse(spec)
+-                        if marker and not pkg_resources.evaluate_marker(marker):
+-                            msgs.append("%s not available in this environment" % spec)
+-                        else:
+-                            try:
+-                                installed = pkg_resources.working_set.find(req)
+-                            except pkg_resources.VersionConflict:
+-                                msgs.append("Outdated version of %s installed, need %s" % (req.name, spec))
+-                            else:
+-                                if not installed:
+-                                    msgs.append("Need %s" % spec)
+ 
+         # Check cElementTree
+         import xml.etree.ElementTree as ElementTree
+@@ -99,10 +87,19 @@ def pytest_collect_file(path, parent):
  
      if _tree_construction in dir_and_parents:
          if path.ext == ".dat":
Index: pkgsrc/textproc/py-html5lib/patches/patch-setup.py
diff -u pkgsrc/textproc/py-html5lib/patches/patch-setup.py:1.1 pkgsrc/textproc/py-html5lib/patches/patch-setup.py:1.2
--- pkgsrc/textproc/py-html5lib/patches/patch-setup.py:1.1      Thu Oct  9 11:59:29 2025
+++ pkgsrc/textproc/py-html5lib/patches/patch-setup.py  Mon Feb 16 19:01:02 2026
@@ -1,12 +1,40 @@
-$NetBSD: patch-setup.py,v 1.1 2025/10/09 11:59:29 wiz Exp $
+$NetBSD: patch-setup.py,v 1.2 2026/02/16 19:01:02 wiz Exp $
 
 Fix build with Python 3.14
 Based on a comment in
 https://github.com/html5lib/html5lib-python/pull/589
 
---- setup.py.orig      2025-10-09 11:57:09.810246679 +0000
+--- setup.py.orig      2020-06-22 23:23:02.000000000 +0000
 +++ setup.py
-@@ -89,9 +89,14 @@ with open(join(here, "html5lib", "__init
+@@ -6,9 +6,7 @@ from setuptools import setup, find_packages, __version
+ 
+ from os.path import join, dirname
+ from setuptools import setup, find_packages, __version__ as setuptools_version
+-from pkg_resources import parse_version
+ 
+-import pkg_resources
+ 
+ try:
+     import _markerlib.markers
+@@ -46,17 +44,6 @@ if _markerlib and sys.version_info[0] == 3:
+ 
+     _markerlib.default_environment = default_environment
+ 
+-# Avoid the very buggy pkg_resources.parser, which doesn't consistently
+-# recognise the markers needed by this setup.py
+-# Change this to setuptools 20.10.0 to support all markers.
+-if pkg_resources:
+-    if parse_version(setuptools_version) < parse_version('18.5'):
+-        MarkerEvaluation = pkg_resources.MarkerEvaluation
+-
+-        del pkg_resources.parser
+-        pkg_resources.evaluate_marker = MarkerEvaluation._markerlib_evaluate
+-        MarkerEvaluation.evaluate_marker = MarkerEvaluation._markerlib_evaluate
+-
+ classifiers = [
+     'Development Status :: 5 - Production/Stable',
+     'Intended Audience :: Developers',
+@@ -89,9 +76,14 @@ with open(join(here, "html5lib", "__init__.py"), "rb")
      for a in assignments:
          if (len(a.targets) == 1 and
                  isinstance(a.targets[0], ast.Name) and