diff --git a/Skip-failing-test_iterparse_utf16_bom.patch b/Skip-failing-test_iterparse_utf16_bom.patch deleted file mode 100644 index 55d0aab5b932ec27a42e8ea9684b35ef9e91baaa..0000000000000000000000000000000000000000 --- a/Skip-failing-test_iterparse_utf16_bom.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1e096eeabcb6f3995c8e9da6f544e7f9f5ff5f08 Mon Sep 17 00:00:00 2001 -From: zhuofeng -Date: Wed, 9 Aug 2023 15:22:11 +0800 -Subject: [PATCH] Skip failing test_iterparse_utf16_bom - ---- - src/lxml/tests/test_io.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/lxml/tests/test_io.py b/src/lxml/tests/test_io.py -index 8fac41d..2b5d0de 100644 ---- a/src/lxml/tests/test_io.py -+++ b/src/lxml/tests/test_io.py -@@ -4,6 +4,7 @@ IO test cases that apply to both etree and ElementTree - - - import unittest -+from unittest import skip - import tempfile, gzip, os, os.path, gc, shutil - - from .common_imports import ( -@@ -305,6 +306,7 @@ class _IOTestCaseBase(HelperTestCase): - os.unlink(f.name) - self.assertEqual(utext, root.text) - -+ @skip - def test_iterparse_utf16_bom(self): - utext = 'Søk på nettet' - uxml = '

%s

' % utext --- -2.33.0 - diff --git a/Skip-test_feedparser_data-if-lxml_html_clean-is-not-available.patch b/Skip-test_feedparser_data-if-lxml_html_clean-is-not-available.patch deleted file mode 100644 index c748c0ac8f1b56233de039ceb5f169ea847dff5c..0000000000000000000000000000000000000000 --- a/Skip-test_feedparser_data-if-lxml_html_clean-is-not-available.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f5f64df808b35969794ba3ea8c19079276aa0cb0 Mon Sep 17 00:00:00 2001 -From: Lumir Balhar -Date: Thu, 4 Apr 2024 11:11:38 +0200 -Subject: [PATCH] Skip test_feedparser_data if lxml_html_clean is not available - -This is useful mostly for distributors shipping lxml without -lxml_html_clean. ---- - src/lxml/html/tests/test_feedparser_data.py | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/src/lxml/html/tests/test_feedparser_data.py b/src/lxml/html/tests/test_feedparser_data.py -index 36fba1acb..264c0d4b5 100644 ---- a/src/lxml/html/tests/test_feedparser_data.py -+++ b/src/lxml/html/tests/test_feedparser_data.py -@@ -9,7 +9,11 @@ - from lxml.tests.common_imports import doctest - from lxml.doctestcompare import LHTMLOutputChecker - --from lxml.html.clean import clean, Cleaner -+try: -+ from lxml.html.clean import clean, Cleaner -+ html_clean_available = True -+except ImportError: -+ html_clean_available = False - - feed_dirs = [ - os.path.join(os.path.dirname(__file__), 'feedparser-data'), -@@ -80,6 +84,11 @@ def shortDescription(self): - - def test_suite(): - suite = unittest.TestSuite() -+ -+ if not html_clean_available: -+ print("Skipping tests in feedparser_data - external lxml_html_clean package is not installed") -+ return suite -+ - for dir in feed_dirs: - for fn in os.listdir(dir): - fn = os.path.join(dir, fn) diff --git a/lxml-5.2.1.tar.gz b/lxml-5.2.2.tar.gz similarity index 34% rename from lxml-5.2.1.tar.gz rename to lxml-5.2.2.tar.gz index c36f33709d310e780e37f9613d44a25aa57f7878..e3291cf5f623df2cfae31f970f0dd91c553aaf12 100644 Binary files a/lxml-5.2.1.tar.gz and b/lxml-5.2.2.tar.gz differ diff --git a/python-lxml.spec b/python-lxml.spec index e564d44f282bcc059bda29322beaece6e37f8885..95888dde7eda540cac6546f21bc2965fe3ef3b4d 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -6,16 +6,12 @@ the simplicity of a native Python API, mostly compatible but superior to the wel The latest release works with all CPython versions from 2.7 to 3.7. Name: python-lxml -Version: 5.2.1 +Version: 5.2.2 Release: 1 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/ea/e2/3834472e7f18801e67a3cd6f3c203a5456d6f7f903cfb9a990e62098a2f3/lxml-5.2.1.tar.gz - -Patch0: Skip-failing-test_iterparse_utf16_bom.patch -# Skip some tests if lxml_html_clean is not available -Patch1: Skip-test_feedparser_data-if-lxml_html_clean-is-not-available.patch +Source0: https://files.pythonhosted.org/packages/63/f7/ffbb6d2eb67b80a45b8a0834baa5557a14a5ffce0979439e7cd7f0c4055b/lxml-5.2.2.tar.gz %description %{_description} @@ -79,6 +75,12 @@ make test %doc README.rst src/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/readme.txt %changelog +* 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. + - LP#2059910: The minimum CPU architecture for the Linux x86 binary wheels was set back to "core2", without SSE 4.2. + - If libxml2 uses iconv, the compile time version is available as etree.ICONV_COMPILED_VERSION. + * Fri May 10 2024 wangxiaomeng - 5.2.1-1 - upgrade version to 5.2.1 - LP#2059910: The minimum CPU architecture for the Linux x86 binary wheels was set back to "core2", but with SSE 4.2 enabled