From 79d3d026da42c9798b32cffab552353ba880b591 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 17 Jul 2023 14:09:18 +0200 Subject: [PATCH] Update to 4.9.3 (rhbz#2219811) --- .gitignore | 1 + 07db761f9f.patch | 32 ------------------- ...ion-of-ISO-Schematron-files-optional.patch | 8 ++--- c6b7e621e4.patch | 24 -------------- python-lxml.spec | 11 +++---- sources | 2 +- 6 files changed, 11 insertions(+), 67 deletions(-) delete mode 100644 07db761f9f.patch delete mode 100644 c6b7e621e4.patch diff --git a/.gitignore b/.gitignore index e39c3f5..b381b1f 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ lxml-2.2.7.tar.gz.asc /lxml-4.9.2.tar.gz /lxml-4.9.2-no-isoschematron.tar.gz /lxml-4.9.2-no-isoschematron-rng.tar.gz +/lxml-4.9.3-no-isoschematron-rng.tar.gz diff --git a/07db761f9f.patch b/07db761f9f.patch deleted file mode 100644 index f6070a5..0000000 --- a/07db761f9f.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 07db761f9f027d1814a43686cda6fca26e37a931 Mon Sep 17 00:00:00 2001 -From: Stefan Behnel -Date: Thu, 11 May 2023 10:29:02 +0200 -Subject: [PATCH] Avoid using the deprecated "imp" module. - -Closes https://bugs.launchpad.net/lxml/+bug/2018137 ---- - src/lxml/html/tests/test_html5parser.py | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/lxml/html/tests/test_html5parser.py b/src/lxml/html/tests/test_html5parser.py -index 56afe98b7..bcf7f1b12 100644 ---- a/src/lxml/html/tests/test_html5parser.py -+++ b/src/lxml/html/tests/test_html5parser.py -@@ -1,5 +1,4 @@ - import os --import imp - try: - from StringIO import StringIO - except ImportError: # python 3 -@@ -45,7 +44,10 @@ def find_module(self, fullname, path=None): - return None - - def load_module(self, fullname): -- mod = sys.modules.setdefault(fullname, imp.new_module(fullname)) -+ fake_module = object() -+ fake_module.__qualname__ = fullname -+ fake_module.__name__ = fullname.rsplit('.', 1)[-1] -+ mod = sys.modules.setdefault(fullname, fake_module) - mod.__file__, mod.__loader__, mod.__path__ = "", self, [] - mod.__dict__.update(self.mocks[fullname]) - return mod diff --git a/Make-the-validation-of-ISO-Schematron-files-optional.patch b/Make-the-validation-of-ISO-Schematron-files-optional.patch index d07006e..3bc8132 100644 --- a/Make-the-validation-of-ISO-Schematron-files-optional.patch +++ b/Make-the-validation-of-ISO-Schematron-files-optional.patch @@ -1,4 +1,4 @@ -From 4ac96ce046e9f58141bd66639ba8cb1fad9deefb Mon Sep 17 00:00:00 2001 +From a500f721e3b34018f0a86af275427663dc337b5a Mon Sep 17 00:00:00 2001 From: Stefan Behnel Date: Wed, 12 Jul 2023 16:59:07 +0200 Subject: [PATCH] Make the validation of ISO-Schematron files optional in lxml, @@ -13,14 +13,14 @@ See https://bugs.launchpad.net/lxml/+bug/2024343 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt -index c684ad5..40e32cd 100644 +index 24052db..e68ee9a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,17 @@ lxml changelog ============== -+4.9.2+ ++4.9.3+ +====== + +* LP#2024343: The validation of the schema file itself is now optional in the @@ -31,7 +31,7 @@ index c684ad5..40e32cd 100644 + constant ``lxml.isoschematron.schematron_schema_valid_supported`` can be used + to detect whether schema file validation is available. + - 4.9.2 (2022-12-13) + 4.9.3 (2023-07-05) ================== diff --git a/doc/validation.txt b/doc/validation.txt diff --git a/c6b7e621e4.patch b/c6b7e621e4.patch deleted file mode 100644 index fbdb61d..0000000 --- a/c6b7e621e4.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c6b7e621e4696c02bf8f6ea423ffbbf2109748ab Mon Sep 17 00:00:00 2001 -From: Stefan Behnel -Date: Thu, 11 May 2023 10:30:15 +0200 -Subject: [PATCH] Avoid using the deprecated "imp" module. - -Closes https://bugs.launchpad.net/lxml/+bug/2018137 ---- - src/lxml/html/tests/test_html5parser.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/lxml/html/tests/test_html5parser.py b/src/lxml/html/tests/test_html5parser.py -index bcf7f1b12..57878a5e3 100644 ---- a/src/lxml/html/tests/test_html5parser.py -+++ b/src/lxml/html/tests/test_html5parser.py -@@ -44,7 +44,8 @@ def find_module(self, fullname, path=None): - return None - - def load_module(self, fullname): -- fake_module = object() -+ class Cls: pass -+ fake_module = Cls() - fake_module.__qualname__ = fullname - fake_module.__name__ = fullname.rsplit('.', 1)[-1] - mod = sys.modules.setdefault(fullname, fake_module) diff --git a/python-lxml.spec b/python-lxml.spec index 28a8382..fb91a3a 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -1,6 +1,6 @@ Name: python-lxml -Version: 4.9.2 -Release: 9%{?dist} +Version: 4.9.3 +Release: 1%{?dist} Summary: XML processing library combining libxml2/libxslt with the ElementTree API # The lxml project is licensed under BSD-3-Clause @@ -27,10 +27,6 @@ Patch: https://github.com/lxml/lxml/pull/380.patch # Upstream issue: https://bugs.launchpad.net/lxml/+bug/2016939 Patch: Skip-failing-test-test_html_prefix_nsmap.patch -# Avoid using the deprecated "imp" module (removed in Python 3.12) -Patch: https://github.com/lxml/lxml/commit/07db761f9f.patch -Patch: https://github.com/lxml/lxml/commit/c6b7e621e4.patch - BuildRequires: gcc BuildRequires: libxml2-devel BuildRequires: libxslt-devel @@ -100,6 +96,9 @@ cp -a build/lib.%{python3_platform}-*/* src/ %doc README.rst %changelog +* Fri Jul 21 2023 Lumír Balhar - 4.9.3-1 +- Update to 4.9.3 (rhbz#2219811) + * Fri Jul 21 2023 Fedora Release Engineering - 4.9.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index dcb73a3..b03cd14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxml-4.9.2-no-isoschematron-rng.tar.gz) = 7de5a626bb87f2f56f90a3c308199ed79d78796eeb075b5d42df4bccf3606d3fb2e2981fa9206412b675304dd487fce2dfb90b3b3e0793e8d63be2216b325c47 +SHA512 (lxml-4.9.3-no-isoschematron-rng.tar.gz) = e3e289ad0aa4bec75fbdee5682d1047c2f98f48f9fd39571175f6a758a10ab2266ed4591bf9dcb65a387ee22cf9de4adac57997dca57b95e0bae07268aff33fe