Update to 6.0.2 (rhbz#2397231)

Close: rhbz#2357632

.cvsignore

@@ -1 +0,0 @@
-lxml-1.0.3.tgz

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -0,0 +1,75 @@
+lxml-2.2.7.tar.gz
+lxml-2.2.7.tar.gz.asc
+/lxml-2.2.8.tar.gz
+/lxml-2.2.8.tar.gz.asc
+/lxml-2.3.tar.gz
+/lxml-2.3.tar.gz.asc
+/lxml-2.3.1.tar.gz
+/lxml-2.3.1.tar.gz.asc
+/lxml-2.3.2.tar.gz
+/lxml-2.3.2.tar.gz.asc
+/lxml-2.3.3.tar.gz
+/lxml-2.3.3.tar.gz.asc
+/lxml-2.3.5.tar.gz
+/lxml-2.3.5.tar.gz.asc
+/lxml-3.0.tar.gz
+/lxml-3.0.tar.gz.asc
+/lxml-3.0.tgz
+/lxml-3.0.tgz.asc
+/lxml-3.0.1.tgz
+/lxml-3.0.1.tgz.asc
+/lxml-3.1.0.tgz
+/lxml-3.1.0.tgz.asc
+/lxml-3.2.0.tgz
+/lxml-3.2.0.tgz.asc
+/lxml-3.2.1.tgz
+/lxml-3.2.1.tgz.asc
+/lxml-3.2.3.tgz
+/lxml-3.2.3.tgz.asc
+/lxml-3.2.4.tgz
+/lxml-3.2.4.tgz.asc
+/lxml-3.3.0.tgz
+/lxml-3.3.0.tgz.asc
+/lxml-3.3.2.tgz
+/lxml-3.3.2.tgz.asc
+/lxml-3.3.3.tgz
+/lxml-3.3.3.tgz.asc
+/lxml-3.3.5.tgz
+/lxml-3.3.5.tgz.asc
+/lxml-3.3.6.tgz
+/lxml-3.3.6.tgz.asc
+/lxml-3.4.4.tgz
+/lxml-3.4.4.tgz.asc
+/lxml-3.6.4.tar.gz
+/lxml-3.7.0.tar.gz
+/lxml-3.7.1.tgz
+/lxml-3.7.2.tgz
+/lxml-3.8.0.tgz
+/lxml-4.0.0.tgz
+/lxml-4.1.1.tgz
+/lxml-4.2.1.tgz
+/lxml-4.2.3.tgz
+/lxml-4.2.4.tgz
+/lxml-4.2.5.tgz
+/lxml-4.4.0.tgz
+/lxml-4.4.1.tgz
+/lxml-4.5.1.tgz
+/lxml-4.6.2.tar.gz
+/lxml-4.6.3.tar.gz
+/lxml-4.7.1.tar.gz
+/lxml-4.9.1.tar.gz
+/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
+/lxml-4.9.4-no-isoschematron-rng.tar.gz
+/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
+/lxml-5.3.1-no-isoschematron-rng.tar.gz
+/lxml-5.3.2-no-isoschematron-rng.tar.gz
+/lxml-5.4.0-no-isoschematron-rng.tar.gz
+/lxml-6.0.0-no-isoschematron-rng.tar.gz
+/lxml-6.0.1-no-isoschematron-rng.tar.gz
+/lxml-6.0.2-no-isoschematron-rng.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: python-lxml
-# $Id$
-NAME := python-lxml
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

ci.fmf

@@ -0,0 +1 @@
+resultsdb-testcase: separate

gating.yaml

@@ -0,0 +1,8 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_contexts:
+  - bodhi_update_push_testing
+  - bodhi_update_push_stable
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional}

get-lxml-source.sh

