From 511398bb1b423d31c29eb9bcb57cbbc910775813 Mon Sep 17 00:00:00 2001 From: rdobuilder Date: Nov 17 2022 15:14:45 +0000 Subject: Update to 2.10.2 Related-to: https://review.rdoproject.org/r/q/Id3606b28242a2d6b9e5e629eaf9e570b58098beb --- diff --git a/.python-google-api-core.metadata b/.python-google-api-core.metadata new file mode 100644 index 0000000..4449cdc --- /dev/null +++ b/.python-google-api-core.metadata @@ -0,0 +1 @@ +bc89ddc0b6bf04ec7a2cf7739df244c885c04ac2 SOURCES/python-api-core-2.10.2.tar.gz diff --git a/SOURCES/README.md b/SOURCES/README.md new file mode 100644 index 0000000..f638563 --- /dev/null +++ b/SOURCES/README.md @@ -0,0 +1,3 @@ +# python-google-api-core + +The python-google-api-core package \ No newline at end of file diff --git a/SOURCES/use-unittest-mock-builtin.patch b/SOURCES/use-unittest-mock-builtin.patch new file mode 100644 index 0000000..5324a01 --- /dev/null +++ b/SOURCES/use-unittest-mock-builtin.patch @@ -0,0 +1,291 @@ +From 8459c208f11e64b871ed502c9ce56befa2a2ed97 Mon Sep 17 00:00:00 2001 +From: Major Hayden +Date: Fri, 4 Mar 2022 07:02:27 -0600 +Subject: [PATCH] Use unittest.mock + +--- + tests/asyncio/future/test_async_future.py | 2 +- + tests/asyncio/gapic/test_method_async.py | 2 +- + tests/asyncio/operations_v1/test_operations_async_client.py | 2 +- + tests/asyncio/test_grpc_helpers_async.py | 2 +- + tests/asyncio/test_operation_async.py | 2 +- + tests/asyncio/test_page_iterator_async.py | 2 +- + tests/asyncio/test_retry_async.py | 2 +- + tests/unit/future/test__helpers.py | 2 +- + tests/unit/future/test_polling.py | 2 +- + tests/unit/gapic/test_method.py | 2 +- + tests/unit/operations_v1/test_operations_rest_client.py | 2 +- + tests/unit/test_bidi.py | 2 +- + tests/unit/test_exceptions.py | 2 +- + tests/unit/test_extended_operation.py | 2 +- + tests/unit/test_grpc_helpers.py | 2 +- + tests/unit/test_operation.py | 2 +- + tests/unit/test_page_iterator.py | 2 +- + tests/unit/test_path_template.py | 2 +- + tests/unit/test_retry.py | 2 +- + tests/unit/test_timeout.py | 2 +- + 20 files changed, 20 insertions(+), 20 deletions(-) + +diff --git a/tests/asyncio/future/test_async_future.py b/tests/asyncio/future/test_async_future.py +index 1e9ae33..1aaf132 100644 +--- a/tests/asyncio/future/test_async_future.py ++++ b/tests/asyncio/future/test_async_future.py +@@ -14,7 +14,7 @@ + + import asyncio + +-import mock ++from unittest import mock + import pytest + + from google.api_core import exceptions +diff --git a/tests/asyncio/gapic/test_method_async.py b/tests/asyncio/gapic/test_method_async.py +index 1410747..7990e46 100644 +--- a/tests/asyncio/gapic/test_method_async.py ++++ b/tests/asyncio/gapic/test_method_async.py +@@ -14,7 +14,7 @@ + + import datetime + +-import mock ++from unittest import mock + import pytest + + try: +diff --git a/tests/asyncio/operations_v1/test_operations_async_client.py b/tests/asyncio/operations_v1/test_operations_async_client.py +index 47c3b4b..67fc941 100644 +--- a/tests/asyncio/operations_v1/test_operations_async_client.py ++++ b/tests/asyncio/operations_v1/test_operations_async_client.py +@@ -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 --git a/tests/asyncio/test_grpc_helpers_async.py b/tests/asyncio/test_grpc_helpers_async.py +index 3681a40..cc1a5a4 100644 +--- a/tests/asyncio/test_grpc_helpers_async.py ++++ b/tests/asyncio/test_grpc_helpers_async.py +@@ -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 --git a/tests/asyncio/test_operation_async.py b/tests/asyncio/test_operation_async.py +index 26ad7ce..662d956 100644 +--- a/tests/asyncio/test_operation_async.py ++++ b/tests/asyncio/test_operation_async.py +@@ -13,7 +13,7 @@ + # limitations under the License. + + +-import mock ++from unittest import mock + import pytest + + try: +diff --git a/tests/asyncio/test_page_iterator_async.py b/tests/asyncio/test_page_iterator_async.py +index 75f9e1c..c3f5d55 100644 +--- a/tests/asyncio/test_page_iterator_async.py ++++ b/tests/asyncio/test_page_iterator_async.py +@@ -14,7 +14,7 @@ + + import inspect + +-import mock ++from unittest import mock + import pytest + + from google.api_core import page_iterator_async +diff --git a/tests/asyncio/test_retry_async.py b/tests/asyncio/test_retry_async.py +index 873caaf..1f57470 100644 +--- a/tests/asyncio/test_retry_async.py ++++ b/tests/asyncio/test_retry_async.py +@@ -15,7 +15,7 @@ + import datetime + import re + +-import mock ++from unittest import mock + import pytest + + from google.api_core import exceptions +diff --git a/tests/unit/future/test__helpers.py b/tests/unit/future/test__helpers.py +index 98afc59..a37efdd 100644 +--- a/tests/unit/future/test__helpers.py ++++ b/tests/unit/future/test__helpers.py +@@ -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 --git a/tests/unit/future/test_polling.py b/tests/unit/future/test_polling.py +index 2381d03..79f19db 100644 +--- a/tests/unit/future/test_polling.py ++++ b/tests/unit/future/test_polling.py +@@ -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 --git a/tests/unit/gapic/test_method.py b/tests/unit/gapic/test_method.py +index 9778d23..28323da 100644 +--- a/tests/unit/gapic/test_method.py ++++ b/tests/unit/gapic/test_method.py +@@ -14,7 +14,7 @@ + + import datetime + +-import mock ++from unittest import mock + import pytest + + try: +diff --git a/tests/unit/operations_v1/test_operations_rest_client.py b/tests/unit/operations_v1/test_operations_rest_client.py +index dddf6b7..f40d780 100644 +--- a/tests/unit/operations_v1/test_operations_rest_client.py ++++ b/tests/unit/operations_v1/test_operations_rest_client.py +@@ -15,7 +15,7 @@ + # + import os + +-import mock ++from unittest import mock + import pytest + + try: +diff --git a/tests/unit/test_bidi.py b/tests/unit/test_bidi.py +index 7fb1620..896f653 100644 +--- a/tests/unit/test_bidi.py ++++ b/tests/unit/test_bidi.py +@@ -17,7 +17,7 @@ import logging + import queue + import threading + +-import mock ++from unittest import mock + import pytest + + try: +diff --git a/tests/unit/test_exceptions.py b/tests/unit/test_exceptions.py +index 4169ad4..099e423 100644 +--- a/tests/unit/test_exceptions.py ++++ b/tests/unit/test_exceptions.py +@@ -15,7 +15,7 @@ + import http.client + import json + +-import mock ++from unittest import mock + import pytest + import requests + +diff --git a/tests/unit/test_extended_operation.py b/tests/unit/test_extended_operation.py +index 7fcebed..c31640a 100644 +--- a/tests/unit/test_extended_operation.py ++++ b/tests/unit/test_extended_operation.py +@@ -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 --git a/tests/unit/test_grpc_helpers.py b/tests/unit/test_grpc_helpers.py +index ca969e4..95b1a24 100644 +--- a/tests/unit/test_grpc_helpers.py ++++ b/tests/unit/test_grpc_helpers.py +@@ -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 --git a/tests/unit/test_operation.py b/tests/unit/test_operation.py +index 22e23bc..8ffee10 100644 +--- a/tests/unit/test_operation.py ++++ b/tests/unit/test_operation.py +@@ -13,7 +13,7 @@ + # limitations under the License. + + +-import mock ++from unittest import mock + import pytest + + try: +diff --git a/tests/unit/test_page_iterator.py b/tests/unit/test_page_iterator.py +index a44e998..56be26f 100644 +--- a/tests/unit/test_page_iterator.py ++++ b/tests/unit/test_page_iterator.py +@@ -15,7 +15,7 @@ + import math + import types + +-import mock ++from unittest import mock + import pytest + + from google.api_core import page_iterator +diff --git a/tests/unit/test_path_template.py b/tests/unit/test_path_template.py +index 2c5216e..a72f25f 100644 +--- a/tests/unit/test_path_template.py ++++ b/tests/unit/test_path_template.py +@@ -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 --git a/tests/unit/test_retry.py b/tests/unit/test_retry.py +index 74c5d77..b7462fb 100644 +--- a/tests/unit/test_retry.py ++++ b/tests/unit/test_retry.py +@@ -16,7 +16,7 @@ import datetime + import itertools + import re + +-import mock ++from unittest import mock + import pytest + import requests.exceptions + +diff --git a/tests/unit/test_timeout.py b/tests/unit/test_timeout.py +index 30d624e..c13e499 100644 +--- a/tests/unit/test_timeout.py ++++ b/tests/unit/test_timeout.py +@@ -15,7 +15,7 @@ + import datetime + import itertools + +-import mock ++from unittest import mock + + from google.api_core import timeout + +-- +2.35.1 + diff --git a/SPECS/python-google-api-core.spec b/SPECS/python-google-api-core.spec new file mode 100644 index 0000000..05b6444 --- /dev/null +++ b/SPECS/python-google-api-core.spec @@ -0,0 +1,266 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.3.0) +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 1; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + +# F35: Do not update past 2.8.0 because Fedora 35's protobuf is too old. + +%bcond_with tests + +%global srcname google-api-core +%global forgeurl https://github.com/googleapis/python-api-core +Version: 2.10.2 +%global tag v%{version} +%forgemeta + +Name: python-%{srcname} +Release: %autorelease +Summary: Core Library for Google Client Libraries + +License: ASL 2.0 +URL: %forgeurl +Source0: %{url}/archive/%{tag}.tar.gz#/python-api-core-%{version}.tar.gz + +BuildRequires: python3-devel +BuildRequires: pyproject-rpm-macros +BuildRequires: python3-wheel + +%if %{with tests} +BuildRequires: python3dist(google-auth) +BuildRequires: python3dist(googleapis-common-protos) +BuildRequires: python3dist(grpcio) +BuildRequires: python3dist(grpcio-gcp) +BuildRequires: python3dist(protobuf) +BuildRequires: python3dist(proto-plus) +BuildRequires: python3dist(pytest) +BuildRequires: python3dist(pytz) +BuildRequires: python3dist(requests) +BuildRequires: python3dist(six) +%endif + +BuildArch: noarch + +%global _description %{expand:This library is not meant to stand-alone. +Instead it defines common helpers used by all Google API clients.} + +%description +%{_description} + + +%package -n python3-%{srcname} +Summary: %{summary} +# Extras +Requires: python3dist(grpcio) +Requires: python3dist(grpcio-status) + +%description -n python3-%{srcname} +%{_description} + +%pyproject_extras_subpkg -n python3-%{srcname} grpc + + +%prep +%forgeautosetup -p1 + +# Allow a slightly older protobuf. +# Allow even older protobuf, available in centos-storage +sed -i 's/"protobuf.*",/"protobuf>=3.19.0",/' setup.py + +# Replace mock imports with unittest.mock. +grep -rl "^[[:space:]]*import mock" tests | \ + xargs sed -i -E 's/^([[:space:]]*)import mock/\1from unittest import mock/' + + +%generate_buildrequires +%pyproject_buildrequires + + +%build +%pyproject_wheel + + +%install +%pyproject_install +%pyproject_save_files google + + +%check +%if %{with tests} +# Work around an unusual pytest/PEP 420 issue where pytest can't import the +# installed module. Thanks to mhroncok for the help! +mv google{,_} +%pytest tests/unit \ + -k "not test_wrap_unary_errors \ + and not test_wrap_stream_errors_invocation \ + and not test_wrap_stream_errors_iterator_initialization \ + and not test_wrap_stream_errors_during_iteration" +mv google{_,} +%endif + + +%files -n python3-%{srcname} -f %{pyproject_files} +%doc README.rst CHANGELOG.md SECURITY.md +%{python3_sitelib}/google_api_core-%{version}-py%{python3_version}-nspkg.pth + + +%changelog +* Mon Nov 14 2022 Major Hayden 2.10.2-1 +- Update to 2.10.2 rhbz#2123558 + +* Fri Jul 22 2022 Fedora Release Engineering 2.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jun 28 2022 Python Maint 2.8.2-3 +- Rebuilt for Python 3.11 + +* Thu Jun 16 2022 Python Maint 2.8.2-2 +- Bootstrap for Python 3.11 + +* Wed Jun 15 2022 Major Hayden 2.8.2-1 +- Update to 2.8.2 + +* Wed Jun 15 2022 Python Maint 2.8.1-2 +- Bootstrap for Python 3.11 + +* Fri May 27 2022 Major Hayden 2.8.1-1 +- Update to 2.8.1 + +* Thu May 19 2022 Major Hayden 2.8.0-1 +- 🚀 Update to 2.8.0 + +* Mon May 02 2022 Major Hayden 2.7.3-1 +- Update to 2.7.3 + +* Wed Apr 13 2022 Major Hayden 2.7.2-1 +- Update to 2.7.2 + +* Thu Mar 10 2022 Major Hayden 2.7.1-1 +- Update to 2.7.1 + +* Wed Mar 09 2022 Major Hayden 2.7.0-1 +- Update to 2.7.0 + +* Tue Mar 08 2022 Major Hayden 2.6.1-1 +- Update to 2.6.1 + +* Fri Mar 04 2022 Major Hayden 2.6.0-1 +- Update to 2.6.0 + +* Fri Feb 04 2022 Major Hayden 2.5.0-1 +- Update to 2.5.0 + +* Fri Jan 21 2022 Fedora Release Engineering 2.4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jan 13 2022 Major Hayden 2.4.0-4 +- Restore other skipped tests + +* Thu Jan 13 2022 Major Hayden 2.4.0-3 +- Skip broken tests in rest streaming + +* Thu Jan 13 2022 Major Hayden 2.4.0-2 +- Run all tests + +* Wed Jan 12 2022 Major Hayden 2.4.0-1 +- Update to 2.4.0 + +* Thu Dec 16 2021 Major Hayden 2.3.2-1 +- Update to 2.3.2 + +* Wed Dec 15 2021 Major Hayden 2.3.1-1 +- Update to 2.3.1 + +* Wed Dec 08 2021 Major Hayden 2.3.0-1 +- Update to 2.3.0 + +* Wed Nov 03 2021 Major Hayden 2.2.2-1 +- Update to 2.2.2 + +* Thu Oct 28 2021 Major Hayden 2.2.1-1 +- Update to 2.2.1 + +* Tue Oct 26 2021 Major Hayden 2.2.0-1 +- Update to 2.2.0 + +* Mon Oct 25 2021 Major Hayden 2.1.1-2 +- Use python3-devel as BuildRequires + +* Thu Oct 14 2021 Major Hayden 2.1.1-1 +- Update to 2.1.0 + +* Wed Oct 06 2021 Major Hayden 2.1.0-1 +- Update to 2.1.0 + +* Fri Sep 17 2021 Major Hayden 2.0.1-3 +- Fix tests with PEP 420 workaround + +* Thu Sep 09 2021 Major Hayden 2.0.1-2 +- Move to rpmautospec + +* Wed Sep 01 2021 Major Hayden 2.0.1-1 +- Update to 2.0.1 + +* Mon Aug 23 2021 Major Hayden 2.0.0-2 +- Add proto-plus dependency for tests + +* Mon Aug 23 2021 Major Hayden 2.0.0-1 +- Update to 2.0.0 + +* Tue Jul 27 2021 Major Hayden 1.31.1-2 +- Use correct path for extracted sources + +* Tue Jul 27 2021 Major Hayden 1.31.1-1 +- Update to 1.31.1 + +* Fri Jul 23 2021 Fedora Release Engineering 1.31.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jul 15 2021 Major Hayden 1.31.0-2 +- Add grpc, grpcgcp, and grpcio-gcp extras packages + +* Fri Jul 09 2021 Major Hayden 1.31.0-1 +- Update to 1.31.0 + +* Tue Jun 15 2021 Major Hayden 1.30.0-3 +- Get the right sources this time + +* Tue Jun 15 2021 Major Hayden 1.30.0-2 +- Include patch in new sources + +* Tue Jun 15 2021 Major Hayden 1.30.0-1 +- Update to v1.3.0 + +* Fri Jun 04 2021 Python Maint 1.29.0-2 +- Rebuilt for Python 3.10 + +* Thu Jun 03 2021 Mohamed El Morabity 1.29.0-1 +- Update to 1.29.0 + +* Wed Jan 27 2021 Fedora Release Engineering 1.17.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Aug 17 2020 Mohamed El Morabity 1.17.0-2 +- Temporarily disable tests + +* Thu Aug 13 2020 Mohamed El Morabity 1.17.0-1 +- Rebuild + +* Sat Aug 01 2020 Fedora Release Engineering 1.21.0-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering 1.21.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jun 19 2020 Mohamed El Morabity 1.21.0-1 +- Update to 1.21.0 + +* Fri Jun 05 2020 Mohamed El Morabity 1.17.0-1 +- Revert to 1.17.0 until grpc is updated + +* Fri Jun 05 2020 Mohamed El Morabity 1.19.0-1 +- First import