Update to 4.9.3 (rhbz#2219811)

This commit is contained in:
Lumir Balhar 2023-07-17 14:09:18 +02:00 committed by Miro Hrončok
parent 4452ba9aa0
commit 79d3d026da
6 changed files with 11 additions and 67 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -1,32 +0,0 @@
From 07db761f9f027d1814a43686cda6fca26e37a931 Mon Sep 17 00:00:00 2001
From: Stefan Behnel <stefan_ml@behnel.de>
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__ = "<dummy>", self, []
mod.__dict__.update(self.mocks[fullname])
return mod

View File

@ -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 <stefan_ml@behnel.de>
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

View File

@ -1,24 +0,0 @@
From c6b7e621e4696c02bf8f6ea423ffbbf2109748ab Mon Sep 17 00:00:00 2001
From: Stefan Behnel <stefan_ml@behnel.de>
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)

View File

@ -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 <lbalhar@redhat.com> - 4.9.3-1
- Update to 4.9.3 (rhbz#2219811)
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (lxml-4.9.2-no-isoschematron-rng.tar.gz) = 7de5a626bb87f2f56f90a3c308199ed79d78796eeb075b5d42df4bccf3606d3fb2e2981fa9206412b675304dd487fce2dfb90b3b3e0793e8d63be2216b325c47
SHA512 (lxml-4.9.3-no-isoschematron-rng.tar.gz) = e3e289ad0aa4bec75fbdee5682d1047c2f98f48f9fd39571175f6a758a10ab2266ed4591bf9dcb65a387ee22cf9de4adac57997dca57b95e0bae07268aff33fe