diff --git a/Fix-test_elementtree-with-Expat-2.6.0.patch b/Fix-test_elementtree-with-Expat-2.6.0.patch deleted file mode 100644 index eb4be20cbfba03c7a5fea830646fe19c28b5b0e6..0000000000000000000000000000000000000000 --- a/Fix-test_elementtree-with-Expat-2.6.0.patch +++ /dev/null @@ -1,92 +0,0 @@ -From e3012a702dea2b03830fe00a5e8f7a429bbc3f42 Mon Sep 17 00:00:00 2001 -From: Serhiy Storchaka -Date: Mon, 22 Apr 2024 16:52:26 +0800 -Subject: [PATCH] Fix test_elementtree with Expat 2.6.0 - ---- - src/lxml/tests/test_elementtree.py | 62 +++++++++++++++++++----------- - 1 file changed, 39 insertions(+), 23 deletions(-) - -diff --git a/src/lxml/tests/test_elementtree.py b/src/lxml/tests/test_elementtree.py -index 8ccf444..ef923c5 100644 ---- a/src/lxml/tests/test_elementtree.py -+++ b/src/lxml/tests/test_elementtree.py -@@ -10,6 +10,7 @@ import copy - import io - import operator - import os -+import pyexpat - import re - import sys - import textwrap -@@ -4383,29 +4384,44 @@ class _XMLPullParserTest(unittest.TestCase): - self.assertEqual([(action, elem.tag) for action, elem in events], - expected) - -- def test_simple_xml(self): -- for chunk_size in (None, 1, 5): -- #with self.subTest(chunk_size=chunk_size): -- parser = self.etree.XMLPullParser() -- self.assert_event_tags(parser, []) -- self._feed(parser, "\n", chunk_size) -- self.assert_event_tags(parser, []) -- self._feed(parser, -- "\n text\n", chunk_size) -- self.assert_event_tags(parser, [('end', 'element')]) -- self._feed(parser, "texttail\n", chunk_size) -- self._feed(parser, "\n", chunk_size) -- self.assert_event_tags(parser, [ -- ('end', 'element'), -- ('end', 'empty-element'), -- ]) -- self._feed(parser, "\n", chunk_size) -- self.assert_event_tags(parser, [('end', 'root')]) -- root = self._close_and_return_root(parser) -- self.assertEqual(root.tag, 'root') -+ def test_simple_xml(self, chunk_size=None): -+ parser = self.etree.XMLPullParser() -+ self.assert_event_tags(parser, []) -+ self._feed(parser, "\n", chunk_size) -+ self.assert_event_tags(parser, []) -+ self._feed(parser, -+ "\n text\n", chunk_size) -+ self.assert_event_tags(parser, [('end', 'element')]) -+ self._feed(parser, "texttail\n", chunk_size) -+ self._feed(parser, "\n", chunk_size) -+ self.assert_event_tags(parser, [ -+ ('end', 'element'), -+ ('end', 'empty-element'), -+ ]) -+ self._feed(parser, "\n", chunk_size) -+ self.assert_event_tags(parser, [('end', 'root')]) -+ root = self._close_and_return_root(parser) -+ self.assertEqual(root.tag, 'root') -+ -+ def test_simple_xml_chunk_1(self): -+ if self.etree is not etree and pyexpat.version_info >= (2, 6, 0): -+ raise unittest.SkipTest( -+ "Feeding the parser by too small chunks defers parsing" -+ ) -+ self.test_simple_xml(chunk_size=1) -+ -+ def test_simple_xml_chunk_5(self): -+ if self.etree is not etree and pyexpat.version_info >= (2, 6, 0): -+ raise unittest.SkipTest( -+ "Feeding the parser by too small chunks defers parsing" -+ ) -+ self.test_simple_xml(chunk_size=5) -+ -+ def test_simple_xml_chunk_22(self): -+ self.test_simple_xml(chunk_size=22) - - def test_feed_while_iterating(self): - parser = self.etree.XMLPullParser() --- -2.43.0 - diff --git a/backport-LP-2075141-Fix-a-test-with-recent-libxslt-versions-1.patch b/backport-LP-2075141-Fix-a-test-with-recent-libxslt-versions-1.patch new file mode 100644 index 0000000000000000000000000000000000000000..2c9f90087daad3087873ce23cf05be910e984ed4 --- /dev/null +++ b/backport-LP-2075141-Fix-a-test-with-recent-libxslt-versions-1.patch @@ -0,0 +1,25 @@ +From 812cf8773cd2e2f9e9e92521303c26de997df711 Mon Sep 17 00:00:00 2001 +From: Stefan Behnel +Date: Wed, 7 Aug 2024 11:02:29 +0200 +Subject: [PATCH] LP#2075141: Fix a test with recent libxslt versions (1.1.42). + +--- + doc/resolvers.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/resolvers.txt b/doc/resolvers.txt +index 6f0b3208..3c2af88e 100644 +--- a/doc/resolvers.txt ++++ b/doc/resolvers.txt +@@ -263,7 +263,7 @@ operations: + >>> result = transform(normal_doc) + Resolved url hoi:test as prefix hoi + +- >>> ac = etree.XSLTAccessControl(read_network=False) ++ >>> ac = etree.XSLTAccessControl(read_network=False, read_file=False) + >>> transform = etree.XSLT(honk_doc, access_control=ac) + Resolved url honk:test as prefix honk + >>> result = transform(normal_doc) +-- +2.37.3.windows.1 + diff --git a/python-lxml.spec b/python-lxml.spec index 95888dde7eda540cac6546f21bc2965fe3ef3b4d..8bb9f814dd7978142786387e13ca37552ac1bd45 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -7,12 +7,14 @@ The latest release works with all CPython versions from 2.7 to 3.7. Name: python-lxml Version: 5.2.2 -Release: 1 +Release: 2 Summary: XML processing library combining libxml2/libxslt with the ElementTree API License: BSD URL: https://github.com/lxml/lxml Source0: https://files.pythonhosted.org/packages/63/f7/ffbb6d2eb67b80a45b8a0834baa5557a14a5ffce0979439e7cd7f0c4055b/lxml-5.2.2.tar.gz +Patch6000: backport-LP-2075141-Fix-a-test-with-recent-libxslt-versions-1.patch + %description %{_description} @@ -75,6 +77,9 @@ make test %doc README.rst src/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/readme.txt %changelog +* Wed Aug 28 2024 zhuofeng - 5.2.2-2 +- fix failed test + * Thu May 23 2024 wangxiaomeng - 5.2.2-1 - upgrade version to 5.2.2 - GH#417: The test_feed_parser test could fail if lxml_html_clean was not installed. It is now skipped in that case.