[packages/python-lxml] - up to 5.0.2, python3 moved to it's own package

baggins baggins at pld-linux.org
Fri Mar 14 10:59:26 CET 2025 

commit 3a1fc94bc79654d8c4b7fb4be8810d9774319815
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Mar 14 10:53:59 2025 +0100

    - up to 5.0.2, python3 moved to it's own package

 ...-Skip-failing-test-test_html_prefix_nsmap.patch | 34 -----------
 python-lxml.spec                                   | 70 +---------------------
 2 files changed, 3 insertions(+), 101 deletions(-)
---
diff --git a/python-lxml.spec b/python-lxml.spec
index 4170993..91fa02e 100644
--- a/python-lxml.spec
+++ b/python-lxml.spec
@@ -1,38 +1,27 @@
 #
 # Conditional build:
 %bcond_without	apidocs		# API documentation
-%bcond_without	python2		# Python 2 package
-%bcond_without	python3		# Python 3 package
 %bcond_without	tests		# unit tests
 
 %define		module	lxml
 Summary:	Python 2 binding for the libxml2 and libxslt libraries
 Summary(pl.UTF-8):	Wiązanie Pythona 2 do bibliotek libxml2 i libxslt
 Name:		python-%{module}
-Version:	4.9.3
-Release:	3
+Version:	5.0.2
+Release:	1
 License:	BSD
 Group:		Libraries/Python
 #Source0Download: https://pypi.org/simple/lxml/
 Source0:	https://files.pythonhosted.org/packages/source/l/lxml/%{module}-%{version}.tar.gz
-# Source0-md5:	7298fdca14b10e7b71547ed02b894b25
-Patch0:		lxml-Skip-failing-test-test_html_prefix_nsmap.patch
+# Source0-md5:	d6ad8a1b8a013f47e6614752a8164431
 URL:		https://lxml.de/
 BuildRequires:	libxml2-devel >= 1:2.9.2
 BuildRequires:	libxslt-devel >= 1.1.28
 BuildRequires:	pkgconfig
-%if %{with python2}
 BuildRequires:	python-Cython >= 0.29.36-2
 BuildRequires:	python-devel >= 1:2.7
 BuildRequires:	python-modules >= 1:2.7
 BuildRequires:	python-setuptools
-%endif
-%if %{with python3}
-BuildRequires:	python3-Cython >= 0.29.36-2
-BuildRequires:	python3-devel >= 1:3.5
-BuildRequires:	python3-modules >= 1:3.5
-BuildRequires:	python3-setuptools
-%endif
 BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.752
@@ -69,13 +58,11 @@ Dokumentacja API modułu lxml.
 
 %prep
 %setup -q -n %{module}-%{version}
-%patch -P 0 -p1
 
 # force cython regeneration
 %{__rm} src/lxml/{_elementpath.c,builder.c,etree.c,etree.h,etree_api.h,lxml.etree.h,lxml.etree_api.h,objectify.c,sax.c}
 
 %build
-%if %{with python2}
 %py_build
 
 %if %{with tests}
@@ -88,24 +75,8 @@ LC_ALL=C.UTF-8 \
 %{__python} test.py -v
 cd ..
 %endif
