From 06ef50339a3bd400efcb8263c734a5ac6124f5683e35d13ebe32b87cd4495c05 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 27 May 2023 07:27:00 +0000 Subject: [PATCH] - 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/package/show/devel:languages:python/python-google-auth?expand=0&rev=62 --- python-google-auth.changes | 6 ++++++ python-google-auth.spec | 4 +--- urllib3-2.patch | 36 ------------------------------------ 3 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 urllib3-2.patch diff --git a/python-google-auth.changes b/python-google-auth.changes index 3f0a2dc..46030c0 100644 --- a/python-google-auth.changes +++ b/python-google-auth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat May 27 07:26:11 UTC 2023 - Dirk Müller + +- 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 diff --git a/python-google-auth.spec b/python-google-auth.spec index f589848..1d64aa3 100644 --- a/python-google-auth.spec +++ b/python-google-auth.spec @@ -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 # https://github.com/googleapis/google-auth-library-python/issues/1055 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} # START TESTING SECTION 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 setuptools >= 40.3.0} BuildRequires: %{python_module six >= 1.9.0} -BuildRequires: %{python_module urllib3} +BuildRequires: %{python_module urllib3 < 2.0} # END TESTING SECTION BuildRequires: fdupes BuildRequires: python-rpm-macros diff --git a/urllib3-2.patch b/urllib3-2.patch deleted file mode 100644 index 6b4e323..0000000 --- a/urllib3-2.patch +++ /dev/null @@ -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.