Update to 5.3.0 (rhbz#2303963)

This commit is contained in:
Lumir Balhar 2024-08-12 14:59:25 +02:00
commit afcfecf47d
4 changed files with 3 additions and 49 deletions

1
.gitignore vendored
View file

@ -66,3 +66,4 @@ lxml-2.2.7.tar.gz.asc
/lxml-5.1.0-no-isoschematron-rng.tar.gz
/lxml-5.2.0-no-isoschematron-rng.tar.gz
/lxml-5.2.1-no-isoschematron-rng.tar.gz
/lxml-5.3.0-no-isoschematron-rng.tar.gz

View file

@ -1,40 +0,0 @@
From f5f64df808b35969794ba3ea8c19079276aa0cb0 Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
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)

View file

@ -1,5 +1,5 @@
Name: python-lxml
Version: 5.2.1
Version: 5.3.0
Release: %autorelease
Summary: XML processing library combining libxml2/libxslt with the ElementTree API
@ -16,9 +16,6 @@ URL: https://github.com/lxml/lxml
Source0: lxml-%{version}-no-isoschematron-rng.tar.gz
Source1: get-lxml-source.sh
# Skip some tests if lxml_html_clean is not available
Patch: https://github.com/lxml/lxml/pull/417.patch
BuildRequires: gcc
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
@ -67,10 +64,6 @@ Python 3 version.
sed -i "s/Cython.*/Cython/" requirements.txt
sed -i 's/"Cython.*",/"Cython",/' pyproject.toml
# Fix doctest failing with the latest libxslt (rhbz#2301176)
# Reported upstream: https://bugs.launchpad.net/lxml/+bug/2075141
sed -i "s/read_network=False/read_network=False,read_file=False/" doc/resolvers.txt
%generate_buildrequires
%pyproject_buildrequires -x source%{?with_extras:,cssselect,html5,htmlsoup,html_clean}

View file

@ -1 +1 @@
SHA512 (lxml-5.2.1-no-isoschematron-rng.tar.gz) = 7bfd9caf7e45157726e16c7286bdcb1b4dfa24df000df96d6571d65f59760ea5747e364da788cee3116977810b870ab90e451b519701f5cc26f1111a2528c996
SHA512 (lxml-5.3.0-no-isoschematron-rng.tar.gz) = 4e16640e59f74f38d78382b33b8d1797d03da1eca5890c3a2f5b359e21ede86a3dd1394a59734554b9f25c95548df3586e95080f520082b05f60e89e558b127e