diff --git a/google-auth-2.6.6.tar.gz b/google-auth-2.6.6.tar.gz deleted file mode 100644 index c26e61e..0000000 --- a/google-auth-2.6.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ba4938e032b73deb51e59c4656a00e0939cf0b1112575099f136babb4563312 -size 189789 diff --git a/google-auth-2.7.0.tar.gz b/google-auth-2.7.0.tar.gz new file mode 100644 index 0000000..339859d --- /dev/null +++ b/google-auth-2.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a954960f852d5f19e6af14dd8e75c20159609e85d8db37e4013cc8c3824a7e1 +size 195638 diff --git a/python-google-auth-no-mock.patch b/python-google-auth-no-mock.patch new file mode 100644 index 0000000..98a799f --- /dev/null +++ b/python-google-auth-no-mock.patch @@ -0,0 +1,336 @@ +diff -upr google-auth-2.7.0.orig/tests/compute_engine/test_credentials.py google-auth-2.7.0/tests/compute_engine/test_credentials.py +--- google-auth-2.7.0.orig/tests/compute_engine/test_credentials.py 2022-06-08 10:35:11.954473507 +0200 ++++ google-auth-2.7.0/tests/compute_engine/test_credentials.py 2022-06-08 10:35:11.970473600 +0200 +@@ -14,7 +14,7 @@ + import base64 + import datetime + +-import mock ++from unittest import mock + import pytest # type: ignore + import responses # type: ignore + +diff -upr google-auth-2.7.0.orig/tests/compute_engine/test__metadata.py google-auth-2.7.0/tests/compute_engine/test__metadata.py +--- google-auth-2.7.0.orig/tests/compute_engine/test__metadata.py 2022-06-08 10:35:11.954473507 +0200 ++++ google-auth-2.7.0/tests/compute_engine/test__metadata.py 2022-06-08 10:35:11.970473600 +0200 +@@ -16,7 +16,7 @@ import datetime + import json + import os + +-import mock ++from unittest import mock + import pytest # type: ignore + from six.moves import http_client + from six.moves import reload_module +diff -upr google-auth-2.7.0.orig/tests/conftest.py google-auth-2.7.0/tests/conftest.py +--- google-auth-2.7.0.orig/tests/conftest.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/conftest.py 2022-06-08 10:35:11.970473600 +0200 +@@ -15,7 +15,7 @@ + import os + import sys + +-import mock ++from unittest import mock + import pytest # type: ignore + + +diff -upr google-auth-2.7.0.orig/tests/crypt/test__python_rsa.py google-auth-2.7.0/tests/crypt/test__python_rsa.py +--- google-auth-2.7.0.orig/tests/crypt/test__python_rsa.py 2022-06-08 10:35:11.954473507 +0200 ++++ google-auth-2.7.0/tests/crypt/test__python_rsa.py 2022-06-08 10:35:11.970473600 +0200 +@@ -15,7 +15,7 @@ + import json + import os + +-import mock ++from unittest import mock + from pyasn1_modules import pem # type: ignore + import pytest # type: ignore + import rsa # type: ignore +diff -upr google-auth-2.7.0.orig/tests/oauth2/test_challenges.py google-auth-2.7.0/tests/oauth2/test_challenges.py +--- google-auth-2.7.0.orig/tests/oauth2/test_challenges.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/oauth2/test_challenges.py 2022-06-08 10:35:11.970473600 +0200 +@@ -17,7 +17,7 @@ + import base64 + import sys + +-import mock ++from unittest import mock + import pytest # type: ignore + import pyu2f # type: ignore + +diff -upr google-auth-2.7.0.orig/tests/oauth2/test__client.py google-auth-2.7.0/tests/oauth2/test__client.py +--- google-auth-2.7.0.orig/tests/oauth2/test__client.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/oauth2/test__client.py 2022-06-08 10:35:11.970473600 +0200 +@@ -16,7 +16,7 @@ import datetime + import json + import os + +-import mock ++from unittest import mock + import pytest # type: ignore + import six + from six.moves import http_client +diff -upr google-auth-2.7.0.orig/tests/oauth2/test_credentials.py google-auth-2.7.0/tests/oauth2/test_credentials.py +--- google-auth-2.7.0.orig/tests/oauth2/test_credentials.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/oauth2/test_credentials.py 2022-06-08 10:35:11.970473600 +0200 +@@ -18,7 +18,7 @@ import os + import pickle + import sys + +-import mock ++from unittest import mock + import pytest # type: ignore + + from google.auth import _helpers +diff -upr google-auth-2.7.0.orig/tests/oauth2/test_id_token.py google-auth-2.7.0/tests/oauth2/test_id_token.py +--- google-auth-2.7.0.orig/tests/oauth2/test_id_token.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/oauth2/test_id_token.py 2022-06-08 10:35:11.970473600 +0200 +@@ -15,7 +15,7 @@ + import json + import os + +-import mock ++from unittest import mock + import pytest # type: ignore + + from google.auth import environment_vars +diff -upr google-auth-2.7.0.orig/tests/oauth2/test_reauth.py google-auth-2.7.0/tests/oauth2/test_reauth.py +--- google-auth-2.7.0.orig/tests/oauth2/test_reauth.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/oauth2/test_reauth.py 2022-06-08 10:35:11.970473600 +0200 +@@ -14,7 +14,7 @@ + + import copy + +-import mock ++from unittest import mock + import pytest # type: ignore + + from google.auth import exceptions +diff -upr google-auth-2.7.0.orig/tests/oauth2/test_service_account.py google-auth-2.7.0/tests/oauth2/test_service_account.py +--- google-auth-2.7.0.orig/tests/oauth2/test_service_account.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/oauth2/test_service_account.py 2022-06-08 10:35:11.970473600 +0200 +@@ -16,7 +16,7 @@ import datetime + import json + import os + +-import mock ++from unittest import mock + + from google.auth import _helpers + from google.auth import crypt +diff -upr google-auth-2.7.0.orig/tests/oauth2/test_sts.py google-auth-2.7.0/tests/oauth2/test_sts.py +--- google-auth-2.7.0.orig/tests/oauth2/test_sts.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/oauth2/test_sts.py 2022-06-08 10:35:11.974473623 +0200 +@@ -14,7 +14,7 @@ + + import json + +-import mock ++from unittest import mock + import pytest # type: ignore + from six.moves import http_client + from six.moves import urllib +diff -upr google-auth-2.7.0.orig/tests/test_app_engine.py google-auth-2.7.0/tests/test_app_engine.py +--- google-auth-2.7.0.orig/tests/test_app_engine.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/test_app_engine.py 2022-06-08 10:35:11.974473623 +0200 +@@ -14,7 +14,7 @@ + + import datetime + +-import mock ++from unittest import mock + import pytest # type: ignore + + from google.auth import app_engine +diff -upr google-auth-2.7.0.orig/tests/test_aws.py google-auth-2.7.0/tests/test_aws.py +--- google-auth-2.7.0.orig/tests/test_aws.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/test_aws.py 2022-06-08 10:35:11.974473623 +0200 +@@ -15,7 +15,7 @@ + import datetime + import json + +-import mock ++from unittest import mock + import pytest # type: ignore + from six.moves import http_client + from six.moves import urllib +diff -upr google-auth-2.7.0.orig/tests/test__cloud_sdk.py google-auth-2.7.0/tests/test__cloud_sdk.py +--- google-auth-2.7.0.orig/tests/test__cloud_sdk.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/test__cloud_sdk.py 2022-06-08 10:35:11.978473646 +0200 +@@ -17,7 +17,7 @@ import json + import os + import subprocess + +-import mock ++from unittest import mock + import pytest # type: ignore + + from google.auth import _cloud_sdk +diff -upr google-auth-2.7.0.orig/tests/test__default.py google-auth-2.7.0/tests/test__default.py +--- google-auth-2.7.0.orig/tests/test__default.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/test__default.py 2022-06-08 10:35:11.974473623 +0200 +@@ -15,7 +15,7 @@ + import json + import os + +-import mock ++from unittest import mock + import pytest # type: ignore + + from google.auth import _default +diff -upr google-auth-2.7.0.orig/tests/test_downscoped.py google-auth-2.7.0/tests/test_downscoped.py +--- google-auth-2.7.0.orig/tests/test_downscoped.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/test_downscoped.py 2022-06-08 10:35:11.974473623 +0200 +@@ -15,7 +15,7 @@ + import datetime + import json + +-import mock ++from unittest import mock + import pytest # type: ignore + from six.moves import http_client + from six.moves import urllib +diff -upr google-auth-2.7.0.orig/tests/test_external_account.py google-auth-2.7.0/tests/test_external_account.py +--- google-auth-2.7.0.orig/tests/test_external_account.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/test_external_account.py 2022-06-08 10:35:11.974473623 +0200 +@@ -15,7 +15,7 @@ + import datetime + import json + +-import mock ++from unittest import mock + import pytest # type: ignore + from six.moves import http_client + from six.moves import urllib +diff -upr google-auth-2.7.0.orig/tests/test_iam.py google-auth-2.7.0/tests/test_iam.py +--- google-auth-2.7.0.orig/tests/test_iam.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/test_iam.py 2022-06-08 10:35:11.974473623 +0200 +@@ -16,7 +16,7 @@ import base64 + import datetime + import json + +-import mock ++from unittest import mock + import pytest # type: ignore + from six.moves import http_client + +diff -upr google-auth-2.7.0.orig/tests/test_identity_pool.py google-auth-2.7.0/tests/test_identity_pool.py +--- google-auth-2.7.0.orig/tests/test_identity_pool.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/test_identity_pool.py 2022-06-08 10:35:11.974473623 +0200 +@@ -16,7 +16,7 @@ import datetime + import json + import os + +-import mock ++from unittest import mock + import pytest # type: ignore + from six.moves import http_client + from six.moves import urllib +diff -upr google-auth-2.7.0.orig/tests/test_impersonated_credentials.py google-auth-2.7.0/tests/test_impersonated_credentials.py +--- google-auth-2.7.0.orig/tests/test_impersonated_credentials.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/test_impersonated_credentials.py 2022-06-08 10:35:11.974473623 +0200 +@@ -19,7 +19,7 @@ import os + # Because Python 2.7 + # from typing import List + +-import mock ++from unittest import mock + import pytest # type: ignore + from six.moves import http_client + +diff -upr google-auth-2.7.0.orig/tests/test_jwt.py google-auth-2.7.0/tests/test_jwt.py +--- google-auth-2.7.0.orig/tests/test_jwt.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/test_jwt.py 2022-06-08 10:35:11.974473623 +0200 +@@ -17,7 +17,7 @@ import datetime + import json + import os + +-import mock ++from unittest import mock + import pytest # type: ignore + + from google.auth import _helpers +diff -upr google-auth-2.7.0.orig/tests/test__oauth2client.py google-auth-2.7.0/tests/test__oauth2client.py +--- google-auth-2.7.0.orig/tests/test__oauth2client.py 2022-06-08 10:35:11.958473530 +0200 ++++ google-auth-2.7.0/tests/test__oauth2client.py 2022-06-08 10:35:11.974473623 +0200 +@@ -16,7 +16,7 @@ import datetime + import os + import sys + +-import mock ++from unittest import mock + import oauth2client.client # type: ignore + import oauth2client.contrib.gce # type: ignore + import oauth2client.service_account # type: ignore +diff -upr google-auth-2.7.0.orig/tests/transport/test__custom_tls_signer.py google-auth-2.7.0/tests/transport/test__custom_tls_signer.py +--- google-auth-2.7.0.orig/tests/transport/test__custom_tls_signer.py 2022-06-08 10:35:11.954473507 +0200 ++++ google-auth-2.7.0/tests/transport/test__custom_tls_signer.py 2022-06-08 10:35:11.978473646 +0200 +@@ -16,7 +16,7 @@ import base64 + import ctypes + import os + +-import mock ++from unittest import mock + import pytest # type: ignore + from requests.packages.urllib3.util.ssl_ import create_urllib3_context # type: ignore + import urllib3.contrib.pyopenssl # type: ignore +diff -upr google-auth-2.7.0.orig/tests/transport/test_grpc.py google-auth-2.7.0/tests/transport/test_grpc.py +--- google-auth-2.7.0.orig/tests/transport/test_grpc.py 2022-06-08 10:35:11.954473507 +0200 ++++ google-auth-2.7.0/tests/transport/test_grpc.py 2022-06-08 10:35:11.978473646 +0200 +@@ -16,7 +16,7 @@ import datetime + import os + import time + +-import mock ++from unittest import mock + import pytest # type: ignore + + from google.auth import _helpers +diff -upr google-auth-2.7.0.orig/tests/transport/test__mtls_helper.py google-auth-2.7.0/tests/transport/test__mtls_helper.py +--- google-auth-2.7.0.orig/tests/transport/test__mtls_helper.py 2022-06-08 10:35:11.954473507 +0200 ++++ google-auth-2.7.0/tests/transport/test__mtls_helper.py 2022-06-08 10:35:11.978473646 +0200 +@@ -15,7 +15,7 @@ + import os + import re + +-import mock ++from unittest import mock + from OpenSSL import crypto + import pytest # type: ignore + +diff -upr google-auth-2.7.0.orig/tests/transport/test_mtls.py google-auth-2.7.0/tests/transport/test_mtls.py +--- google-auth-2.7.0.orig/tests/transport/test_mtls.py 2022-06-08 10:35:11.954473507 +0200 ++++ google-auth-2.7.0/tests/transport/test_mtls.py 2022-06-08 10:35:11.978473646 +0200 +@@ -12,7 +12,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-import mock ++from unittest import mock + import pytest # type: ignore + + from google.auth import exceptions +diff -upr google-auth-2.7.0.orig/tests/transport/test_requests.py google-auth-2.7.0/tests/transport/test_requests.py +--- google-auth-2.7.0.orig/tests/transport/test_requests.py 2022-06-08 10:35:11.954473507 +0200 ++++ google-auth-2.7.0/tests/transport/test_requests.py 2022-06-08 10:35:11.978473646 +0200 +@@ -18,7 +18,7 @@ import os + import sys + + import freezegun +-import mock ++from unittest import mock + import OpenSSL + import pytest # type: ignore + import requests +diff -upr google-auth-2.7.0.orig/tests/transport/test_urllib3.py google-auth-2.7.0/tests/transport/test_urllib3.py +--- google-auth-2.7.0.orig/tests/transport/test_urllib3.py 2022-06-08 10:35:11.954473507 +0200 ++++ google-auth-2.7.0/tests/transport/test_urllib3.py 2022-06-08 10:35:11.978473646 +0200 +@@ -15,7 +15,7 @@ + import os + import sys + +-import mock ++from unittest import mock + import OpenSSL + import pytest # type: ignore + from six.moves import http_client diff --git a/python-google-auth.changes b/python-google-auth.changes index 00bcb5c..f3d16e0 100644 --- a/python-google-auth.changes +++ b/python-google-auth.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Jun 8 08:53:02 UTC 2022 - pgajdos@suse.com + +- version update to 2.7.0 + ## [2.7.0] + * add experimental enterprise cert support + * add experimental GDCH support + * Pluggable auth support + * validate urls for external accounts + * pluggable auth support [#995] + * revert experimental GDCH support + * fix changelog header to consistent size + ## [2.6.6] + * silence TypeError during tear down stage + ## [2.6.5] + * add additional missing import in _default.py + ## [2.6.4] + * fix missing import in _default.py +- added patches + fix https://github.com/googleapis/google-auth-library-python/issues/1055 + + python-google-auth-no-mock.patch + ------------------------------------------------------------------- Fri Jun 3 16:02:30 UTC 2022 - Markéta Machová diff --git a/python-google-auth.spec b/python-google-auth.spec index e0ba876..7a727d7 100644 --- a/python-google-auth.spec +++ b/python-google-auth.spec @@ -19,19 +19,20 @@ %define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-google-auth -Version: 2.6.6 +Version: 2.7.0 Release: 0 Summary: Google Authentication Library License: Apache-2.0 URL: https://github.com/googleapis/google-auth-library-python Source: https://files.pythonhosted.org/packages/source/g/google-auth/google-auth-%{version}.tar.gz Patch0: ga_python-executable-name.patch +# https://github.com/googleapis/google-auth-library-python/issues/1055 +Patch1: python-google-auth-no-mock.patch BuildRequires: %{python_module Flask} # START TESTING SECTION BuildRequires: %{python_module aiohttp >= 3.6.2} BuildRequires: %{python_module cachetools >= 2.0.0} BuildRequires: %{python_module freezegun} -BuildRequires: %{python_module mock} BuildRequires: %{python_module pyOpenSSL >= 20.0.0} BuildRequires: %{python_module pyasn1-modules >= 0.2.1} BuildRequires: %{python_module pytest-localserver} @@ -64,6 +65,7 @@ This library simplifies using Google’s various server-to-server authentication %prep %setup -q -n google-auth-%{version} %patch0 -p1 +%patch1 -p1 %build %python_build