@@ -0,0 +1,28 @@
+#! /bin/bash -ex
+
+# Download a release of lxml (if missing) and remove the isoschematron module from it
+
+version=$1
+
+if [ -z "${version}" ]; then
+    echo "Usage: $0 VERSION" >& 2
+    echo "" >& 2
+    echo "example: $0 4.9.2" >& 2
+    exit 1
+fi
+
+versionedname=lxml-${version}
+orig_archive=${versionedname}.tar.gz
+new_archive=${versionedname}-no-isoschematron-rng.tar.gz
+
+if [ ! -e ${orig_archive} ]; then
+    wget -N https://files.pythonhosted.org/packages/source/l/lxml/${orig_archive}
+fi
+
+deleted_directory=lxml-${version}/src/lxml/isoschematron/resources/rng
+
+# tar --delete does not operate on compressed archives, so do
+# gz decompression explicitly
+gzip --decompress ${orig_archive}
+tar -v --delete -f ${orig_archive//.gz} ${deleted_directory}
+gzip -cf ${orig_archive//.gz} > ${new_archive}

plans/etree-fromstring.py

@@ -0,0 +1,7 @@
+import lxml.etree as et
+s = '<foo><bar baz="xyzzy">a<![CDATA[b]]>c</bar></foo>'
+x = et.fromstring(s)
+t = x.find('bar').text
+print(t)
+if t != 'abc':
+    raise Exception()

plans/smoke.fmf

@@ -0,0 +1,12 @@
+summary: Basic smoke test
+discover:
+  how: shell
+  tests:
+    - name: /smoke/import-python-module
+      test: |
+        python3 -c 'import importlib as il; print(il.import_module("lxml"))'
+    - name: /smoke/etree-fromstring
+      test: |
+        python3 plans/etree-fromstring.py
+execute:
+  how: tmt

python-lxml.spec

@@ -1,89 +1,94 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?python_version: %define python_version %(%{__python} -c "import sys ; print sys.version[:3]")}
+Name:           python-lxml
+Version:        6.0.2
+Release:        %autorelease
+Summary:        XML processing library combining libxml2/libxslt with the ElementTree API
 
-%define srcname lxml
+# The lxml project is licensed under BSD-3-Clause
+# Some code is derived from ElementTree and cElementTree
+# thus using the MIT-CMU elementtree license
+# .xsl schematron files are under the MIT license
+License:        BSD-3-Clause AND MIT-CMU AND MIT
+URL:            https://github.com/lxml/lxml
 
-Name:           python-%{srcname}
-Version:        1.0.3
-Release:        2%{?dist}
-Summary:        ElementTree-like Python bindings for libxml2 and libxslt
+# We use the get-lxml-source.sh script to generate the tarball
+# without the isoschematron RNG validation file under a problematic license.
+# See: https://gitlab.com/fedora/legal/fedora-license-data/-/issues/154
+Source0:        lxml-%{version}-no-isoschematron-rng.tar.gz
+Source1:        get-lxml-source.sh
 
-Group:          Development/Libraries
-License:        BSD
-URL:            http://codespeak.net/lxml/
-Source0:        http://codespeak.net/lxml/%{srcname}-%{version}.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  gcc
+BuildRequires:  libxml2-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  python3-devel
 
-BuildRequires:  python-devel libxslt-devel python-setuptools
-# Upstream now includes the generated .c file and the Pyrex shipped
-# with FC (0.9.3.1) is broken for gcc >= 4.0
-#BuildRequires: Pyrex >= 0.9.4
-Requires:   python-abi = %{python_version}
+# Some of the extras create a build dependency loop.
+# - [cssselect] Requires cssselect BuildRequires lxml
+# - [html5] Requires html5lib BuildRequires lxml
+# - [htmlsoup] Requires beautifulsoup4 Requires lxml
+# - [html_clean] Requires lxml-html-clean Requires lxml
+# Hence we provide a bcond to disable the extras altogether.
+# By default, the extras are disabled in RHEL, to avoid dependencies.
+%bcond extras %{undefined rhel}
 
-%description
-lxml provides a Python binding to the libxslt and libxml2 libraries.  It
-follows the ElementTree API as much as possible in order to provide a more
-Pythonic interface to libxml2 and libxslt than the default bindings.  In
-particular, lxml deals with Python Unicode strings rather than encoded UTF-8
-and handles memory management automatically, unlike the default bindings.
+%global _description \
+lxml is a Pythonic, mature binding for the libxml2 and libxslt libraries. It\
+provides safe and convenient access to these libraries using the ElementTree It\
+extends the ElementTree API significantly to offer support for XPath, RelaxNG,\
+XML Schema, XSLT, C14N and much more.
 
+%description %{_description}
+
+%package -n     python3-lxml
+Summary:        %{summary}
+%if %{with extras}
+Suggests:       python3-lxml+cssselect
+Suggests:       python3-lxml+html5
+Suggests:       python3-lxml+htmlsoup
+Suggests:       python3-lxml+html_clean
+%endif
+
+%description -n python3-lxml %{_description}
+
+Python 3 version.
+
+%if %{with extras}
+%pyproject_extras_subpkg -n python3-lxml cssselect html5 htmlsoup html_clean
+%endif
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%autosetup -n lxml-%{version} -p1
+# Don't run html5lib tests --without extras
+%{!?without_extras:rm src/lxml/html/tests/test_html5parser.py}
 
+# Remove limit for version of Cython
+sed -i "s/Cython.*/Cython/" requirements.txt
+sed -i 's/"Cython.*",/"Cython",/' pyproject.toml
+
+%generate_buildrequires
+%pyproject_buildrequires -x source%{?with_extras:,cssselect,html5,htmlsoup,html_clean}
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-
+# Remove pregenerated Cython C sources
+# We need to do this after %%pyproject_buildrequires because setup.py errors
+# without Cython and without the .c files.
+find -type f -name '*.c' -print -delete >&2
+export WITH_CYTHON=true
+%pyproject_wheel
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed
+%pyproject_install
+%pyproject_save_files lxml
 
+%check
+# The tests assume inplace build, so we copy the built library to source-dir.
+# If not done that, Python can either import the tests or the extension modules, but not both.
+cp -a build/lib.%{python3_platform}-*/* src/
+# The options are: verbose, unit, functional
+%{python3} test.py -vuf
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root,-)
-%doc README.txt LICENSES.txt PKG-INFO CREDITS.txt CHANGES.txt doc/
-%{python_sitearch}/lxml-%{version}-py%{python_version}.egg-info/
-%dir %{python_sitearch}/lxml
-%{python_sitearch}/lxml/*.so
-%{python_sitearch}/lxml/*.py
-%{python_sitearch}/lxml/*.pyc
-%{python_sitearch}/lxml/*.pyo
+%files -n python3-lxml -f %{pyproject_files}
+%license doc/licenses/BSD.txt doc/licenses/elementtree.txt
+%doc README.rst
 
 %changelog
-* Sat Sep 16 2006 Shahms E. King <shahms@shahms.com> 1.0.3-2
-- Rebuild for FC6
-
-* Thu Aug 17 2006 Shahms E. King <shahms@shahms.com> 1.0.3-1
-- Update to new upstream version
-
-* Fri Aug 11 2006 Shahms E. King <shahms@shahms.com> 1.0.2-2
-- Include, don't ghost .pyo files per new guidelines
-
-* Fri Jul 07 2006 Shahms E. King <shahms@shahms.com> 1.0.2-1
-- Update to new upstream release
-
-* Mon Jun 26 2006 Shahms E. King <shahms@shahms.com> 1.0.1-1
-- Update to new upstream release
-
-* Fri Jun 02 2006 Shahms E. King <shahms@shahms.com> 1.0-1
-- Update to new upstream 1.0 release
-
-* Wed Apr 26 2006 Shahms E. King <shahms@shahms.com> 0.9.1-3
-- Add python-setuptools to BuildRequires
-- Use dist tag
-
-* Wed Apr 26 2006 Shahms E. King <shahms@shahms.com> 0.9.1-2
-- Fix summary and description
-
-* Tue Apr 18 2006 Shahms E. King <shahms@shahms.com> 0.9.1-1
-- update the new upstream version
-- remove Pyrex build req
-
-* Tue Dec 13 2005 Shahms E. King <shahms@shahms.com> 0.8-1
-- Initial package
+%autochangelog

sources

@@ -1 +1 @@
-5b01f595b28de9cb75cd2e31ebc37c53  lxml-1.0.3.tgz
+SHA512 (lxml-6.0.2-no-isoschematron-rng.tar.gz) = dc89f75c3a3c828a46bcb2eefbebe8f98ce8072b9fb66f8ef81edbf2babed74e4c54e26392603319d60ab3bfab6a4795eedc85b28efba815797d43d53aae4060