diff options
Diffstat (limited to 'community/py3-google-auth/10-use-mock-from-standard-library.patch')
| -rw-r--r-- | community/py3-google-auth/10-use-mock-from-standard-library.patch | 83 |
1 files changed, 48 insertions, 35 deletions
diff --git a/community/py3-google-auth/10-use-mock-from-standard-library.patch b/community/py3-google-auth/10-use-mock-from-standard-library.patch index 9b7c357532..6d343a2a11 100644 --- a/community/py3-google-auth/10-use-mock-from-standard-library.patch +++ b/community/py3-google-auth/10-use-mock-from-standard-library.patch @@ -1,5 +1,5 @@ diff --git a/tests/compute_engine/test__metadata.py b/tests/compute_engine/test__metadata.py -index 0898e1f..6a44585 100644 +index 8b5eece..c376dbf 100644 --- a/tests/compute_engine/test__metadata.py +++ b/tests/compute_engine/test__metadata.py @@ -16,7 +16,7 @@ import datetime @@ -12,24 +12,24 @@ index 0898e1f..6a44585 100644 from six.moves import http_client from six.moves import reload_module diff --git a/tests/compute_engine/test_credentials.py b/tests/compute_engine/test_credentials.py -index ec9d13b..555306c 100644 +index 98def0f..486eb61 100644 --- a/tests/compute_engine/test_credentials.py +++ b/tests/compute_engine/test_credentials.py @@ -14,7 +14,7 @@ - + import base64 import datetime -import mock +from unittest import mock import pytest + import responses - from google.auth import _helpers diff --git a/tests/conftest.py b/tests/conftest.py -index 2ccc132..de254f2 100644 +index cf8a0f9..7b5eb1d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py -@@ -14,7 +14,7 @@ - +@@ -15,7 +15,7 @@ + import os import sys -import mock @@ -38,7 +38,7 @@ index 2ccc132..de254f2 100644 diff --git a/tests/crypt/test__python_rsa.py b/tests/crypt/test__python_rsa.py -index 08b9503..e0be561 100644 +index 886ee55..f2d3115 100644 --- a/tests/crypt/test__python_rsa.py +++ b/tests/crypt/test__python_rsa.py @@ -15,7 +15,7 @@ @@ -51,7 +51,7 @@ index 08b9503..e0be561 100644 import pytest import rsa diff --git a/tests/oauth2/test__client.py b/tests/oauth2/test__client.py -index 052390a..beca8e8 100644 +index c3ae2af..f2c22ab 100644 --- a/tests/oauth2/test__client.py +++ b/tests/oauth2/test__client.py @@ -16,7 +16,7 @@ import datetime @@ -64,7 +64,7 @@ index 052390a..beca8e8 100644 import six from six.moves import http_client diff --git a/tests/oauth2/test_credentials.py b/tests/oauth2/test_credentials.py -index af10f2f..5d9e239 100644 +index 76aa463..93126e1 100644 --- a/tests/oauth2/test_credentials.py +++ b/tests/oauth2/test_credentials.py @@ -18,7 +18,7 @@ import os @@ -77,20 +77,20 @@ index af10f2f..5d9e239 100644 from google.auth import _helpers diff --git a/tests/oauth2/test_id_token.py b/tests/oauth2/test_id_token.py -index 980a8e9..d837c0e 100644 +index ff85807..28750cc 100644 --- a/tests/oauth2/test_id_token.py +++ b/tests/oauth2/test_id_token.py -@@ -14,7 +14,7 @@ - +@@ -15,7 +15,7 @@ import json + import os -import mock +from unittest import mock import pytest - from google.auth import exceptions + from google.auth import environment_vars diff --git a/tests/oauth2/test_service_account.py b/tests/oauth2/test_service_account.py -index 0f9d460..ba0f0fe 100644 +index 897374a..70460bc 100644 --- a/tests/oauth2/test_service_account.py +++ b/tests/oauth2/test_service_account.py @@ -16,7 +16,7 @@ import datetime @@ -103,7 +103,7 @@ index 0f9d460..ba0f0fe 100644 from google.auth import _helpers from google.auth import crypt diff --git a/tests/test__cloud_sdk.py b/tests/test__cloud_sdk.py -index c5c5c27..96b6327 100644 +index 3377604..f8063fd 100644 --- a/tests/test__cloud_sdk.py +++ b/tests/test__cloud_sdk.py @@ -17,7 +17,7 @@ import json @@ -116,7 +116,7 @@ index c5c5c27..96b6327 100644 from google.auth import _cloud_sdk diff --git a/tests/test__default.py b/tests/test__default.py -index 2c86f3f..ba88982 100644 +index 35000b0..8ef8b6c 100644 --- a/tests/test__default.py +++ b/tests/test__default.py @@ -15,7 +15,7 @@ @@ -129,7 +129,7 @@ index 2c86f3f..ba88982 100644 from google.auth import _default diff --git a/tests/test__oauth2client.py b/tests/test__oauth2client.py -index 520f943..b1d2ece 100644 +index 6b1112b..9002a40 100644 --- a/tests/test__oauth2client.py +++ b/tests/test__oauth2client.py @@ -16,7 +16,7 @@ import datetime @@ -142,7 +142,7 @@ index 520f943..b1d2ece 100644 import oauth2client.contrib.gce import oauth2client.service_account diff --git a/tests/test_app_engine.py b/tests/test_app_engine.py -index 9559a2c..29ca4f0 100644 +index 9dfdfa6..e363bad 100644 --- a/tests/test_app_engine.py +++ b/tests/test_app_engine.py @@ -14,7 +14,7 @@ @@ -155,7 +155,7 @@ index 9559a2c..29ca4f0 100644 from google.auth import app_engine diff --git a/tests/test_iam.py b/tests/test_iam.py -index 52ab9bd..f852cca 100644 +index c98a138..9555592 100644 --- a/tests/test_iam.py +++ b/tests/test_iam.py @@ -16,7 +16,7 @@ import base64 @@ -168,7 +168,7 @@ index 52ab9bd..f852cca 100644 from six.moves import http_client diff --git a/tests/test_impersonated_credentials.py b/tests/test_impersonated_credentials.py -index 1cfcc7c..4449762 100644 +index 31075ca..175cd56 100644 --- a/tests/test_impersonated_credentials.py +++ b/tests/test_impersonated_credentials.py @@ -16,7 +16,7 @@ import datetime @@ -181,7 +181,7 @@ index 1cfcc7c..4449762 100644 from six.moves import http_client diff --git a/tests/test_jwt.py b/tests/test_jwt.py -index b0c6e48..ed6ce28 100644 +index 488aee4..5a8cb50 100644 --- a/tests/test_jwt.py +++ b/tests/test_jwt.py @@ -17,7 +17,7 @@ import datetime @@ -193,12 +193,25 @@ index b0c6e48..ed6ce28 100644 import pytest from google.auth import _helpers +diff --git a/tests/transport/test__mtls_helper.py b/tests/transport/test__mtls_helper.py +index 5bf1967..1d0ad26 100644 +--- a/tests/transport/test__mtls_helper.py ++++ b/tests/transport/test__mtls_helper.py +@@ -15,7 +15,7 @@ + import os + import re + +-import mock ++from unittest import mock + import pytest + + from google.auth.transport import _mtls_helper diff --git a/tests/transport/test_grpc.py b/tests/transport/test_grpc.py -index ca12385..9fdb92d 100644 +index 5c61f96..dcf337f 100644 --- a/tests/transport/test_grpc.py +++ b/tests/transport/test_grpc.py -@@ -15,7 +15,7 @@ - import datetime +@@ -16,7 +16,7 @@ import datetime + import os import time -import mock @@ -207,28 +220,28 @@ index ca12385..9fdb92d 100644 from google.auth import _helpers diff --git a/tests/transport/test_requests.py b/tests/transport/test_requests.py -index f0321c8..f393950 100644 +index d6770de..7792c32 100644 --- a/tests/transport/test_requests.py +++ b/tests/transport/test_requests.py -@@ -16,7 +16,7 @@ import datetime - import functools +@@ -17,7 +17,7 @@ import functools + import sys import freezegun -import mock +from unittest import mock + import OpenSSL import pytest import requests - import requests.adapters diff --git a/tests/transport/test_urllib3.py b/tests/transport/test_urllib3.py -index 1d7ce5a..627b33c 100644 +index a25fcd7..97a1df3 100644 --- a/tests/transport/test_urllib3.py +++ b/tests/transport/test_urllib3.py -@@ -12,7 +12,7 @@ - # See the License for the specific language governing permissions and - # limitations under the License. +@@ -14,7 +14,7 @@ + + import sys -import mock +from unittest import mock + import OpenSSL + import pytest from six.moves import http_client - import urllib3 - |