From 20701e47e7b5a9b40c2060aea959d51258f0eb575a104b5fac64f036791b6b2f Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 18 Oct 2022 15:48:25 +0000 Subject: [PATCH] Accepting request 1029766 from home:mcalabkova:branches:devel:languages:python - Update to 1.13.13 * Add CI for Python 3.10, manylinux2 SOABI, musllinux1 SOABI and OpenSUSE Tumbleweed * Introduce linting with pre-commit * Rewrite PEP 484 stubs * xmlsec workaround for gh##84 * Resolve key loading issue on big-endian systems. * Fix building wheel when using PYXMLSEC_STATIC_DEPS=true * setup.py: Fix typo in PYXMLSEC_LIBXSLT_VERSION * Switch on modern headers lxml * use build to build wheels * remove pkgconfig as it's only a build-system requirement * exclude lxml 4.7 because the wheels are missing the lxml includes - Drop merged avoid_lxml_tests_failing.patch - Normalize the tests call OBS-URL: https://build.opensuse.org/request/show/1029766 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-xmlsec?expand=0&rev=22 --- avoid_lxml_tests_failing.patch | 23 ----------------------- python-xmlsec.changes | 18 ++++++++++++++++++ python-xmlsec.spec | 18 ++++-------------- xmlsec-1.3.12.tar.gz | 3 --- xmlsec-1.3.13.tar.gz | 3 +++ 5 files changed, 25 insertions(+), 40 deletions(-) delete mode 100644 avoid_lxml_tests_failing.patch delete mode 100644 xmlsec-1.3.12.tar.gz create mode 100644 xmlsec-1.3.13.tar.gz diff --git a/avoid_lxml_tests_failing.patch b/avoid_lxml_tests_failing.patch deleted file mode 100644 index f9223c0..0000000 --- a/avoid_lxml_tests_failing.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- - 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 49211b0..4bb12c8 100644 --- a/python-xmlsec.changes +++ b/python-xmlsec.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Oct 18 13:13:45 UTC 2022 - Markéta Machová + +- Update to 1.13.13 + * Add CI for Python 3.10, manylinux2 SOABI, musllinux1 SOABI and OpenSUSE Tumbleweed + * Introduce linting with pre-commit + * Rewrite PEP 484 stubs + * xmlsec workaround for gh##84 + * Resolve key loading issue on big-endian systems. + * Fix building wheel when using PYXMLSEC_STATIC_DEPS=true + * setup.py: Fix typo in PYXMLSEC_LIBXSLT_VERSION + * Switch on modern headers lxml + * use build to build wheels + * remove pkgconfig as it's only a build-system requirement + * exclude lxml 4.7 because the wheels are missing the lxml includes +- Drop merged avoid_lxml_tests_failing.patch +- Normalize the tests call + ------------------------------------------------------------------- Wed May 11 12:39:21 UTC 2022 - Matej Cepl diff --git a/python-xmlsec.spec b/python-xmlsec.spec index 5f8d2ee..70e34ed 100644 --- a/python-xmlsec.spec +++ b/python-xmlsec.spec @@ -17,21 +17,16 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -# gh#mehcode/python-xmlsec#204 and gh#mehcode/python-xmlsec#210 -%define skip_python310 1 Name: python-xmlsec -Version: 1.3.12 +Version: 1.3.13 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 >= 3.8.0} BuildRequires: %{python_module lxml-devel} BuildRequires: %{python_module pip} BuildRequires: %{python_module pkgconfig} @@ -49,8 +44,7 @@ BuildRequires: libxmlsec1-openssl1 BuildRequires: pkgconfig(xmlsec1) # we need at least one xmlsec backend on runtime Recommends: libxmlsec1-openssl1 -Requires: python-lxml >= 3.0 -Requires: python-pkgconfig +Requires: python-lxml >= 3.8.0 %python_subpackages %description @@ -68,16 +62,12 @@ export CFLAGS="%{optflags}" %python_expand %fdupes %{buildroot}%{$python_sitearch} %check -# %%pytest_arch tests/ %ifarch %ix86 export skip_tests="not test_reinitialize_module" %else export 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/ -} +%pytest_arch -k "$skip_tests" tests/ %files %{python_files} %doc README.rst diff --git a/xmlsec-1.3.12.tar.gz b/xmlsec-1.3.12.tar.gz deleted file mode 100644 index 8a2c961..0000000 --- a/xmlsec-1.3.12.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c86ac6ce570c9e04f04da0cd5e7d3db346e4b5b1d006311606368f17c756ef9 -size 64199 diff --git a/xmlsec-1.3.13.tar.gz b/xmlsec-1.3.13.tar.gz new file mode 100644 index 0000000..4f02004 --- /dev/null +++ b/xmlsec-1.3.13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:916f5d78e8041f6cd9391abba659da8c94a4fef7196d126d40af1ff417f2cf86 +size 64640