diff --git a/google-auth-2.16.1.tar.gz b/google-auth-2.16.1.tar.gz deleted file mode 100644 index eb3d8c7..0000000 --- a/google-auth-2.16.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5fd170986bce6bfd7bb5c845c4b8362edb1e0cba901e062196e83f8bb5d5d32c -size 221594 diff --git a/google-auth-2.17.3.tar.gz b/google-auth-2.17.3.tar.gz new file mode 100644 index 0000000..0929600 --- /dev/null +++ b/google-auth-2.17.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce311e2bc58b130fddf316df57c9b3943c2a7b4f6ec31de9663a9333e4064efc +size 222865 diff --git a/no-python3.patch b/no-python3.patch deleted file mode 100644 index eb79b91..0000000 --- a/no-python3.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- - tests/test__cloud_sdk.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/tests/test__cloud_sdk.py -+++ b/tests/test__cloud_sdk.py -@@ -16,6 +16,7 @@ import io - import json - import os - import subprocess -+import sys - - from unittest import mock - import pytest # type: ignore -@@ -73,7 +74,7 @@ def test_get_project_id_call_error(check - - def test__run_subprocess_ignore_stderr(): - command = [ -- "python", -+ sys.executable, - "-c", - "from __future__ import print_function;" - + "import sys;" diff --git a/python-google-auth-no-mock.patch b/python-google-auth-no-mock.patch index 1ac3c1a..e6b403c 100644 --- a/python-google-auth-no-mock.patch +++ b/python-google-auth-no-mock.patch @@ -33,8 +33,10 @@ tests/transport/test_urllib3.py | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) ---- a/tests/compute_engine/test__metadata.py -+++ b/tests/compute_engine/test__metadata.py +Index: google-auth-2.17.3/tests/compute_engine/test__metadata.py +=================================================================== +--- google-auth-2.17.3.orig/tests/compute_engine/test__metadata.py ++++ google-auth-2.17.3/tests/compute_engine/test__metadata.py @@ -16,7 +16,7 @@ import datetime import json import os @@ -44,8 +46,10 @@ import pytest # type: ignore from six.moves import http_client from six.moves import reload_module ---- a/tests/compute_engine/test_credentials.py -+++ b/tests/compute_engine/test_credentials.py +Index: google-auth-2.17.3/tests/compute_engine/test_credentials.py +=================================================================== +--- google-auth-2.17.3.orig/tests/compute_engine/test_credentials.py ++++ google-auth-2.17.3/tests/compute_engine/test_credentials.py @@ -14,7 +14,7 @@ import base64 import datetime @@ -55,8 +59,10 @@ import pytest # type: ignore import responses # type: ignore ---- a/tests/conftest.py -+++ b/tests/conftest.py +Index: google-auth-2.17.3/tests/conftest.py +=================================================================== +--- google-auth-2.17.3.orig/tests/conftest.py ++++ google-auth-2.17.3/tests/conftest.py @@ -15,7 +15,7 @@ import os import sys @@ -66,8 +72,10 @@ import pytest # type: ignore ---- a/tests/crypt/test__python_rsa.py -+++ b/tests/crypt/test__python_rsa.py +Index: google-auth-2.17.3/tests/crypt/test__python_rsa.py +=================================================================== +--- google-auth-2.17.3.orig/tests/crypt/test__python_rsa.py ++++ google-auth-2.17.3/tests/crypt/test__python_rsa.py @@ -15,7 +15,7 @@ import json import os @@ -77,8 +85,10 @@ from pyasn1_modules import pem # type: ignore import pytest # type: ignore import rsa # type: ignore ---- a/tests/oauth2/test__client.py -+++ b/tests/oauth2/test__client.py +Index: google-auth-2.17.3/tests/oauth2/test__client.py +=================================================================== +--- google-auth-2.17.3.orig/tests/oauth2/test__client.py ++++ google-auth-2.17.3/tests/oauth2/test__client.py @@ -16,7 +16,7 @@ import datetime import json import os @@ -88,8 +98,10 @@ import pytest # type: ignore import six from six.moves import http_client ---- a/tests/oauth2/test_challenges.py -+++ b/tests/oauth2/test_challenges.py +Index: google-auth-2.17.3/tests/oauth2/test_challenges.py +=================================================================== +--- google-auth-2.17.3.orig/tests/oauth2/test_challenges.py ++++ google-auth-2.17.3/tests/oauth2/test_challenges.py @@ -17,7 +17,7 @@ import base64 import sys @@ -99,8 +111,10 @@ import pytest # type: ignore import pyu2f # type: ignore ---- a/tests/oauth2/test_credentials.py -+++ b/tests/oauth2/test_credentials.py +Index: google-auth-2.17.3/tests/oauth2/test_credentials.py +=================================================================== +--- google-auth-2.17.3.orig/tests/oauth2/test_credentials.py ++++ google-auth-2.17.3/tests/oauth2/test_credentials.py @@ -18,7 +18,7 @@ import os import pickle import sys @@ -110,8 +124,10 @@ import pytest # type: ignore from google.auth import _helpers ---- a/tests/oauth2/test_gdch_credentials.py -+++ b/tests/oauth2/test_gdch_credentials.py +Index: google-auth-2.17.3/tests/oauth2/test_gdch_credentials.py +=================================================================== +--- google-auth-2.17.3.orig/tests/oauth2/test_gdch_credentials.py ++++ google-auth-2.17.3/tests/oauth2/test_gdch_credentials.py @@ -17,7 +17,7 @@ import datetime import json import os @@ -121,8 +137,10 @@ import pytest # type: ignore import requests import six ---- a/tests/oauth2/test_id_token.py -+++ b/tests/oauth2/test_id_token.py +Index: google-auth-2.17.3/tests/oauth2/test_id_token.py +=================================================================== +--- google-auth-2.17.3.orig/tests/oauth2/test_id_token.py ++++ google-auth-2.17.3/tests/oauth2/test_id_token.py @@ -15,7 +15,7 @@ import json import os @@ -132,8 +150,10 @@ import pytest # type: ignore from google.auth import environment_vars ---- a/tests/oauth2/test_reauth.py -+++ b/tests/oauth2/test_reauth.py +Index: google-auth-2.17.3/tests/oauth2/test_reauth.py +=================================================================== +--- google-auth-2.17.3.orig/tests/oauth2/test_reauth.py ++++ google-auth-2.17.3/tests/oauth2/test_reauth.py @@ -14,7 +14,7 @@ import copy @@ -143,8 +163,10 @@ import pytest # type: ignore from google.auth import exceptions ---- a/tests/oauth2/test_service_account.py -+++ b/tests/oauth2/test_service_account.py +Index: google-auth-2.17.3/tests/oauth2/test_service_account.py +=================================================================== +--- google-auth-2.17.3.orig/tests/oauth2/test_service_account.py ++++ google-auth-2.17.3/tests/oauth2/test_service_account.py @@ -16,7 +16,7 @@ import datetime import json import os @@ -154,8 +176,10 @@ from google.auth import _helpers from google.auth import crypt ---- a/tests/oauth2/test_sts.py -+++ b/tests/oauth2/test_sts.py +Index: google-auth-2.17.3/tests/oauth2/test_sts.py +=================================================================== +--- google-auth-2.17.3.orig/tests/oauth2/test_sts.py ++++ google-auth-2.17.3/tests/oauth2/test_sts.py @@ -14,7 +14,7 @@ import json @@ -165,19 +189,23 @@ import pytest # type: ignore from six.moves import http_client from six.moves import urllib ---- a/tests/test__cloud_sdk.py -+++ b/tests/test__cloud_sdk.py -@@ -17,7 +17,7 @@ import json - import os +Index: google-auth-2.17.3/tests/test__cloud_sdk.py +=================================================================== +--- google-auth-2.17.3.orig/tests/test__cloud_sdk.py ++++ google-auth-2.17.3/tests/test__cloud_sdk.py +@@ -18,7 +18,7 @@ import os import subprocess + import sys -import mock +from unittest import mock import pytest # type: ignore from google.auth import _cloud_sdk ---- a/tests/test__default.py -+++ b/tests/test__default.py +Index: google-auth-2.17.3/tests/test__default.py +=================================================================== +--- google-auth-2.17.3.orig/tests/test__default.py ++++ google-auth-2.17.3/tests/test__default.py @@ -15,7 +15,7 @@ import json import os @@ -187,8 +215,10 @@ import pytest # type: ignore from google.auth import _default ---- a/tests/test__exponential_backoff.py -+++ b/tests/test__exponential_backoff.py +Index: google-auth-2.17.3/tests/test__exponential_backoff.py +=================================================================== +--- google-auth-2.17.3.orig/tests/test__exponential_backoff.py ++++ google-auth-2.17.3/tests/test__exponential_backoff.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. @@ -198,8 +228,10 @@ from google.auth import _exponential_backoff ---- a/tests/test__oauth2client.py -+++ b/tests/test__oauth2client.py +Index: google-auth-2.17.3/tests/test__oauth2client.py +=================================================================== +--- google-auth-2.17.3.orig/tests/test__oauth2client.py ++++ google-auth-2.17.3/tests/test__oauth2client.py @@ -16,7 +16,7 @@ import datetime import os import sys @@ -209,8 +241,10 @@ import pytest # type: ignore from six.moves import reload_module ---- a/tests/test_app_engine.py -+++ b/tests/test_app_engine.py +Index: google-auth-2.17.3/tests/test_app_engine.py +=================================================================== +--- google-auth-2.17.3.orig/tests/test_app_engine.py ++++ google-auth-2.17.3/tests/test_app_engine.py @@ -14,7 +14,7 @@ import datetime @@ -220,8 +254,10 @@ import pytest # type: ignore from google.auth import app_engine ---- a/tests/test_aws.py -+++ b/tests/test_aws.py +Index: google-auth-2.17.3/tests/test_aws.py +=================================================================== +--- google-auth-2.17.3.orig/tests/test_aws.py ++++ google-auth-2.17.3/tests/test_aws.py @@ -16,7 +16,7 @@ import datetime import json import os @@ -231,8 +267,10 @@ import pytest # type: ignore from six.moves import http_client from six.moves import urllib ---- a/tests/test_downscoped.py -+++ b/tests/test_downscoped.py +Index: google-auth-2.17.3/tests/test_downscoped.py +=================================================================== +--- google-auth-2.17.3.orig/tests/test_downscoped.py ++++ google-auth-2.17.3/tests/test_downscoped.py @@ -15,7 +15,7 @@ import datetime import json @@ -242,8 +280,10 @@ import pytest # type: ignore from six.moves import http_client from six.moves import urllib ---- a/tests/test_external_account.py -+++ b/tests/test_external_account.py +Index: google-auth-2.17.3/tests/test_external_account.py +=================================================================== +--- google-auth-2.17.3.orig/tests/test_external_account.py ++++ google-auth-2.17.3/tests/test_external_account.py @@ -15,7 +15,7 @@ import datetime import json @@ -253,8 +293,10 @@ import pytest # type: ignore from six.moves import http_client from six.moves import urllib ---- a/tests/test_external_account_authorized_user.py -+++ b/tests/test_external_account_authorized_user.py +Index: google-auth-2.17.3/tests/test_external_account_authorized_user.py +=================================================================== +--- google-auth-2.17.3.orig/tests/test_external_account_authorized_user.py ++++ google-auth-2.17.3/tests/test_external_account_authorized_user.py @@ -15,7 +15,7 @@ import datetime import json @@ -264,8 +306,10 @@ import pytest # type: ignore from six.moves import http_client ---- a/tests/test_iam.py -+++ b/tests/test_iam.py +Index: google-auth-2.17.3/tests/test_iam.py +=================================================================== +--- google-auth-2.17.3.orig/tests/test_iam.py ++++ google-auth-2.17.3/tests/test_iam.py @@ -16,7 +16,7 @@ import base64 import datetime import json @@ -275,8 +319,10 @@ import pytest # type: ignore from six.moves import http_client ---- a/tests/test_identity_pool.py -+++ b/tests/test_identity_pool.py +Index: google-auth-2.17.3/tests/test_identity_pool.py +=================================================================== +--- google-auth-2.17.3.orig/tests/test_identity_pool.py ++++ google-auth-2.17.3/tests/test_identity_pool.py @@ -16,7 +16,7 @@ import datetime import json import os @@ -286,8 +332,10 @@ import pytest # type: ignore from six.moves import http_client from six.moves import urllib ---- a/tests/test_impersonated_credentials.py -+++ b/tests/test_impersonated_credentials.py +Index: google-auth-2.17.3/tests/test_impersonated_credentials.py +=================================================================== +--- google-auth-2.17.3.orig/tests/test_impersonated_credentials.py ++++ google-auth-2.17.3/tests/test_impersonated_credentials.py @@ -19,7 +19,7 @@ import os # Because Python 2.7 # from typing import List @@ -297,8 +345,10 @@ import pytest # type: ignore from six.moves import http_client ---- a/tests/test_jwt.py -+++ b/tests/test_jwt.py +Index: google-auth-2.17.3/tests/test_jwt.py +=================================================================== +--- google-auth-2.17.3.orig/tests/test_jwt.py ++++ google-auth-2.17.3/tests/test_jwt.py @@ -17,7 +17,7 @@ import datetime import json import os @@ -308,8 +358,10 @@ import pytest # type: ignore from google.auth import _helpers ---- a/tests/test_pluggable.py -+++ b/tests/test_pluggable.py +Index: google-auth-2.17.3/tests/test_pluggable.py +=================================================================== +--- google-auth-2.17.3.orig/tests/test_pluggable.py ++++ google-auth-2.17.3/tests/test_pluggable.py @@ -17,7 +17,7 @@ import json import os import subprocess @@ -319,8 +371,10 @@ import pytest # type: ignore # from six.moves import http_client ---- a/tests/transport/test__custom_tls_signer.py -+++ b/tests/transport/test__custom_tls_signer.py +Index: google-auth-2.17.3/tests/transport/test__custom_tls_signer.py +=================================================================== +--- google-auth-2.17.3.orig/tests/transport/test__custom_tls_signer.py ++++ google-auth-2.17.3/tests/transport/test__custom_tls_signer.py @@ -16,7 +16,7 @@ import base64 import ctypes import os @@ -330,8 +384,10 @@ import pytest # type: ignore from requests.packages.urllib3.util.ssl_ import create_urllib3_context # type: ignore import urllib3.contrib.pyopenssl # type: ignore ---- a/tests/transport/test__mtls_helper.py -+++ b/tests/transport/test__mtls_helper.py +Index: google-auth-2.17.3/tests/transport/test__mtls_helper.py +=================================================================== +--- google-auth-2.17.3.orig/tests/transport/test__mtls_helper.py ++++ google-auth-2.17.3/tests/transport/test__mtls_helper.py @@ -15,7 +15,7 @@ import os import re @@ -341,8 +397,10 @@ from OpenSSL import crypto import pytest # type: ignore ---- a/tests/transport/test_grpc.py -+++ b/tests/transport/test_grpc.py +Index: google-auth-2.17.3/tests/transport/test_grpc.py +=================================================================== +--- google-auth-2.17.3.orig/tests/transport/test_grpc.py ++++ google-auth-2.17.3/tests/transport/test_grpc.py @@ -16,7 +16,7 @@ import datetime import os import time @@ -352,8 +410,10 @@ import pytest # type: ignore from google.auth import _helpers ---- a/tests/transport/test_mtls.py -+++ b/tests/transport/test_mtls.py +Index: google-auth-2.17.3/tests/transport/test_mtls.py +=================================================================== +--- google-auth-2.17.3.orig/tests/transport/test_mtls.py ++++ google-auth-2.17.3/tests/transport/test_mtls.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. @@ -363,8 +423,10 @@ import pytest # type: ignore from google.auth import exceptions ---- a/tests/transport/test_requests.py -+++ b/tests/transport/test_requests.py +Index: google-auth-2.17.3/tests/transport/test_requests.py +=================================================================== +--- google-auth-2.17.3.orig/tests/transport/test_requests.py ++++ google-auth-2.17.3/tests/transport/test_requests.py @@ -18,7 +18,7 @@ import os import sys @@ -374,8 +436,10 @@ import OpenSSL import pytest # type: ignore import requests ---- a/tests/transport/test_urllib3.py -+++ b/tests/transport/test_urllib3.py +Index: google-auth-2.17.3/tests/transport/test_urllib3.py +=================================================================== +--- google-auth-2.17.3.orig/tests/transport/test_urllib3.py ++++ google-auth-2.17.3/tests/transport/test_urllib3.py @@ -15,7 +15,7 @@ import os import sys diff --git a/python-google-auth.changes b/python-google-auth.changes index 591da56..3f0a2dc 100644 --- a/python-google-auth.changes +++ b/python-google-auth.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Wed May 10 07:14:23 UTC 2023 - Daniel Garcia + +- Add urllib3-2.patch to support newer urllib3 -- gh#googleapis/google-auth-library-python#1290 +- Remove no-python3.patch +- Update to 2.17.3: + * Add useEmailAzp claim for id token iam flow (#1270) (7a9c6f2) +- 2.17.2: + * Do not create new JWT credentials if they make the same claims as + the existing. (#1267) (eebb7b6) +- 2.17.1: + * Print out reauth plugin error and raise if challenge output is + None (#1265) (08d22fe) +- 2.17.0: + * Experimental service account iam endpoint flow for id token + (#1258) (8ff0de5) + * Python: Remove aws url validation (#1254) (20a966b) +- 2.16.3: + * Read both applicationId and relyingPartyId. (#1246) (e125dfe) +- 2.16.2: + * Call gcloud config get project to get project for user cred + (#1243) (c078a13) + * Do not use hardcoded string 'python', when you mean + sys.executable. (#1233) (91ac8e6) + * Don't retry if error or error_description is not string (#1241) + (e2d263a) + * Improve ADC related errors and warnings (#1237) (2dfa213) + ------------------------------------------------------------------- Fri Apr 21 12:25:47 UTC 2023 - Dirk Müller diff --git a/python-google-auth.spec b/python-google-auth.spec index eb81ff2..f589848 100644 --- a/python-google-auth.spec +++ b/python-google-auth.spec @@ -19,7 +19,7 @@ %define skip_python2 1 %{?sle15_python_module_pythons} Name: python-google-auth -Version: 2.16.1 +Version: 2.17.3 Release: 0 Summary: Google Authentication Library License: Apache-2.0 @@ -27,9 +27,8 @@ 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-UPSTREAM no-python3.patch gh#googleapis/google-auth-library-python!1233 mcepl@suse.com -# don't use 'python3' literal when you mean sys.executable -Patch2: no-python3.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} diff --git a/urllib3-2.patch b/urllib3-2.patch new file mode 100644 index 0000000..6b4e323 --- /dev/null +++ b/urllib3-2.patch @@ -0,0 +1,36 @@ +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.