summaryrefslogtreecommitdiff
path: root/dev-python/html5lib
diff options
context:
space:
mode:
authorroot <root@alpha.trunkmasters.com>2026-07-04 03:04:33 -0500
committerroot <root@alpha.trunkmasters.com>2026-07-04 03:04:33 -0500
commitd5f9077fde66bffd2bc6d193ae7c967e352a5562 (patch)
tree7f4e638af1165dc34e405c5ff1f860f3e0c6c4f4 /dev-python/html5lib
parent5f7788dcac066b42562f59afc4b79d7ed272bfcc (diff)
downloadbaldeagleos-repo-d5f9077fde66bffd2bc6d193ae7c967e352a5562.tar.gz
baldeagleos-repo-d5f9077fde66bffd2bc6d193ae7c967e352a5562.tar.xz
baldeagleos-repo-d5f9077fde66bffd2bc6d193ae7c967e352a5562.zip
Adding metadata
Diffstat (limited to 'dev-python/html5lib')
-rw-r--r--dev-python/html5lib/files/html5lib-1.2_pre20240221-pytest-9.0.patch64
-rw-r--r--dev-python/html5lib/files/html5lib-1.2_pre20240221-pytest-9.1.patch113
-rw-r--r--dev-python/html5lib/html5lib-1.2_pre20240221.ebuild2
3 files changed, 179 insertions, 0 deletions
diff --git a/dev-python/html5lib/files/html5lib-1.2_pre20240221-pytest-9.0.patch b/dev-python/html5lib/files/html5lib-1.2_pre20240221-pytest-9.0.patch
new file mode 100644
index 000000000000..f68eb0b9b25e
--- /dev/null
+++ b/dev-python/html5lib/files/html5lib-1.2_pre20240221-pytest-9.0.patch
@@ -0,0 +1,64 @@
+https://github.com/html5lib/html5lib-python/pull/590
+
+From b502a5e2b3048a996ada4c4246aafad99d3dd14c Mon Sep 17 00:00:00 2001
+From: Steve Kowalik <steven@wedontsleep.org>
+Date: Thu, 27 Nov 2025 10:44:40 +1100
+Subject: [PATCH] Support pytest 9 changes
+
+The old py.path arguments to the hook functions have been removed as of
+pytest 9, switch to the shiny new pathlib ones.
+---
+ html5lib/tests/conftest.py | 18 +++++++++---------
+ requirements-test.txt | 2 +-
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/html5lib/tests/conftest.py b/html5lib/tests/conftest.py
+index fffeb50c..4a97dc21 100644
+--- a/html5lib/tests/conftest.py
++++ b/html5lib/tests/conftest.py
+@@ -90,22 +90,22 @@ def pytest_configure(config):
+ pytest.exit("\n".join(msgs))
+
+
+-def pytest_collect_file(path, parent):
+- dir = os.path.abspath(path.dirname)
++def pytest_collect_file(file_path, parent):
++ dir = file_path.parent
+ dir_and_parents = set()
+ while dir not in dir_and_parents:
+ dir_and_parents.add(dir)
+- dir = os.path.dirname(dir)
++ dir = dir.parent
+
+ if _tree_construction in dir_and_parents:
+- if path.ext == ".dat":
+- return TreeConstructionFile.from_parent(parent, fspath=path)
++ if file_path.suffix == ".dat":
++ return TreeConstructionFile.from_parent(parent, path=file_path)
+ elif _tokenizer in dir_and_parents:
+- if path.ext == ".test":
+- return TokenizerFile.from_parent(parent, fspath=path)
++ if file_path.suffix == ".test":
++ return TokenizerFile.from_parent(parent, path=file_path)
+ elif _sanitizer_testdata in dir_and_parents:
+- if path.ext == ".dat":
+- return SanitizerFile.from_parent(parent, fspath=path)
++ if file_path.suffix == ".dat":
++ return SanitizerFile.from_parent(parent, path=file_path)
+
+
+ # Tiny wrapper to allow .from_parent constructors on older pytest for PY27
+diff --git a/requirements-test.txt b/requirements-test.txt
+index aca31f5e..860f5af1 100644
+--- a/requirements-test.txt
++++ b/requirements-test.txt
+@@ -3,7 +3,7 @@
+ flake8==3.9.2 ; python_version < '3.6'
+ flake8>=5.0.4; python_version >= '3.6'
+ pytest>=4.6.10,<5 ; python_version < '3'
+-pytest>=5.4.2,<8 ; python_version >= '3'
++pytest>=7,<10 ; python_version >= '3'
+ coverage>=5.1,<6
+ pytest-expect>=1.1.0,<2
+ mock>=3.0.5,<4 ; python_version < '3.3'
+
diff --git a/dev-python/html5lib/files/html5lib-1.2_pre20240221-pytest-9.1.patch b/dev-python/html5lib/files/html5lib-1.2_pre20240221-pytest-9.1.patch
new file mode 100644
index 000000000000..507b9e9bedcb
--- /dev/null
+++ b/dev-python/html5lib/files/html5lib-1.2_pre20240221-pytest-9.1.patch
@@ -0,0 +1,113 @@
+https://github.com/html5lib/html5lib-python/pull/600
+
+From b7e8c4ccec36c87e076daed4db68201de151cc57 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <tomas.hrnciar@me.com>
+Date: Mon, 29 Jun 2026 10:20:38 +0200
+Subject: [PATCH] Fix test compatibility with pytest >= 9.1
+
+Pytest 9.1 no longer accepts non-Collection iterables in parametrize. Wrap generator
+functions and itertools.product calls with list(). Also deduplicate the parametrize
+values in testLegacyQuoteAttribute. The character list had 6 duplicates
+between the "spec" prefix and the extended character ranges. With --strict (set
+in pytest.ini), pytest 9.1 enforces unique parametrization IDs and rejects them.
+
+Assisted-by: Claude Opus 4.6
+---
+ html5lib/tests/test_encoding.py | 4 ++--
+ html5lib/tests/test_sanitizer.py | 4 ++--
+ html5lib/tests/test_serializer.py | 12 +++++-------
+ html5lib/tests/test_treewalkers.py | 4 ++--
+ 4 files changed, 11 insertions(+), 13 deletions(-)
+
+diff --git a/html5lib/tests/test_encoding.py b/html5lib/tests/test_encoding.py
+index 47c4814a..951fd42f 100644
+--- a/html5lib/tests/test_encoding.py
++++ b/html5lib/tests/test_encoding.py
+@@ -82,7 +82,7 @@ def param_encoding():
+ yield test[b'data'], test[b'encoding']
+
+
+-@pytest.mark.parametrize("data, encoding", param_encoding())
++@pytest.mark.parametrize("data, encoding", list(param_encoding()))
+ def test_parser_encoding(data, encoding):
+ p = HTMLParser()
+ assert p.documentEncoding is None
+@@ -92,7 +92,7 @@ def test_parser_encoding(data, encoding):
+ assert encoding == p.documentEncoding, errorMessage(data, encoding, p.documentEncoding)
+
+
+-@pytest.mark.parametrize("data, encoding", param_encoding())
++@pytest.mark.parametrize("data, encoding", list(param_encoding()))
+ def test_prescan_encoding(data, encoding):
+ stream = _inputstream.HTMLBinaryInputStream(data, useChardet=False)
+ encoding = encoding.lower().decode("ascii")
+diff --git a/html5lib/tests/test_sanitizer.py b/html5lib/tests/test_sanitizer.py
+index 499310b6..15746ffa 100644
+--- a/html5lib/tests/test_sanitizer.py
++++ b/html5lib/tests/test_sanitizer.py
+@@ -130,8 +130,8 @@ def test_details_summary_allowed():
+
+
+ @pytest.mark.parametrize("expected, input",
+- (pytest.param(expected, input, id=id)
+- for id, expected, input in param_sanitizer()))
++ [pytest.param(expected, input, id=id)
++ for id, expected, input in param_sanitizer()])
+ def test_sanitizer(expected, input):
+ parsed = parseFragment(expected)
+ expected = serialize(parsed,
+diff --git a/html5lib/tests/test_serializer.py b/html5lib/tests/test_serializer.py
+index a2be0be5..2fec0341 100644
+--- a/html5lib/tests/test_serializer.py
++++ b/html5lib/tests/test_serializer.py
+@@ -155,14 +155,12 @@ def testSpecQuoteAttribute(c):
+ test_serializer(input_, output_, options_)
+
+
+-@pytest.mark.parametrize("c", list("\t\n\u000C\x20\r\"'=<>`"
+- "\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n"
++@pytest.mark.parametrize("c", list("\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n"
+ "\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15"
+ "\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
+- "\x20\x2f\x60\xa0\u1680\u180e\u180f\u2000"
+- "\u2001\u2002\u2003\u2004\u2005\u2006\u2007"
+- "\u2008\u2009\u200a\u2028\u2029\u202f\u205f"
+- "\u3000"))
++ "\x20\"'=<>/\x60\xa0\u1680\u180e\u180f"
++ "\u2000\u2001\u2002\u2003\u2004\u2005\u2006"
++ "\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000"))
+ def testLegacyQuoteAttribute(c):
+ input_ = [["StartTag", "http://www.w3.org/1999/xhtml", "span",
+ [{"namespace": None, "name": "foo", "value": c}]]]
+@@ -212,7 +210,7 @@ def param_serializer():
+ yield test["input"], test["expected"], test.get("options", {})
+
+
+-@pytest.mark.parametrize("input, expected, options", param_serializer())
++@pytest.mark.parametrize("input, expected, options", list(param_serializer()))
+ def test_serializer(input, expected, options):
+ encoding = options.get("encoding", None)
+
+diff --git a/html5lib/tests/test_treewalkers.py b/html5lib/tests/test_treewalkers.py
+index 780ca964..4fb5d1f7 100644
+--- a/html5lib/tests/test_treewalkers.py
++++ b/html5lib/tests/test_treewalkers.py
+@@ -87,7 +87,7 @@ def param_treewalker_six_mix():
+ yield intext, expected, attrs, tree
+
+
+-@pytest.mark.parametrize("intext, expected, attrs_to_add, tree", param_treewalker_six_mix())
++@pytest.mark.parametrize("intext, expected, attrs_to_add, tree", list(param_treewalker_six_mix()))
+ def test_treewalker_six_mix(intext, expected, attrs_to_add, tree):
+ """tests what happens when we add attributes to the intext"""
+ treeName, treeClass = tree
+@@ -105,7 +105,7 @@ def test_treewalker_six_mix(intext, expected, attrs_to_add, tree):
+ raise AssertionError("TreewalkerEditTest: %s\nExpected:\n%s\nReceived:\n%s" % (treeName, expected, output))
+
+
+-@pytest.mark.parametrize("tree,char", itertools.product(sorted(treeTypes.items()), ["x", "\u1234"]))
++@pytest.mark.parametrize("tree,char", list(itertools.product(sorted(treeTypes.items()), ["x", "\u1234"])))
+ def test_fragment_single_char(tree, char):
+ expected = [
+ {'data': char, 'type': 'Characters'}
+
diff --git a/dev-python/html5lib/html5lib-1.2_pre20240221.ebuild b/dev-python/html5lib/html5lib-1.2_pre20240221.ebuild
index cea969dd9ae0..8c64a90e3a34 100644
--- a/dev-python/html5lib/html5lib-1.2_pre20240221.ebuild
+++ b/dev-python/html5lib/html5lib-1.2_pre20240221.ebuild
@@ -45,6 +45,8 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.2_pre20240221-py314.patch
+ "${FILESDIR}"/${PN}-1.2_pre20240221-pytest-9.0.patch
+ "${FILESDIR}"/${PN}-1.2_pre20240221-pytest-9.1.patch
)
EPYTEST_PLUGINS=( pytest-expect )