-%endif
-
-%if %{with python3}
-%py3_build
-
-%if %{with tests}
-install -d testdir-3/src/lxml
-cd testdir-3/src/lxml
-ln -snf ../../../build-3/lib.linux-*/lxml/* ../../../src/lxml/tests .
-cd ../..
-ln -snf ../doc ../samples ../test.py .
-%{__python3} test.py -v
-cd ..
-%endif
-%endif
 
 %if %{with apidocs}
-# as of 4.4.2, python3 is not supported in mkhtml.py
 PYTHONPATH=$(echo $(pwd)/build-2/lib.linux-*) \
 %{__python} doc/mkhtml.py doc/html $(pwd) %{version}
 %endif
@@ -113,20 +84,13 @@ PYTHONPATH=$(echo $(pwd)/build-2/lib.linux-*) \
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with python2}
 %py_install
 
 %py_postclean
-%endif
-
-%if %{with python3}
-%py3_install
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with python2}
 %files
 %defattr(644,root,root,755)
 %doc CHANGES.txt CREDITS.txt LICENSE.txt LICENSES.txt README.rst TODO.txt doc/licenses/{BSD,elementtree}.txt
@@ -149,34 +113,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{py_sitedir}/lxml/html/clean.so
 %attr(755,root,root) %{py_sitedir}/lxml/html/diff.so
 %{py_sitedir}/lxml-%{version}-py*.egg-info
-%endif
-
-%if %{with python3}
-%files -n python3-%{module}
-%defattr(644,root,root,755)
-%doc CHANGES.txt CREDITS.txt LICENSE.txt LICENSES.txt README.rst TODO.txt doc/licenses/{BSD,elementtree}.txt
-%dir %{py3_sitedir}/lxml
-%attr(755,root,root) %{py3_sitedir}/lxml/_elementpath.cpython-*.so
-%attr(755,root,root) %{py3_sitedir}/lxml/builder.cpython-*.so
-%attr(755,root,root) %{py3_sitedir}/lxml/etree.cpython-*.so
-%attr(755,root,root) %{py3_sitedir}/lxml/objectify.cpython-*.so
-%attr(755,root,root) %{py3_sitedir}/lxml/sax.cpython-*.so
-%{py3_sitedir}/lxml/*.pxi
-%{py3_sitedir}/lxml/*.py
-%{py3_sitedir}/lxml/__pycache__
-%{py3_sitedir}/lxml/etree.pyx
-%{py3_sitedir}/lxml/objectify.pyx
-%{py3_sitedir}/lxml/etree*.h
-%{py3_sitedir}/lxml/lxml.etree*.h
-%{py3_sitedir}/lxml/includes
-%{py3_sitedir}/lxml/isoschematron
-%dir %{py3_sitedir}/lxml/html
-%{py3_sitedir}/lxml/html/*.py
-%{py3_sitedir}/lxml/html/__pycache__
-%attr(755,root,root) %{py3_sitedir}/lxml/html/clean.cpython-*.so
-%attr(755,root,root) %{py3_sitedir}/lxml/html/diff.cpython-*.so
-%{py3_sitedir}/lxml-%{version}-py*.egg-info
-%endif
 
 %if %{with apidocs}
 %files apidocs
diff --git a/lxml-Skip-failing-test-test_html_prefix_nsmap.patch b/lxml-Skip-failing-test-test_html_prefix_nsmap.patch
deleted file mode 100644
index 6271dcb..0000000
--- a/lxml-Skip-failing-test-test_html_prefix_nsmap.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 91729cf581f764c3321f644206568f18d0fc92f4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar at redhat.com>
-Date: Thu, 18 May 2023 08:00:48 +0200
-Subject: [PATCH] Skip failing test test_html_prefix_nsmap
-
-Upstream issue: https://bugs.launchpad.net/lxml/+bug/2016939
----
- src/lxml/tests/test_etree.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/lxml/tests/test_etree.py b/src/lxml/tests/test_etree.py
-index 0339796..1994a7f 100644
---- a/src/lxml/tests/test_etree.py
-+++ b/src/lxml/tests/test_etree.py
-@@ -27,6 +27,8 @@ from .common_imports import SillyFileLike, LargeFileLikeUnicode, doctest, make_d
- from .common_imports import canonicalize, _str, _bytes
- from .common_imports import SimpleFSPath
- 
-+from unittest import skip
-+
- print("""
- TESTED VERSION: %s""" % etree.__version__ + """
-     Python:           %r""" % (sys.version_info,) + """
-@@ -3067,6 +3069,7 @@ class ETreeOnlyTestCase(HelperTestCase):
-         self.assertEqual(re, e.nsmap)
-         self.assertEqual(r,  s.nsmap)
- 
-+    @skip("broken with libxml2 2.10.4+")
-     def test_html_prefix_nsmap(self):
-         etree = self.etree
-         el = etree.HTML('<hha:page-description>aa</hha:page-description>').find('.//page-description')
--- 
-2.40.1
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-lxml.git/commitdiff/3a1fc94bc79654d8c4b7fb4be8810d9774319815

More information about the pld-cvs-commit mailing list