From 092c8f0bee28da7e426bd12abf9919b8459ef84f Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Sat, 28 Mar 2026 07:14:12 +0000 Subject: Adding metadata --- dev-python/html5lib/Manifest | 1 - .../html5lib/files/html5lib-1.1-pytest6.patch | 149 --------------------- dev-python/html5lib/html5lib-1.1-r2.ebuild | 49 ------- .../html5lib/html5lib-1.2_pre20240221.ebuild | 5 +- 4 files changed, 4 insertions(+), 200 deletions(-) delete mode 100644 dev-python/html5lib/files/html5lib-1.1-pytest6.patch delete mode 100644 dev-python/html5lib/html5lib-1.1-r2.ebuild (limited to 'dev-python/html5lib') diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest index 7fcd259d6576..2aa2e3aabd91 100644 --- a/dev-python/html5lib/Manifest +++ b/dev-python/html5lib/Manifest @@ -1,3 +1,2 @@ -DIST html5lib-1.1.tar.gz 272215 BLAKE2B 11a4fc3fb84bf8bab4af5da1de30b0892a9eb454505716b3db391187053c9aac159b1c82ae787896592b8fc850363bba9313b9d7fc617150771c3bfa1aeadefb SHA512 af7c29591007fded99be6c38e3d0ae5a4ac32d71d26046a615918ae732cb1c1ecbf754f47ceca1a53726c3843f3ecea7af87a7362281b45ff3af495815818626 DIST html5lib-python-fd4f032bc090d44fb11a84b352dad7cbee0a4745.gh.tar.gz 259834 BLAKE2B cf55f9fed5d7fea54966e8add3a4d1db1cbd85f5a771e38f359494b53a9b45c0d5031f561d1e57b02f8b6061bca102a2fea4997da5c05841cf30a81adbeb8742 SHA512 3965f2c5b55a805d6d6b86866315a6f776d5237ac189a70d3d33e713c744b30c471424365e400af3f3bd23348070e598f138629f5d35568954aeb9c067e84860 DIST html5lib-tests-9b4a29c943b3c905e46b26569bae16de8b373516.gh.tar.gz 141487 BLAKE2B 4a2c0769f9e76c5e093af130427b7cf5407a11bd80670ca00013cb15a8da0f3c58cb2ea5ff526d299d9ddfbdab4a5ae9bcb6d388d4c709a573aba9d031e8b81f SHA512 8be9d913a48a498717f3931eafe64f53e5810c01451bbbbbdf80cef51e3274a3c8af523388e55c72762842b416ec5853213102998673c030229029bcfc954fce diff --git a/dev-python/html5lib/files/html5lib-1.1-pytest6.patch b/dev-python/html5lib/files/html5lib-1.1-pytest6.patch deleted file mode 100644 index d8df5f2cf2f6..000000000000 --- a/dev-python/html5lib/files/html5lib-1.1-pytest6.patch +++ /dev/null @@ -1,149 +0,0 @@ -# https://github.com/html5lib/html5lib-python/pull/506 -# https://bugs.gentoo.org/754144 - -and part of 4a87368b71090f1432df6302f178c4babfcec93f - -diff --git a/html5lib/tests/conftest.py b/html5lib/tests/conftest.py -index dad167c5..fffeb50c 100644 ---- a/html5lib/tests/conftest.py -+++ b/html5lib/tests/conftest.py -@@ -99,10 +99,19 @@ def pytest_collect_file(path, parent): - - if _tree_construction in dir_and_parents: - if path.ext == ".dat": -- return TreeConstructionFile(path, parent) -+ return TreeConstructionFile.from_parent(parent, fspath=path) - elif _tokenizer in dir_and_parents: - if path.ext == ".test": -- return TokenizerFile(path, parent) -+ return TokenizerFile.from_parent(parent, fspath=path) - elif _sanitizer_testdata in dir_and_parents: - if path.ext == ".dat": -- return SanitizerFile(path, parent) -+ return SanitizerFile.from_parent(parent, fspath=path) -+ -+ -+# Tiny wrapper to allow .from_parent constructors on older pytest for PY27 -+if not hasattr(pytest.Item.__base__, "from_parent"): -+ @classmethod -+ def from_parent(cls, parent, **kwargs): -+ return cls(parent=parent, **kwargs) -+ -+ pytest.Item.__base__.from_parent = from_parent -diff --git a/html5lib/tests/sanitizer.py b/html5lib/tests/sanitizer.py -index bb483421..16e53868 100644 ---- a/html5lib/tests/sanitizer.py -+++ b/html5lib/tests/sanitizer.py -@@ -13,7 +13,7 @@ def collect(self): - with codecs.open(str(self.fspath), "r", encoding="utf-8") as fp: - tests = json.load(fp) - for i, test in enumerate(tests): -- yield SanitizerTest(str(i), self, test=test) -+ yield SanitizerTest.from_parent(self, name=str(i), test=test) - - - class SanitizerTest(pytest.Item): -diff --git a/html5lib/tests/tokenizer.py b/html5lib/tests/tokenizer.py -index 47264cc3..cc9897a4 100644 ---- a/html5lib/tests/tokenizer.py -+++ b/html5lib/tests/tokenizer.py -@@ -192,7 +192,7 @@ def collect(self): - tests = json.load(fp) - if 'tests' in tests: - for i, test in enumerate(tests['tests']): -- yield TokenizerTestCollector(str(i), self, testdata=test) -+ yield TokenizerTestCollector.from_parent(self, name=str(i), testdata=test) - - - class TokenizerTestCollector(pytest.Collector): -@@ -207,10 +207,10 @@ def __init__(self, name, parent=None, config=None, session=None, testdata=None): - def collect(self): - for initialState in self.testdata["initialStates"]: - initialState = capitalize(initialState) -- item = TokenizerTest(initialState, -- self, -- self.testdata, -- initialState) -+ item = TokenizerTest.from_parent(self, -+ name=initialState, -+ test=self.testdata, -+ initialState=initialState) - if self.testdata["input"] is None: - item.add_marker(pytest.mark.skipif(True, reason="Relies on lone surrogates")) - yield item -diff --git a/html5lib/tests/tree_construction.py b/html5lib/tests/tree_construction.py -index 1ef6e725..fb0657bf 100644 ---- a/html5lib/tests/tree_construction.py -+++ b/html5lib/tests/tree_construction.py -@@ -26,7 +26,7 @@ class TreeConstructionFile(pytest.File): - def collect(self): - tests = TestData(str(self.fspath), "data") - for i, test in enumerate(tests): -- yield TreeConstructionTest(str(i), self, testdata=test) -+ yield TreeConstructionTest.from_parent(self, name=str(i), testdata=test) - - - class TreeConstructionTest(pytest.Collector): -@@ -48,11 +48,11 @@ def _getParserTests(self, treeName, treeAPIs): - nodeid = "%s::parser::namespaced" % treeName - else: - nodeid = "%s::parser::void-namespace" % treeName -- item = ParserTest(nodeid, -- self, -- self.testdata, -- treeAPIs["builder"] if treeAPIs is not None else None, -- namespaceHTMLElements) -+ item = ParserTest.from_parent(self, -+ name=nodeid, -+ test=self.testdata, -+ treeClass=treeAPIs["builder"] if treeAPIs is not None else None, -+ namespaceHTMLElements=namespaceHTMLElements) - item.add_marker(getattr(pytest.mark, treeName)) - item.add_marker(pytest.mark.parser) - if namespaceHTMLElements: -@@ -61,10 +61,10 @@ def _getParserTests(self, treeName, treeAPIs): - - def _getTreeWalkerTests(self, treeName, treeAPIs): - nodeid = "%s::treewalker" % treeName -- item = TreeWalkerTest(nodeid, -- self, -- self.testdata, -- treeAPIs) -+ item = TreeWalkerTest.from_parent(self, -+ name=nodeid, -+ test=self.testdata, -+ treeAPIs=treeAPIs) - item.add_marker(getattr(pytest.mark, treeName)) - item.add_marker(pytest.mark.treewalker) - yield item - -diff --git a/html5lib/tests/tokenizer.py b/html5lib/tests/tokenizer.py -index cc9897a..b49d2e6 100644 ---- a/html5lib/tests/tokenizer.py -+++ b/html5lib/tests/tokenizer.py -@@ -246,7 +246,9 @@ class TokenizerTest(pytest.Item): - def repr_failure(self, excinfo): - traceback = excinfo.traceback - ntraceback = traceback.cut(path=__file__) -- excinfo.traceback = ntraceback.filter() -+ pytest_ver = getattr(pytest, "version_tuple", ()) -+ filter_args = (excinfo,) if pytest_ver >= (7, 4, 0) else () -+ excinfo.traceback = ntraceback.filter(*filter_args) - - return excinfo.getrepr(funcargs=True, - showlocals=False, -diff --git a/html5lib/tests/tree_construction.py b/html5lib/tests/tree_construction.py -index fb0657b..363b48c 100644 ---- a/html5lib/tests/tree_construction.py -+++ b/html5lib/tests/tree_construction.py -@@ -135,7 +135,9 @@ class ParserTest(pytest.Item): - def repr_failure(self, excinfo): - traceback = excinfo.traceback - ntraceback = traceback.cut(path=__file__) -- excinfo.traceback = ntraceback.filter() -+ pytest_ver = getattr(pytest, "version_tuple", ()) -+ filter_args = (excinfo,) if pytest_ver >= (7, 4, 0) else () -+ excinfo.traceback = ntraceback.filter(*filter_args) - - return excinfo.getrepr(funcargs=True, - showlocals=False, diff --git a/dev-python/html5lib/html5lib-1.1-r2.ebuild b/dev-python/html5lib/html5lib-1.1-r2.ebuild deleted file mode 100644 index 7b87b8d32501..000000000000 --- a/dev-python/html5lib/html5lib-1.1-r2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..14} ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 pypi - -DESCRIPTION="HTML parser based on the HTML5 specification" -HOMEPAGE=" - https://github.com/html5lib/html5lib-python/ - https://html5lib.readthedocs.io/ - https://pypi.org/project/html5lib/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos" - -PATCHES=( - "${FILESDIR}"/${P}-pytest6.patch -) - -RDEPEND=" - >=dev-python/six-1.9[${PYTHON_USEDEP}] - dev-python/webencodings[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/pytest-expect[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - distutils-r1_src_prepare - - sed -e 's:from mock:from unittest.mock:' \ - -i html5lib/tests/test_meta.py || die -} - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -p pytest_expect -} diff --git a/dev-python/html5lib/html5lib-1.2_pre20240221.ebuild b/dev-python/html5lib/html5lib-1.2_pre20240221.ebuild index b2cbe27bffac..9936be8ee623 100644 --- a/dev-python/html5lib/html5lib-1.2_pre20240221.ebuild +++ b/dev-python/html5lib/html5lib-1.2_pre20240221.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -39,6 +39,9 @@ RDEPEND=" >=dev-python/six-1.9[${PYTHON_USEDEP}] >=dev-python/webencodings-0.5.1[${PYTHON_USEDEP}] " +BDEPEND=" + dev-python/pkg-resources[${PYTHON_USEDEP}] +" PATCHES=( "${FILESDIR}"/${PN}-1.2_pre20240221-py314.patch -- cgit v1.3.1