Compare commits
7 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 702f63b1bb | |||
| ef1845a143 | |||
| ebf7649bd3 | |||
| b2b989cbf5 | |||
| 45fff20430 | |||
| 5cf9ca66ed | |||
| b6cf463594 |
@@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 19 06:04:42 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
|
||||
|
||||
- Add patch support-new-httpx.patch:
|
||||
* Support new arguments for httpx 0.28.0+
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 14 12:18:00 UTC 2024 - Markéta Machová <mmachova@suse.com>
|
||||
|
||||
- Add xsd-date.patch to fix test failure
|
||||
- Stop providing/obsoleting python-zeep, as the latter exists in OBS
|
||||
and is more up-to-date on a lower version
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 29 05:34:42 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
|
||||
|
||||
- Add {Build,}Requires on legacy-cgi to support Python 3.13.
|
||||
- Update VCS URL.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 19 13:34:00 UTC 2023 - Matej Cepl <mcepl@cepl.eu>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-softlayer-zeep
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -16,19 +16,22 @@
|
||||
#
|
||||
|
||||
|
||||
%global skip_python2 1
|
||||
%{?sle15_python_module_pythons}
|
||||
Name: python-softlayer-zeep
|
||||
Version: 5.0.0
|
||||
Release: 0
|
||||
Summary: A modern/fast Python SOAP client based on lxml / requests
|
||||
License: MIT
|
||||
#Git-Clone: https://github.com/mvantellingen/python-zeep
|
||||
#Git-Clone: https://github.com/softlayer/softlayer-zeep
|
||||
URL: https://docs.python-zeep.org
|
||||
Source: https://files.pythonhosted.org/packages/source/s/softlayer-zeep/softlayer-zeep-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM skip-networked-test.patch gh#mvantellingen/python-zeep#1402 mcepl@suse.com
|
||||
# skip tests requiring network connection
|
||||
Patch0: skip-networked-test.patch
|
||||
# PATCH-FIX-UPSTREAM gh#mvantellingen/python-zeep#d1b0257 Fix regression in parsing xsd:Date with negative timezone
|
||||
Patch1: xsd-date.patch
|
||||
# PATCH-FIX-UPSTREAM Based on gh#mvantellingen/python-zeep#1447
|
||||
Patch2: support-new-httpx.patch
|
||||
BuildRequires: %{python_module pip}
|
||||
BuildRequires: %{python_module wheel}
|
||||
BuildRequires: fdupes
|
||||
@@ -41,14 +44,14 @@ Requires: python-pytz
|
||||
Requires: python-requests >= 2.7.0
|
||||
Requires: python-requests-file >= 1.5.1
|
||||
Requires: python-requests-toolbelt >= 0.7.1
|
||||
Provides: python-zeep = %{version}
|
||||
Obsoletes: python-zeep < %{version}
|
||||
Conflicts: python-zeep
|
||||
BuildArch: noarch
|
||||
# SECTION test requirements
|
||||
BuildRequires: %{python_module attrs >= 17.2.0}
|
||||
BuildRequires: %{python_module freezegun >= 0.3.15}
|
||||
BuildRequires: %{python_module isodate >= 0.5.4}
|
||||
BuildRequires: %{python_module isort >= 5.3.2}
|
||||
BuildRequires: %{python_module legacy-cgi >= 2.6}
|
||||
BuildRequires: %{python_module lxml >= 4.6.0}
|
||||
BuildRequires: %{python_module platformdirs >= 1.4.0}
|
||||
BuildRequires: %{python_module pretend == 1.0.9}
|
||||
@@ -61,6 +64,9 @@ BuildRequires: %{python_module requests-file >= 1.5.1}
|
||||
BuildRequires: %{python_module requests-mock >= 0.7.0}
|
||||
BuildRequires: %{python_module requests-toolbelt >= 0.7.1}
|
||||
# /SECTION
|
||||
%if 0%{?python_version_nodots} >= 313
|
||||
Requires: python-legacy-cgi >= 2.6
|
||||
%endif
|
||||
%python_subpackages
|
||||
|
||||
%description
|
||||
@@ -83,6 +89,6 @@ A modern/fast Python SOAP client based on lxml / requests
|
||||
%doc CHANGES README.rst
|
||||
%license LICENSE
|
||||
%{python_sitelib}/zeep
|
||||
%{python_sitelib}/softlayer_zeep-%{version}*-info
|
||||
%{python_sitelib}/softlayer_zeep-%{version}.dist-info
|
||||
|
||||
%changelog
|
||||
|
||||
65
support-new-httpx.patch
Normal file
65
support-new-httpx.patch
Normal file
@@ -0,0 +1,65 @@
|
||||
From 4e2568574271e5e37de5e5c86e4bb12a5e661c6b Mon Sep 17 00:00:00 2001
|
||||
From: aschollmeier-gcmlp <aschollmeier@gcmlp.com>
|
||||
Date: Wed, 4 Dec 2024 16:34:22 -0600
|
||||
Subject: [PATCH 1/3] Update proxy argument in httpx Client/AsyncClient
|
||||
|
||||
Ref: https://github.com/encode/httpx/blob/master/CHANGELOG.md#0260-20th-december-2023
|
||||
---
|
||||
src/zeep/transports.py | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: softlayer-zeep-5.0.0/src/zeep/transports.py
|
||||
===================================================================
|
||||
--- softlayer-zeep-5.0.0.orig/src/zeep/transports.py
|
||||
+++ softlayer-zeep-5.0.0/src/zeep/transports.py
|
||||
@@ -16,6 +16,15 @@ try:
|
||||
except ImportError:
|
||||
httpx = None
|
||||
|
||||
+try:
|
||||
+ from packaging.version import Version
|
||||
+ if httpx is None or Version(httpx.__version__) < Version("0.26.0"):
|
||||
+ HTTPX_PROXY_KWARG_NAME = "proxies"
|
||||
+ else:
|
||||
+ HTTPX_PROXY_KWARG_NAME = "proxy"
|
||||
+except ImportError:
|
||||
+ Version = None
|
||||
+ HTTPX_PROXY_KWARG_NAME = None
|
||||
|
||||
__all__ = ["AsyncTransport", "Transport"]
|
||||
|
||||
@@ -182,15 +191,16 @@ class AsyncTransport(Transport):
|
||||
raise RuntimeError("The AsyncTransport is based on the httpx module")
|
||||
|
||||
self.cache = cache
|
||||
+ proxy_kwargs = {HTTPX_PROXY_KWARG_NAME: proxy}
|
||||
self.wsdl_client = wsdl_client or httpx.Client(
|
||||
verify=verify_ssl,
|
||||
- proxies=proxy,
|
||||
timeout=timeout,
|
||||
+ **proxy_kwargs,
|
||||
)
|
||||
self.client = client or httpx.AsyncClient(
|
||||
verify=verify_ssl,
|
||||
- proxies=proxy,
|
||||
timeout=operation_timeout,
|
||||
+ **proxy_kwargs,
|
||||
)
|
||||
self.logger = logging.getLogger(__name__)
|
||||
|
||||
Index: softlayer-zeep-5.0.0/setup.py
|
||||
===================================================================
|
||||
--- softlayer-zeep-5.0.0.orig/setup.py
|
||||
+++ softlayer-zeep-5.0.0/setup.py
|
||||
@@ -18,7 +18,10 @@ docs_require = [
|
||||
"sphinx>=1.4.0",
|
||||
]
|
||||
|
||||
-async_require = ["httpx"]
|
||||
+async_require = [
|
||||
+ "httpx",
|
||||
+ "packaging"
|
||||
+]
|
||||
|
||||
xmlsec_require = [
|
||||
"xmlsec>=0.6.1",
|
||||
46
xsd-date.patch
Normal file
46
xsd-date.patch
Normal file
@@ -0,0 +1,46 @@
|
||||
From d1b0257eb7b8f41bc74c0fa178e820c2d739cf30 Mon Sep 17 00:00:00 2001
|
||||
From: Michael van Tellingen <m.vantellingen@labdigital.nl>
|
||||
Date: Wed, 16 Oct 2024 07:21:21 +0200
|
||||
Subject: [PATCH] Fix regression in parsing xsd:Date with negative timezone
|
||||
|
||||
---
|
||||
CHANGES | 4 ++++
|
||||
src/zeep/xsd/types/builtins.py | 12 +++++-------
|
||||
tests/test_xsd_builtins.py | 2 ++
|
||||
3 files changed, 11 insertions(+), 7 deletions(-)
|
||||
|
||||
Index: softlayer-zeep-5.0.0/src/zeep/xsd/types/builtins.py
|
||||
===================================================================
|
||||
--- softlayer-zeep-5.0.0.orig/src/zeep/xsd/types/builtins.py
|
||||
+++ softlayer-zeep-5.0.0/src/zeep/xsd/types/builtins.py
|
||||
@@ -201,6 +201,7 @@ class Time(BuiltinType):
|
||||
class Date(BuiltinType):
|
||||
_default_qname = xsd_ns("date")
|
||||
accepted_types = [datetime.date, str]
|
||||
+ _pattern = re.compile(r"(\d{4})-(\d{2})-(\d{2})")
|
||||
|
||||
@check_no_collection
|
||||
def xmlvalue(self, value):
|
||||
@@ -210,6 +211,9 @@ class Date(BuiltinType):
|
||||
|
||||
@treat_whitespace("collapse")
|
||||
def pythonvalue(self, value):
|
||||
+ m = self._pattern.match(value)
|
||||
+ if m:
|
||||
+ return datetime.date(*map(int, m.groups()))
|
||||
return isodate.parse_date(value)
|
||||
|
||||
|
||||
Index: softlayer-zeep-5.0.0/tests/test_xsd_builtins.py
|
||||
===================================================================
|
||||
--- softlayer-zeep-5.0.0.orig/tests/test_xsd_builtins.py
|
||||
+++ softlayer-zeep-5.0.0/tests/test_xsd_builtins.py
|
||||
@@ -242,6 +242,8 @@ class TestDate:
|
||||
instance = builtins.Date()
|
||||
assert instance.pythonvalue("2016-03-04") == datetime.date(2016, 3, 4)
|
||||
assert instance.pythonvalue("2001-10-26+02:00") == datetime.date(2001, 10, 26)
|
||||
+ assert instance.pythonvalue("2001-10-26-02:00") == datetime.date(2001, 10, 26)
|
||||
+ assert instance.pythonvalue("2024-08-21-10:00") == datetime.date(2024, 8, 21)
|
||||
assert instance.pythonvalue("2001-10-26Z") == datetime.date(2001, 10, 26)
|
||||
assert instance.pythonvalue("2001-10-26+00:00") == datetime.date(2001, 10, 26)
|
||||
assert instance.pythonvalue("\r\n\t 2016-03-04 ") == datetime.date(2016, 3, 4)
|
||||
Reference in New Issue
Block a user