1
0

Accepting request 1089287 from devel:languages:python

- drop urllib3-2.patch and limit to urllib3 < 2.x as that
  matches the requires and avoids coinstallability isuses

OBS-URL: https://build.opensuse.org/request/show/1089287
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-google-auth?expand=0&rev=31
This commit is contained in:
Dominique Leuenberger 2023-05-30 20:02:03 +00:00 committed by Git OBS Bridge
commit 117b342d7b
3 changed files with 7 additions and 39 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat May 27 07:26:11 UTC 2023 - Dirk Müller <dmueller@suse.com>
- drop urllib3-2.patch and limit to urllib3 < 2.x as that
matches the requires and avoids coinstallability isuses
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 10 07:14:23 UTC 2023 - Daniel Garcia <daniel.garcia@suse.com> Wed May 10 07:14:23 UTC 2023 - Daniel Garcia <daniel.garcia@suse.com>

View File

@ -27,8 +27,6 @@ URL: https://github.com/googleapis/google-auth-library-python
Source: https://files.pythonhosted.org/packages/source/g/google-auth/google-auth-%{version}.tar.gz Source: https://files.pythonhosted.org/packages/source/g/google-auth/google-auth-%{version}.tar.gz
# https://github.com/googleapis/google-auth-library-python/issues/1055 # https://github.com/googleapis/google-auth-library-python/issues/1055
Patch1: python-google-auth-no-mock.patch Patch1: python-google-auth-no-mock.patch
# PATCH-FIX-OPENSUSE urllib3-2.patch -- gh#googleapis/google-auth-library-python#1290
Patch2: urllib3-2.patch
BuildRequires: %{python_module Flask} BuildRequires: %{python_module Flask}
# START TESTING SECTION # START TESTING SECTION
BuildRequires: %{python_module aiohttp >= 3.6.2} BuildRequires: %{python_module aiohttp >= 3.6.2}
@ -44,7 +42,7 @@ BuildRequires: %{python_module responses}
BuildRequires: %{python_module rsa >= 3.1.4} BuildRequires: %{python_module rsa >= 3.1.4}
BuildRequires: %{python_module setuptools >= 40.3.0} BuildRequires: %{python_module setuptools >= 40.3.0}
BuildRequires: %{python_module six >= 1.9.0} BuildRequires: %{python_module six >= 1.9.0}
BuildRequires: %{python_module urllib3} BuildRequires: %{python_module urllib3 < 2.0}
# END TESTING SECTION # END TESTING SECTION
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros

View File

@ -1,36 +0,0 @@
Index: google-auth-2.17.3/google/auth/transport/urllib3.py
===================================================================
--- google-auth-2.17.3.orig/google/auth/transport/urllib3.py
+++ google-auth-2.17.3/google/auth/transport/urllib3.py
@@ -95,8 +95,8 @@ class Request(transport.Request):
credentials.refresh(request)
Args:
- http (urllib3.request.RequestMethods): An instance of any urllib3
- class that implements :class:`~urllib3.request.RequestMethods`,
+ http (urllib3._request_methods.RequestMethods): An instance of any urllib3
+ class that implements :class:`~urllib3._request_methods.RequestMethods`,
usually :class:`urllib3.PoolManager`.
.. automethod:: __call__
@@ -184,7 +184,7 @@ def _make_mutual_tls_http(cert, key):
return http
-class AuthorizedHttp(urllib3.request.RequestMethods):
+class AuthorizedHttp(urllib3._request_methods.RequestMethods):
"""A urllib3 HTTP class with credentials.
This class is used to perform requests to API endpoints that require
@@ -197,8 +197,9 @@ class AuthorizedHttp(urllib3.request.Req
response = authed_http.request(
'GET', 'https://www.googleapis.com/storage/v1/b')
- This class implements :class:`urllib3.request.RequestMethods` and can be
- used just like any other :class:`urllib3.PoolManager`.
+ This class implements
+ :class:`urllib3._request_methods.RequestMethods` and can be used
+ just like any other :class:`urllib3.PoolManager`.
The underlying :meth:`urlopen` implementation handles adding the
credentials' headers to the request and refreshing credentials as needed.