Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-google-api-core for openSUSE:Factory checked in at 2022-06-08 14:25:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-google-api-core (Old) and /work/SRC/openSUSE:Factory/.python-google-api-core.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-google-api-core" Wed Jun 8 14:25:13 2022 rev:20 rq:981275 version:2.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-google-api-core/python-google-api-core.changes 2022-04-30 22:52:06.780189767 +0200 +++ /work/SRC/openSUSE:Factory/.python-google-api-core.new.1548/python-google-api-core.changes 2022-06-08 14:25:33.148549324 +0200 @@ -1,0 +2,31 @@ +Wed Jun 8 09:11:04 UTC 2022 - pgaj...@suse.com + +- version update to 2.8.1 + 2.8.1 (2022-05-26) + Bug Fixes + * deps: require googleapis-common-protos >= 1.56.2 (d84d66c) + * deps: require protobuf>= 3.15.0, <4.0.0dev (#385) (d84d66c) + 2.8.0 (2022-05-18) + Features + * adds support for audience in client_options (#379) (c97c498) + * adds support for audience in client_options. (c97c498) + + +------------------------------------------------------------------- +Thu May 12 09:45:18 UTC 2022 - pgaj...@suse.com + +- version update to 2.7.3 + Bug Fixes + * Avoid AttributeError if grpcio-status is not installed (#370) (022add1) +- deleted patches + - 373-KeyError-in-test.patch (upstreamed) + +------------------------------------------------------------------- +Thu May 12 09:17:02 UTC 2022 - pgaj...@suse.com + +- do not require python-mock for build +- added patches + fix no mock + + python-google-api-core-no-mock.patch + +------------------------------------------------------------------- Old: ---- 373-KeyError-in-test.patch google-api-core-2.7.2.tar.gz New: ---- google-api-core-2.8.1.tar.gz python-google-api-core-no-mock.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-google-api-core.spec ++++++ --- /var/tmp/diff_new_pack.aTKDNc/_old 2022-06-08 14:25:33.640549934 +0200 +++ /var/tmp/diff_new_pack.aTKDNc/_new 2022-06-08 14:25:33.652549949 +0200 @@ -27,15 +27,14 @@ %endif %define skip_python2 1 Name: python-google-api-core -Version: 2.7.2 +Version: 2.8.1 Release: 0 Summary: Google API client core library License: Apache-2.0 URL: https://github.com/googleapis/python-api-core Source: https://files.pythonhosted.org/packages/source/g/google-api-core/google-api-core-%{version}.tar.gz -# PATCH-FIX-UPSTREAM 373-KeyError-in-test.patch gh#googleapis/python-api-core#372 mc...@suse.com -# fix KeyError in test_rest_streaming.py -Patch0: 373-KeyError-in-test.patch +# https://github.com/googleapis/python-api-core/issues/377 +Patch0: python-google-api-core-no-mock.patch BuildRequires: %{python_module google-auth >= 1.25.0} BuildRequires: %{python_module googleapis-common-protos >= 1.53.0} BuildRequires: %{python_module grpcio >= 1.33.2} @@ -50,7 +49,6 @@ # START TESTING SECTION %if %{with test} BuildRequires: %{python_module google-api-core >= %{version}} -BuildRequires: %{python_module mock} BuildRequires: %{python_module proto-plus} BuildRequires: %{python_module pytest-asyncio} BuildRequires: %{python_module pytest} ++++++ google-api-core-2.7.2.tar.gz -> google-api-core-2.8.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/google-api-core-2.7.2/PKG-INFO new/google-api-core-2.8.1/PKG-INFO --- old/google-api-core-2.7.2/PKG-INFO 2022-04-13 18:30:30.076932700 +0200 +++ new/google-api-core-2.8.1/PKG-INFO 2022-05-26 22:34:07.961703000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: google-api-core -Version: 2.7.2 +Version: 2.8.1 Summary: Google API client core library Home-page: https://github.com/googleapis/python-api-core Author: Google LLC @@ -53,5 +53,3 @@ The last version of this library compatible with Python 2.7 and 3.5 is `google-api-core==1.31.1`. - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/google-api-core-2.7.2/google/api_core/client_options.py new/google-api-core-2.8.1/google/api_core/client_options.py --- old/google-api-core-2.7.2/google/api_core/client_options.py 2022-04-13 18:27:54.000000000 +0200 +++ new/google-api-core-2.8.1/google/api_core/client_options.py 2022-05-26 22:31:07.000000000 +0200 @@ -70,6 +70,11 @@ scopes (Optional[Sequence[str]]): OAuth access token override scopes. api_key (Optional[str]): Google API key. ``credentials_file`` and ``api_key`` are mutually exclusive. + api_audience (Optional[str]): The intended audience for the API calls + to the service that will be set when using certain 3rd party + authentication flows. Audience is typically a resource identifier. + If not set, the service endpoint value will be used as a default. + An example of a valid ``api_audience`` is: "https://language.googleapis.com". Raises: ValueError: If both ``client_cert_source`` and ``client_encrypted_cert_source`` @@ -85,6 +90,7 @@ credentials_file=None, scopes=None, api_key=None, + api_audience=None, ): if client_cert_source and client_encrypted_cert_source: raise ValueError( @@ -99,6 +105,7 @@ self.credentials_file = credentials_file self.scopes = scopes self.api_key = api_key + self.api_audience = api_audience def __repr__(self): return "ClientOptions: " + repr(self.__dict__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/google-api-core-2.7.2/google/api_core/exceptions.py new/google-api-core-2.8.1/google/api_core/exceptions.py --- old/google-api-core-2.7.2/google/api_core/exceptions.py 2022-04-13 18:27:54.000000000 +0200 +++ new/google-api-core-2.8.1/google/api_core/exceptions.py 2022-05-26 22:31:07.000000000 +0200 @@ -599,7 +599,9 @@ """ # NOTE(lidiz) All gRPC error shares the parent class grpc.RpcError. # However, check for grpc.RpcError breaks backward compatibility. - if isinstance(rpc_exc, grpc.Call) or _is_informative_grpc_error(rpc_exc): + if ( + grpc is not None and isinstance(rpc_exc, grpc.Call) + ) or _is_informative_grpc_error(rpc_exc): details, err_info = _parse_grpc_error_details(rpc_exc) return from_grpc_status( rpc_exc.code(), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/google-api-core-2.7.2/google/api_core/version.py new/google-api-core-2.8.1/google/api_core/version.py --- old/google-api-core-2.7.2/google/api_core/version.py 2022-04-13 18:27:54.000000000 +0200 +++ new/google-api-core-2.8.1/google/api_core/version.py 2022-05-26 22:31:07.000000000 +0200 @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "2.7.2" +__version__ = "2.8.1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/google-api-core-2.7.2/google_api_core.egg-info/PKG-INFO new/google-api-core-2.8.1/google_api_core.egg-info/PKG-INFO --- old/google-api-core-2.7.2/google_api_core.egg-info/PKG-INFO 2022-04-13 18:30:29.000000000 +0200 +++ new/google-api-core-2.8.1/google_api_core.egg-info/PKG-INFO 2022-05-26 22:34:07.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: google-api-core -Version: 2.7.2 +Version: 2.8.1 Summary: Google API client core library Home-page: https://github.com/googleapis/python-api-core Author: Google LLC @@ -53,5 +53,3 @@ The last version of this library compatible with Python 2.7 and 3.5 is `google-api-core==1.31.1`. - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/google-api-core-2.7.2/google_api_core.egg-info/requires.txt new/google-api-core-2.8.1/google_api_core.egg-info/requires.txt --- old/google-api-core-2.7.2/google_api_core.egg-info/requires.txt 2022-04-13 18:30:29.000000000 +0200 +++ new/google-api-core-2.8.1/google_api_core.egg-info/requires.txt 2022-05-26 22:34:07.000000000 +0200 @@ -1,5 +1,5 @@ -googleapis-common-protos<2.0dev,>=1.52.0 -protobuf>=3.12.0 +googleapis-common-protos<2.0dev,>=1.56.2 +protobuf<4.0.0dev,>=3.15.0 google-auth<3.0dev,>=1.25.0 requests<3.0.0dev,>=2.18.0 @@ -8,7 +8,7 @@ grpcio-status<2.0dev,>=1.33.2 [grpcgcp] -grpcio-gcp>=0.2.2 +grpcio-gcp<1.0dev,>=0.2.2 [grpcio-gcp] -grpcio-gcp>=0.2.2 +grpcio-gcp<1.0dev,>=0.2.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/google-api-core-2.7.2/setup.py new/google-api-core-2.8.1/setup.py --- old/google-api-core-2.7.2/setup.py 2022-04-13 18:27:54.000000000 +0200 +++ new/google-api-core-2.8.1/setup.py 2022-05-26 22:31:07.000000000 +0200 @@ -29,15 +29,15 @@ # 'Development Status :: 5 - Production/Stable' release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "googleapis-common-protos >= 1.52.0, < 2.0dev", - "protobuf >= 3.12.0", + "googleapis-common-protos >= 1.56.2, < 2.0dev", + "protobuf >= 3.15.0, <4.0.0dev", "google-auth >= 1.25.0, < 3.0dev", "requests >= 2.18.0, < 3.0.0dev", ] extras = { "grpc": ["grpcio >= 1.33.2, < 2.0dev", "grpcio-status >= 1.33.2, < 2.0dev"], - "grpcgcp": "grpcio-gcp >= 0.2.2", - "grpcio-gcp": "grpcio-gcp >= 0.2.2", + "grpcgcp": "grpcio-gcp >= 0.2.2, < 1.0dev", + "grpcio-gcp": "grpcio-gcp >= 0.2.2, < 1.0dev", } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/google-api-core-2.7.2/tests/unit/test_client_options.py new/google-api-core-2.8.1/tests/unit/test_client_options.py --- old/google-api-core-2.7.2/tests/unit/test_client_options.py 2022-04-13 18:27:54.000000000 +0200 +++ new/google-api-core-2.8.1/tests/unit/test_client_options.py 2022-05-26 22:31:07.000000000 +0200 @@ -36,6 +36,7 @@ "https://www.googleapis.com/auth/cloud-platform", "https://www.googleapis.com/auth/cloud-platform.read-only", ], + api_audience="foo2.googleapis.com", ) assert options.api_endpoint == "foo.googleapis.com" @@ -46,6 +47,7 @@ "https://www.googleapis.com/auth/cloud-platform", "https://www.googleapis.com/auth/cloud-platform.read-only", ] + assert options.api_audience == "foo2.googleapis.com" def test_constructor_with_encrypted_cert_source(): @@ -114,6 +116,7 @@ "https://www.googleapis.com/auth/cloud-platform", "https://www.googleapis.com/auth/cloud-platform.read-only", ], + "api_audience": "foo2.googleapis.com", } ) @@ -126,6 +129,7 @@ "https://www.googleapis.com/auth/cloud-platform.read-only", ] assert options.api_key is None + assert options.api_audience == "foo2.googleapis.com" def test_from_dict_bad_argument(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/google-api-core-2.7.2/tests/unit/test_extended_operation.py new/google-api-core-2.8.1/tests/unit/test_extended_operation.py --- old/google-api-core-2.7.2/tests/unit/test_extended_operation.py 2022-04-13 18:27:54.000000000 +0200 +++ new/google-api-core-2.8.1/tests/unit/test_extended_operation.py 2022-05-26 22:31:07.000000000 +0200 @@ -70,8 +70,8 @@ def test_constructor(): ex_op, refresh, _ = make_extended_operation() assert ex_op._extended_operation == refresh.responses[0] - assert ex_op.cancelled() is False - assert ex_op.done() is False + assert not ex_op.cancelled() + assert not ex_op.done() assert ex_op.name == TEST_OPERATION_NAME assert ex_op.status == CustomOperation.StatusCode.PENDING assert ex_op.error_code is None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/google-api-core-2.7.2/tests/unit/test_rest_streaming.py new/google-api-core-2.8.1/tests/unit/test_rest_streaming.py --- old/google-api-core-2.7.2/tests/unit/test_rest_streaming.py 2022-04-13 18:27:54.000000000 +0200 +++ new/google-api-core-2.8.1/tests/unit/test_rest_streaming.py 2022-05-26 22:31:07.000000000 +0200 @@ -28,6 +28,7 @@ from google.protobuf import timestamp_pb2 +__protobuf__ = proto.module(package=__name__) SEED = int(time.time()) logging.info(f"Starting rest streaming tests with random seed: {SEED}") random.seed(SEED) ++++++ python-google-api-core-no-mock.patch ++++++ diff -upr google-api-core-2.7.2.orig/tests/asyncio/future/test_async_future.py google-api-core-2.7.2/tests/asyncio/future/test_async_future.py --- google-api-core-2.7.2.orig/tests/asyncio/future/test_async_future.py 2022-05-12 11:14:18.386281401 +0200 +++ google-api-core-2.7.2/tests/asyncio/future/test_async_future.py 2022-05-12 11:14:18.402281504 +0200 @@ -14,7 +14,7 @@ import asyncio -import mock +from unittest import mock import pytest from google.api_core import exceptions diff -upr google-api-core-2.7.2.orig/tests/asyncio/gapic/test_method_async.py google-api-core-2.7.2/tests/asyncio/gapic/test_method_async.py --- google-api-core-2.7.2.orig/tests/asyncio/gapic/test_method_async.py 2022-05-12 11:14:18.386281401 +0200 +++ google-api-core-2.7.2/tests/asyncio/gapic/test_method_async.py 2022-05-12 11:14:18.402281504 +0200 @@ -14,7 +14,7 @@ import datetime -import mock +from unittest import mock import pytest try: diff -upr google-api-core-2.7.2.orig/tests/asyncio/operations_v1/test_operations_async_client.py google-api-core-2.7.2/tests/asyncio/operations_v1/test_operations_async_client.py --- google-api-core-2.7.2.orig/tests/asyncio/operations_v1/test_operations_async_client.py 2022-05-12 11:14:18.386281401 +0200 +++ google-api-core-2.7.2/tests/asyncio/operations_v1/test_operations_async_client.py 2022-05-12 11:14:18.402281504 +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 try: diff -upr google-api-core-2.7.2.orig/tests/asyncio/test_grpc_helpers_async.py google-api-core-2.7.2/tests/asyncio/test_grpc_helpers_async.py --- google-api-core-2.7.2.orig/tests/asyncio/test_grpc_helpers_async.py 2022-05-12 11:14:18.386281401 +0200 +++ google-api-core-2.7.2/tests/asyncio/test_grpc_helpers_async.py 2022-05-12 11:14:18.402281504 +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 # noqa: I202 try: diff -upr google-api-core-2.7.2.orig/tests/asyncio/test_operation_async.py google-api-core-2.7.2/tests/asyncio/test_operation_async.py --- google-api-core-2.7.2.orig/tests/asyncio/test_operation_async.py 2022-05-12 11:14:18.386281401 +0200 +++ google-api-core-2.7.2/tests/asyncio/test_operation_async.py 2022-05-12 11:14:18.402281504 +0200 @@ -13,7 +13,7 @@ # limitations under the License. -import mock +from unittest import mock import pytest try: diff -upr google-api-core-2.7.2.orig/tests/asyncio/test_page_iterator_async.py google-api-core-2.7.2/tests/asyncio/test_page_iterator_async.py --- google-api-core-2.7.2.orig/tests/asyncio/test_page_iterator_async.py 2022-05-12 11:14:18.386281401 +0200 +++ google-api-core-2.7.2/tests/asyncio/test_page_iterator_async.py 2022-05-12 11:14:18.402281504 +0200 @@ -14,7 +14,7 @@ import inspect -import mock +from unittest import mock import pytest from google.api_core import page_iterator_async @@ -126,7 +126,7 @@ class TestAsyncIterator: item2 = 100 item3 = 211 - # Make pages from mock responses + # Make pages from unittest.mock responses parent = mock.sentinel.parent page1 = page_iterator_async.Page( parent, (item1, item2), page_iterator_async._item_to_value_identity diff -upr google-api-core-2.7.2.orig/tests/asyncio/test_retry_async.py google-api-core-2.7.2/tests/asyncio/test_retry_async.py --- google-api-core-2.7.2.orig/tests/asyncio/test_retry_async.py 2022-05-12 11:14:18.386281401 +0200 +++ google-api-core-2.7.2/tests/asyncio/test_retry_async.py 2022-05-12 11:14:18.402281504 +0200 @@ -15,7 +15,7 @@ import datetime import re -import mock +from unittest import mock import pytest from google.api_core import exceptions diff -upr google-api-core-2.7.2.orig/tests/unit/future/test__helpers.py google-api-core-2.7.2/tests/unit/future/test__helpers.py --- google-api-core-2.7.2.orig/tests/unit/future/test__helpers.py 2022-05-12 11:14:18.390281427 +0200 +++ google-api-core-2.7.2/tests/unit/future/test__helpers.py 2022-05-12 11:14:18.402281504 +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 from google.api_core.future import _helpers diff -upr google-api-core-2.7.2.orig/tests/unit/future/test_polling.py google-api-core-2.7.2/tests/unit/future/test_polling.py --- google-api-core-2.7.2.orig/tests/unit/future/test_polling.py 2022-05-12 11:14:18.390281427 +0200 +++ google-api-core-2.7.2/tests/unit/future/test_polling.py 2022-05-12 11:14:18.402281504 +0200 @@ -16,7 +16,7 @@ import concurrent.futures import threading import time -import mock +from unittest import mock import pytest from google.api_core import exceptions, retry diff -upr google-api-core-2.7.2.orig/tests/unit/gapic/test_method.py google-api-core-2.7.2/tests/unit/gapic/test_method.py --- google-api-core-2.7.2.orig/tests/unit/gapic/test_method.py 2022-05-12 11:14:18.386281401 +0200 +++ google-api-core-2.7.2/tests/unit/gapic/test_method.py 2022-05-12 11:14:18.402281504 +0200 @@ -14,7 +14,7 @@ import datetime -import mock +from unittest import mock import pytest try: diff -upr google-api-core-2.7.2.orig/tests/unit/operations_v1/test_operations_rest_client.py google-api-core-2.7.2/tests/unit/operations_v1/test_operations_rest_client.py --- google-api-core-2.7.2.orig/tests/unit/operations_v1/test_operations_rest_client.py 2022-05-12 11:14:18.386281401 +0200 +++ google-api-core-2.7.2/tests/unit/operations_v1/test_operations_rest_client.py 2022-05-12 11:14:18.402281504 +0200 @@ -15,7 +15,7 @@ # import os -import mock +from unittest import mock import pytest try: diff -upr google-api-core-2.7.2.orig/tests/unit/test_bidi.py google-api-core-2.7.2/tests/unit/test_bidi.py --- google-api-core-2.7.2.orig/tests/unit/test_bidi.py 2022-05-12 11:14:18.386281401 +0200 +++ google-api-core-2.7.2/tests/unit/test_bidi.py 2022-05-12 11:14:18.402281504 +0200 @@ -17,7 +17,7 @@ import logging import queue import threading -import mock +from unittest import mock import pytest try: diff -upr google-api-core-2.7.2.orig/tests/unit/test_exceptions.py google-api-core-2.7.2/tests/unit/test_exceptions.py --- google-api-core-2.7.2.orig/tests/unit/test_exceptions.py 2022-05-12 11:14:18.386281401 +0200 +++ google-api-core-2.7.2/tests/unit/test_exceptions.py 2022-05-12 11:14:18.402281504 +0200 @@ -15,7 +15,7 @@ import http.client import json -import mock +from unittest import mock import pytest import requests diff -upr google-api-core-2.7.2.orig/tests/unit/test_extended_operation.py google-api-core-2.7.2/tests/unit/test_extended_operation.py --- google-api-core-2.7.2.orig/tests/unit/test_extended_operation.py 2022-05-12 11:14:18.386281401 +0200 +++ google-api-core-2.7.2/tests/unit/test_extended_operation.py 2022-05-12 11:14:18.402281504 +0200 @@ -16,7 +16,7 @@ import dataclasses import enum import typing -import mock +from unittest import mock import pytest from google.api_core import exceptions diff -upr google-api-core-2.7.2.orig/tests/unit/test_grpc_helpers.py google-api-core-2.7.2/tests/unit/test_grpc_helpers.py --- google-api-core-2.7.2.orig/tests/unit/test_grpc_helpers.py 2022-05-12 11:14:18.386281401 +0200 +++ google-api-core-2.7.2/tests/unit/test_grpc_helpers.py 2022-05-12 11:14:18.402281504 +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 try: diff -upr google-api-core-2.7.2.orig/tests/unit/test_operation.py google-api-core-2.7.2/tests/unit/test_operation.py --- google-api-core-2.7.2.orig/tests/unit/test_operation.py 2022-05-12 11:14:18.386281401 +0200 +++ google-api-core-2.7.2/tests/unit/test_operation.py 2022-05-12 11:14:18.406281529 +0200 @@ -13,7 +13,7 @@ # limitations under the License. -import mock +from unittest import mock import pytest try: diff -upr google-api-core-2.7.2.orig/tests/unit/test_page_iterator.py google-api-core-2.7.2/tests/unit/test_page_iterator.py --- google-api-core-2.7.2.orig/tests/unit/test_page_iterator.py 2022-05-12 11:14:18.386281401 +0200 +++ google-api-core-2.7.2/tests/unit/test_page_iterator.py 2022-05-12 11:14:18.406281529 +0200 @@ -15,7 +15,7 @@ import math import types -import mock +from unittest import mock import pytest from google.api_core import page_iterator @@ -177,7 +177,7 @@ class TestIterator(object): item2 = 100 item3 = 211 - # Make pages from mock responses + # Make pages from unittest.mock responses parent = mock.sentinel.parent page1 = page_iterator.Page( parent, (item1, item2), page_iterator._item_to_value_identity diff -upr google-api-core-2.7.2.orig/tests/unit/test_path_template.py google-api-core-2.7.2/tests/unit/test_path_template.py --- google-api-core-2.7.2.orig/tests/unit/test_path_template.py 2022-05-12 11:14:18.386281401 +0200 +++ google-api-core-2.7.2/tests/unit/test_path_template.py 2022-05-12 11:14:18.406281529 +0200 @@ -14,7 +14,7 @@ from __future__ import unicode_literals -import mock +from unittest import mock import pytest from google.api_core import path_template diff -upr google-api-core-2.7.2.orig/tests/unit/test_retry.py google-api-core-2.7.2/tests/unit/test_retry.py --- google-api-core-2.7.2.orig/tests/unit/test_retry.py 2022-05-12 11:14:18.390281427 +0200 +++ google-api-core-2.7.2/tests/unit/test_retry.py 2022-05-12 11:14:18.406281529 +0200 @@ -16,7 +16,7 @@ import datetime import itertools import re -import mock +from unittest import mock import pytest import requests.exceptions diff -upr google-api-core-2.7.2.orig/tests/unit/test_timeout.py google-api-core-2.7.2/tests/unit/test_timeout.py --- google-api-core-2.7.2.orig/tests/unit/test_timeout.py 2022-05-12 11:14:18.390281427 +0200 +++ google-api-core-2.7.2/tests/unit/test_timeout.py 2022-05-12 11:14:18.406281529 +0200 @@ -15,7 +15,7 @@ import datetime import itertools -import mock +from unittest import mock from google.api_core import timeout