From 7a27bab5dce0c30e6b13777d3a00bb98432ff8d33f2844475f1c919612c33e16 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 11 May 2022 15:14:14 +0000 Subject: [PATCH 1/7] - Update to 1.3.12: - Added support for registering custom xmlsec IO callbacks - Added support for building without MD5 transforms - Added support for PEP 539 for Python 3.7 and newer - Using lxml-stubs package instead of custom LXML stubs OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-xmlsec?expand=0&rev=14 --- avoid_lxml_tests_failing.patch | 23 +++++++++++++++++++++++ python-xmlsec.changes | 9 +++++++++ python-xmlsec.spec | 24 ++++++++++++++++-------- xmlsec-1.3.11.tar.gz | 3 --- xmlsec-1.3.12.tar.gz | 3 +++ 5 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 avoid_lxml_tests_failing.patch delete mode 100644 xmlsec-1.3.11.tar.gz create mode 100644 xmlsec-1.3.12.tar.gz diff --git a/avoid_lxml_tests_failing.patch b/avoid_lxml_tests_failing.patch new file mode 100644 index 0000000..f9223c0 --- /dev/null +++ b/avoid_lxml_tests_failing.patch @@ -0,0 +1,23 @@ +--- + tests/base.py | 1 + + tests/test_doc_examples.py | 2 ++ + 2 files changed, 3 insertions(+) + +--- a/tests/base.py ++++ b/tests/base.py +@@ -99,6 +99,7 @@ class TestMemoryLeaks(unittest.TestCase) + + def load_xml(self, name, xpath=None): + """returns xml.etree""" ++ etree.set_default_parser(parser=etree.XMLParser()) + root = etree.parse(self.path(name)).getroot() + if xpath is None: + return root +--- a/tests/test_doc_examples.py ++++ b/tests/test_doc_examples.py +@@ -42,3 +42,5 @@ def test_doc_example(example): + """ + with cd(example.parent): + runpy.run_path(str(example)) ++ from lxml import etree ++ etree.set_default_parser(parser=etree.XMLParser()) diff --git a/python-xmlsec.changes b/python-xmlsec.changes index 4d0f954..904a2d6 100644 --- a/python-xmlsec.changes +++ b/python-xmlsec.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed May 11 12:39:21 UTC 2022 - Matej Cepl + +- Update to 1.3.12: + - Added support for registering custom xmlsec IO callbacks + - Added support for building without MD5 transforms + - Added support for PEP 539 for Python 3.7 and newer + - Using lxml-stubs package instead of custom LXML stubs + ------------------------------------------------------------------- Thu Jun 10 09:15:51 UTC 2021 - Matej Cepl diff --git a/python-xmlsec.spec b/python-xmlsec.spec index a5e6070..cae257e 100644 --- a/python-xmlsec.spec +++ b/python-xmlsec.spec @@ -1,7 +1,7 @@ # # spec file for package python-xmlsec # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,22 +17,29 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +# gh#mehcode/python-xmlsec#204 +%define skip_python310 1 Name: python-xmlsec -Version: 1.3.11 +Version: 1.3.12 Release: 0 Summary: Python bindings for the XML Security Library License: MIT URL: https://github.com/mehcode/python-xmlsec Source: https://files.pythonhosted.org/packages/source/x/xmlsec/xmlsec-%{version}.tar.gz +# PATCH-FIX-UPSTREAM avoid_lxml_tests_failing.patch gh#mehcode/python-xmlsec#84 mcepl@suse.com +# work around the lxml issue +Patch0: avoid_lxml_tests_failing.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module hypothesis} BuildRequires: %{python_module lxml >= 3.0} BuildRequires: %{python_module lxml-devel} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pkgconfig} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module toml} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: libtool BuildRequires: pkgconfig @@ -50,23 +57,24 @@ Requires: python-pkgconfig Python bindings for the XML Security Library %prep -%setup -q -n xmlsec-%{version} +%autosetup -p1 -n xmlsec-%{version} %build export CFLAGS="%{optflags}" -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitearch} %check -# Tests coredump gh#mehcode/python-xmlsec#183 -# %%pytest_arch tests/ +%pytest_arch tests/ %files %{python_files} %doc README.rst %license LICENSE -%{python_sitearch}/* +%{python_sitearch}/xmlsec +%{python_sitearch}/xmlsec-%{version}*-info +%{python_sitearch}/xmlsec*.so %changelog diff --git a/xmlsec-1.3.11.tar.gz b/xmlsec-1.3.11.tar.gz deleted file mode 100644 index 7e85dff..0000000 --- a/xmlsec-1.3.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd2eaaff7f31784a07dd99ce81fa767313df3ba1834faa4143ee2c07000cac7a -size 61272 diff --git a/xmlsec-1.3.12.tar.gz b/xmlsec-1.3.12.tar.gz new file mode 100644 index 0000000..8a2c961 --- /dev/null +++ b/xmlsec-1.3.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c86ac6ce570c9e04f04da0cd5e7d3db346e4b5b1d006311606368f17c756ef9 +size 64199 From d507eecd838adf9102169723bae9d10f9cbc87501a5c1ad4657586a022923d75 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 11 May 2022 15:16:21 +0000 Subject: [PATCH 2/7] Fix changelog OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-xmlsec?expand=0&rev=15 --- python-xmlsec.changes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/python-xmlsec.changes b/python-xmlsec.changes index 904a2d6..7d8cb11 100644 --- a/python-xmlsec.changes +++ b/python-xmlsec.changes @@ -6,6 +6,9 @@ Wed May 11 12:39:21 UTC 2022 - Matej Cepl - Added support for building without MD5 transforms - Added support for PEP 539 for Python 3.7 and newer - Using lxml-stubs package instead of custom LXML stubs +- Add avoid_lxml_tests_failing.patch (help working + around the lxml issue lp#1880251 and lp#1887848, from + gh#mehcode/python-xmlsec#84). ------------------------------------------------------------------- Thu Jun 10 09:15:51 UTC 2021 - Matej Cepl From 29a537f2c2d450890da13f10b42cbba974a0b338975f5ddbd22767ff97e7c65f Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 11 May 2022 15:17:23 +0000 Subject: [PATCH 3/7] Fix changelog OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-xmlsec?expand=0&rev=16 --- python-xmlsec.changes | 2 ++ python-xmlsec.spec | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/python-xmlsec.changes b/python-xmlsec.changes index 7d8cb11..980efc3 100644 --- a/python-xmlsec.changes +++ b/python-xmlsec.changes @@ -9,6 +9,8 @@ Wed May 11 12:39:21 UTC 2022 - Matej Cepl - Add avoid_lxml_tests_failing.patch (help working around the lxml issue lp#1880251 and lp#1887848, from gh#mehcode/python-xmlsec#84). +- Switch off building on Python 3.10 + (gh#mehcode/python-xmlsec#204). ------------------------------------------------------------------- Thu Jun 10 09:15:51 UTC 2021 - Matej Cepl diff --git a/python-xmlsec.spec b/python-xmlsec.spec index cae257e..766dd3b 100644 --- a/python-xmlsec.spec +++ b/python-xmlsec.spec @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} # gh#mehcode/python-xmlsec#204 -%define skip_python310 1 +# %%define skip_python310 1 Name: python-xmlsec Version: 1.3.12 Release: 0 From 246e66b193781cdbf1db2ccd391f9dc54b02f16566e5a875852c7bde5e629ec2 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 11 May 2022 15:17:41 +0000 Subject: [PATCH 4/7] Fix changelog OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-xmlsec?expand=0&rev=17 --- python-xmlsec.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-xmlsec.spec b/python-xmlsec.spec index 766dd3b..cae257e 100644 --- a/python-xmlsec.spec +++ b/python-xmlsec.spec @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} # gh#mehcode/python-xmlsec#204 -# %%define skip_python310 1 +%define skip_python310 1 Name: python-xmlsec Version: 1.3.12 Release: 0 From fa6dd0ac16c179600805d0716258401c999f59aa418c113b3f40a120b99123a1 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 11 May 2022 15:56:46 +0000 Subject: [PATCH 5/7] Fix SPEC OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-xmlsec?expand=0&rev=18 --- python-xmlsec.changes | 2 +- python-xmlsec.spec | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/python-xmlsec.changes b/python-xmlsec.changes index 980efc3..49211b0 100644 --- a/python-xmlsec.changes +++ b/python-xmlsec.changes @@ -9,7 +9,7 @@ Wed May 11 12:39:21 UTC 2022 - Matej Cepl - Add avoid_lxml_tests_failing.patch (help working around the lxml issue lp#1880251 and lp#1887848, from gh#mehcode/python-xmlsec#84). -- Switch off building on Python 3.10 +- Switch off building on Python 3.10 and %ix86 (gh#mehcode/python-xmlsec#204). ------------------------------------------------------------------- diff --git a/python-xmlsec.spec b/python-xmlsec.spec index cae257e..3292c49 100644 --- a/python-xmlsec.spec +++ b/python-xmlsec.spec @@ -17,8 +17,8 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -# gh#mehcode/python-xmlsec#204 -%define skip_python310 1 +# gh#mehcode/python-xmlsec#204 and gh#mehcode/python-xmlsec#210 +# %%define skip_python310 1 Name: python-xmlsec Version: 1.3.12 Release: 0 @@ -68,7 +68,16 @@ export CFLAGS="%{optflags}" %python_expand %fdupes %{buildroot}%{$python_sitearch} %check -%pytest_arch tests/ +# %%pytest_arch tests/ +%ifarch %ix86 +skip_tests = "not test_reinitialize_module" +%else +skip_tests = "" +%endif +%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} PYTHONDONTWRITEBYTECODE=1 +rm -rf .hypothesis/ .pytest_cache/ +$python -mpytest --ignore=_build.python39 --ignore=_build.python310 --ignore=_build.python38 -v -k "$skip_tests" tests/ +} %files %{python_files} %doc README.rst From 2bf19bd50b3d76b4439847478d08994562cade920b699569a6871d20581a4f3b Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 11 May 2022 15:58:55 +0000 Subject: [PATCH 6/7] Fix SPEC OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-xmlsec?expand=0&rev=19 --- python-xmlsec.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-xmlsec.spec b/python-xmlsec.spec index 3292c49..810b369 100644 --- a/python-xmlsec.spec +++ b/python-xmlsec.spec @@ -70,9 +70,9 @@ export CFLAGS="%{optflags}" %check # %%pytest_arch tests/ %ifarch %ix86 -skip_tests = "not test_reinitialize_module" +export skip_tests="not test_reinitialize_module" %else -skip_tests = "" +export skip_tests="" %endif %{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} PYTHONDONTWRITEBYTECODE=1 rm -rf .hypothesis/ .pytest_cache/ From 09261d91b71c3ae9929d9c3613cf4d4ffe9009e42467861a3d21215afb9e2886 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 11 May 2022 16:13:21 +0000 Subject: [PATCH 7/7] Fix SPEC OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-xmlsec?expand=0&rev=20 --- python-xmlsec.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-xmlsec.spec b/python-xmlsec.spec index 810b369..5f8d2ee 100644 --- a/python-xmlsec.spec +++ b/python-xmlsec.spec @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} # gh#mehcode/python-xmlsec#204 and gh#mehcode/python-xmlsec#210 -# %%define skip_python310 1 +%define skip_python310 1 Name: python-xmlsec Version: 1.3.12 Release: 0