diff --git a/srcpkgs/python3-lxml/patches/cython3-fix-test.patch b/srcpkgs/python3-lxml/patches/cython3-fix-test.patch deleted file mode 100644 index 70348622048..00000000000 --- a/srcpkgs/python3-lxml/patches/cython3-fix-test.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/src/lxml/tests/test_errors.py b/src/lxml/tests/test_errors.py -index c0aee744..4875f298 100644 ---- a/src/lxml/tests/test_errors.py -+++ b/src/lxml/tests/test_errors.py -@@ -28,7 +28,6 @@ class ErrorTestCase(HelperTestCase): - def test_element_cyclic_gc_none(self): - # test if cyclic reference can crash etree - Element = self.etree.Element -- getrefcount = sys.getrefcount - - # must disable tracing as it could change the refcounts - trace_func = sys.gettrace() -@@ -36,16 +35,16 @@ class ErrorTestCase(HelperTestCase): - sys.settrace(None) - gc.collect() - -- count = getrefcount(None) -+ count1 = gc.get_count() - - l = [Element('name'), Element('name')] - l.append(l) - - del l - gc.collect() -- count = getrefcount(None) - count -+ count2 = gc.get_count() - -- self.assertEqual(count, 0) -+ self.assertEqual(count1, count2) - finally: - sys.settrace(trace_func) - diff --git a/srcpkgs/python3-lxml/patches/cython3-legacy.patch b/srcpkgs/python3-lxml/patches/cython3-legacy.patch deleted file mode 100644 index 3a01c85705c..00000000000 --- a/srcpkgs/python3-lxml/patches/cython3-legacy.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/setupinfo.py b/setupinfo.py -index 5feb13bf..ea1b391c 100644 ---- a/setupinfo.py -+++ b/setupinfo.py -@@ -148,6 +148,7 @@ def ext_modules(static_include_dirs, static_library_dirs, - - cythonize_directives = { - 'binding': True, -+ 'legacy_implicit_noexcept': True, - } - if OPTION_WITH_COVERAGE: - cythonize_directives['linetrace'] = True diff --git a/srcpkgs/python3-lxml/patches/tests-fix-encoding-name.patch b/srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch similarity index 54% rename from srcpkgs/python3-lxml/patches/tests-fix-encoding-name.patch rename to srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch index 28f165c24f4..e2d0e3b36bd 100644 --- a/srcpkgs/python3-lxml/patches/tests-fix-encoding-name.patch +++ b/srcpkgs/python3-lxml/patches/fix-encoding-tests-musl.patch @@ -1,16 +1,19 @@ -from alpine: https://gitlab.alpinelinux.org/alpine/aports/-/commit/369de77b6197a5d04beb551537533fc82141a516 - -From: Patrycja Rosa -Date: Thu, 10 Feb 2022 14:09:24 +0100 -Subject: test_incremental_xmlfile: fix encoding name +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 -@@ -173,4 +173,4 @@ +@@ -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/patches/libxml-2.10.4.patch b/srcpkgs/python3-lxml/patches/libxml-2.10.4.patch deleted file mode 100644 index 4682eddd6f5..00000000000 --- a/srcpkgs/python3-lxml/patches/libxml-2.10.4.patch +++ /dev/null @@ -1,17 +0,0 @@ -From alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/main/py3-lxml - -the find above returns None with this version --- -diff --git a/src/lxml/tests/test_etree.py b/src/lxml/tests/test_etree.py -index 0339796..790c57a 100644 ---- a/src/lxml/tests/test_etree.py -+++ b/src/lxml/tests/test_etree.py -@@ -3073,7 +3073,7 @@ class ETreeOnlyTestCase(HelperTestCase): - if etree.LIBXML_VERSION < (2, 9, 11): - self.assertEqual({'hha': None}, el.nsmap) - else: -- self.assertEqual({}, el.nsmap) -+ self.assertEqual(None, el) - - def test_getchildren(self): - Element = self.etree.Element diff --git a/srcpkgs/python3-lxml/patches/libxml-2.11.0.patch b/srcpkgs/python3-lxml/patches/libxml-2.11.0.patch deleted file mode 100644 index 6ed59d3b2fe..00000000000 --- a/srcpkgs/python3-lxml/patches/libxml-2.11.0.patch +++ /dev/null @@ -1,14 +0,0 @@ -From alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/main/py3-lxml - -diff --git a/src/lxml/tests/test_io.py b/src/lxml/tests/test_io.py -index cbdbcef..efbd3fd 100644 ---- a/src/lxml/tests/test_io.py -+++ b/src/lxml/tests/test_io.py -@@ -312,6 +312,7 @@ class _IOTestCaseBase(HelperTestCase): - self.assertEqual(5, len(boms)) - xml = uxml.encode("utf-16") - self.assertTrue(xml[:2] in boms, repr(xml[:2])) -+ return True - - f = tempfile.NamedTemporaryFile(delete=False) - try: diff --git a/srcpkgs/python3-lxml/template b/srcpkgs/python3-lxml/template index 920367f5943..ee9b3b0345d 100644 --- a/srcpkgs/python3-lxml/template +++ b/srcpkgs/python3-lxml/template @@ -1,7 +1,7 @@ # Template file for 'python3-lxml' pkgname=python3-lxml -version=4.9.3 -revision=3 +version=5.3.0 +revision=1 build_style=python3-module make_build_args="--with-cython" hostmakedepends="python3-Cython python3-setuptools" @@ -14,10 +14,10 @@ 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=42b9ab83cb8739d817c7fff41c20f31aa61625bb6f6ab333873a5f3406b139ac +checksum=eb22f7ceb319c29247cfa398435d00e6286d19a32b4870b67a8e9a38d72f2ebd do_check() { - make test3 + make test } post_install() {