diff --git a/373-KeyError-in-test.patch b/373-KeyError-in-test.patch deleted file mode 100644 index 730d85b..0000000 --- a/373-KeyError-in-test.patch +++ /dev/null @@ -1,19 +0,0 @@ -From a8065793e7118c47fc71edc4c02447ef4b665209 Mon Sep 17 00:00:00 2001 -From: Anthonios Partheniou -Date: Fri, 29 Apr 2022 13:28:02 -0400 -Subject: [PATCH] test: fix KeyError in test_rest_streaming.py - ---- - tests/unit/test_rest_streaming.py | 1 + - 1 file changed, 1 insertion(+) - ---- a/tests/unit/test_rest_streaming.py -+++ b/tests/unit/test_rest_streaming.py -@@ -28,6 +28,7 @@ from google.protobuf import duration_pb2 - 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) diff --git a/google-api-core-2.7.2.tar.gz b/google-api-core-2.7.2.tar.gz deleted file mode 100644 index 9875c44..0000000 --- a/google-api-core-2.7.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65480309a7437f739e4476da037af02a3ec8263f1d1f89f72bbdc8f54fe402d2 -size 121907 diff --git a/google-api-core-2.8.1.tar.gz b/google-api-core-2.8.1.tar.gz new file mode 100644 index 0000000..5214859 --- /dev/null +++ b/google-api-core-2.8.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:958024c6aa3460b08f35741231076a4dd9a4c819a6a39d44da9627febe8b28f0 +size 122117 diff --git a/python-google-api-core-no-mock.patch b/python-google-api-core-no-mock.patch new file mode 100644 index 0000000..e44182a --- /dev/null +++ b/python-google-api-core-no-mock.patch @@ -0,0 +1,258 @@ +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 + diff --git a/python-google-api-core.changes b/python-google-api-core.changes index acd285e..5313207 100644 --- a/python-google-api-core.changes +++ b/python-google-api-core.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Wed Jun 8 09:11:04 UTC 2022 - pgajdos@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 - pgajdos@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 - pgajdos@suse.com + +- do not require python-mock for build +- added patches + fix no mock + + python-google-api-core-no-mock.patch + ------------------------------------------------------------------- Mon Apr 25 12:30:45 UTC 2022 - Matej Cepl diff --git a/python-google-api-core.spec b/python-google-api-core.spec index b2595b2..ccf7068 100644 --- a/python-google-api-core.spec +++ b/python-google-api-core.spec @@ -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 mcepl@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 @@ BuildRequires: %{python_module wheel} # 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}