Accepting request 1228363 from devel:languages:python

- Update to 2.23.0
  * Migrate to pyproject.toml (#736)
- from version 2.22.0
  * Add support for python 3.13 (#696)
  * Add type hints to ClientOptions (#735)
  * Improve `Any` decode error (#712)
  * Require proto-plus >= 1.25.0 for Python 3.13 (#740)
  * Switch to unittest.mock from mock (#713)
- Drop python-google-api-core-no-mock.patch, merged upstream (forwarded request 1228327 from glaubitz)

OBS-URL: https://build.opensuse.org/request/show/1228363
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-google-api-core?expand=0&rev=38
This commit is contained in:
Ana Guerrero 2024-12-05 16:09:08 +00:00 committed by Git OBS Bridge
commit db3c0db0c0
5 changed files with 18 additions and 393 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4a152fd11a9f774ea606388d423b68aa7e6d6a0ffe4c8266f74979613ec09f81
size 159313

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2ceb087315e6af43f256704b871d99326b1f12a9d6ce99beaedec99ba26a0ace
size 160094

View File

@ -1,385 +0,0 @@
From 5f28e210306de47ff5a9fa3b4bf48ac6ceb13e85 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Wed, 2 Oct 2024 13:50:33 +1000
Subject: [PATCH] test: Switch to unittest.mock from mock
Now that the minimum supported version of Python is 3.7, we can stop
using the external mock requirement, and import it from unittest. I have
also attempted to keep imports ordered.
Fixes #377
---
noxfile.py | 2 --
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 | 3 ++-
tests/asyncio/retry/test_retry_streaming_async.py | 4 ++--
tests/asyncio/retry/test_retry_unary_async.py | 2 +-
tests/asyncio/test_grpc_helpers_async.py | 3 ++-
tests/asyncio/test_operation_async.py | 3 ++-
tests/asyncio/test_page_iterator_async.py | 2 +-
tests/asyncio/test_rest_streaming_async.py | 6 +++---
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/retry/test_retry_base.py | 2 +-
tests/unit/retry/test_retry_streaming.py | 2 +-
tests/unit/retry/test_retry_unary.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 | 3 ++-
tests/unit/test_operation.py | 3 ++-
tests/unit/test_page_iterator.py | 2 +-
tests/unit/test_path_template.py | 2 +-
tests/unit/test_timeout.py | 3 +--
25 files changed, 32 insertions(+), 30 deletions(-)
Index: google_api_core-2.21.0/tests/asyncio/future/test_async_future.py
===================================================================
--- google_api_core-2.21.0.orig/tests/asyncio/future/test_async_future.py
+++ google_api_core-2.21.0/tests/asyncio/future/test_async_future.py
@@ -13,8 +13,8 @@
# limitations under the License.
import asyncio
+from unittest import mock
-import mock
import pytest
from google.api_core import exceptions
Index: google_api_core-2.21.0/tests/asyncio/gapic/test_method_async.py
===================================================================
--- google_api_core-2.21.0.orig/tests/asyncio/gapic/test_method_async.py
+++ google_api_core-2.21.0/tests/asyncio/gapic/test_method_async.py
@@ -13,8 +13,8 @@
# limitations under the License.
import datetime
+from unittest import mock
-import mock
import pytest
try:
Index: google_api_core-2.21.0/tests/asyncio/operations_v1/test_operations_async_client.py
===================================================================
--- google_api_core-2.21.0.orig/tests/asyncio/operations_v1/test_operations_async_client.py
+++ google_api_core-2.21.0/tests/asyncio/operations_v1/test_operations_async_client.py
@@ -12,7 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import mock
+from unittest import mock
+
import pytest
try:
Index: google_api_core-2.21.0/tests/asyncio/retry/test_retry_streaming_async.py
===================================================================
--- google_api_core-2.21.0.orig/tests/asyncio/retry/test_retry_streaming_async.py
+++ google_api_core-2.21.0/tests/asyncio/retry/test_retry_streaming_async.py
@@ -12,11 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+import asyncio
import datetime
import re
-import asyncio
+from unittest import mock
-import mock
import pytest
from google.api_core import exceptions
Index: google_api_core-2.21.0/tests/asyncio/retry/test_retry_unary_async.py
===================================================================
--- google_api_core-2.21.0.orig/tests/asyncio/retry/test_retry_unary_async.py
+++ google_api_core-2.21.0/tests/asyncio/retry/test_retry_unary_async.py
@@ -14,8 +14,8 @@
import datetime
import re
+from unittest import mock
-import mock
import pytest
from google.api_core import exceptions
Index: google_api_core-2.21.0/tests/asyncio/test_grpc_helpers_async.py
===================================================================
--- google_api_core-2.21.0.orig/tests/asyncio/test_grpc_helpers_async.py
+++ google_api_core-2.21.0/tests/asyncio/test_grpc_helpers_async.py
@@ -12,7 +12,8 @@
# 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:
Index: google_api_core-2.21.0/tests/asyncio/test_operation_async.py
===================================================================
--- google_api_core-2.21.0.orig/tests/asyncio/test_operation_async.py
+++ google_api_core-2.21.0/tests/asyncio/test_operation_async.py
@@ -13,7 +13,8 @@
# limitations under the License.
-import mock
+from unittest import mock
+
import pytest
try:
Index: google_api_core-2.21.0/tests/asyncio/test_page_iterator_async.py
===================================================================
--- google_api_core-2.21.0.orig/tests/asyncio/test_page_iterator_async.py
+++ google_api_core-2.21.0/tests/asyncio/test_page_iterator_async.py
@@ -13,8 +13,8 @@
# limitations under the License.
import inspect
+from unittest import mock
-import mock
import pytest
from google.api_core import page_iterator_async
Index: google_api_core-2.21.0/tests/asyncio/test_rest_streaming_async.py
===================================================================
--- google_api_core-2.21.0.orig/tests/asyncio/test_rest_streaming_async.py
+++ google_api_core-2.21.0/tests/asyncio/test_rest_streaming_async.py
@@ -15,14 +15,14 @@
# TODO: set random.seed explicitly in each test function.
# See related issue: https://github.com/googleapis/python-api-core/issues/689.
-import pytest # noqa: I202
-import mock
-
import datetime
import logging
import random
import time
from typing import List, AsyncIterator
+from unittest import mock
+
+import pytest # noqa: I202
import proto
Index: google_api_core-2.21.0/tests/unit/future/test__helpers.py
===================================================================
--- google_api_core-2.21.0.orig/tests/unit/future/test__helpers.py
+++ google_api_core-2.21.0/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
Index: google_api_core-2.21.0/tests/unit/future/test_polling.py
===================================================================
--- google_api_core-2.21.0.orig/tests/unit/future/test_polling.py
+++ google_api_core-2.21.0/tests/unit/future/test_polling.py
@@ -15,8 +15,8 @@
import concurrent.futures
import threading
import time
+from unittest import mock
-import mock
import pytest
from google.api_core import exceptions, retry
Index: google_api_core-2.21.0/tests/unit/gapic/test_method.py
===================================================================
--- google_api_core-2.21.0.orig/tests/unit/gapic/test_method.py
+++ google_api_core-2.21.0/tests/unit/gapic/test_method.py
@@ -13,8 +13,8 @@
# limitations under the License.
import datetime
+from unittest import mock
-import mock
import pytest
try:
Index: google_api_core-2.21.0/tests/unit/operations_v1/test_operations_rest_client.py
===================================================================
--- google_api_core-2.21.0.orig/tests/unit/operations_v1/test_operations_rest_client.py
+++ google_api_core-2.21.0/tests/unit/operations_v1/test_operations_rest_client.py
@@ -14,8 +14,8 @@
# limitations under the License.
#
import os
+from unittest import mock
-import mock
import pytest
from typing import Any, List
Index: google_api_core-2.21.0/tests/unit/retry/test_retry_base.py
===================================================================
--- google_api_core-2.21.0.orig/tests/unit/retry/test_retry_base.py
+++ google_api_core-2.21.0/tests/unit/retry/test_retry_base.py
@@ -14,8 +14,8 @@
import itertools
import re
+from unittest import mock
-import mock
import pytest
import requests.exceptions
Index: google_api_core-2.21.0/tests/unit/retry/test_retry_streaming.py
===================================================================
--- google_api_core-2.21.0.orig/tests/unit/retry/test_retry_streaming.py
+++ google_api_core-2.21.0/tests/unit/retry/test_retry_streaming.py
@@ -13,8 +13,8 @@
# limitations under the License.
import re
+from unittest import mock
-import mock
import pytest
from google.api_core import exceptions
Index: google_api_core-2.21.0/tests/unit/retry/test_retry_unary.py
===================================================================
--- google_api_core-2.21.0.orig/tests/unit/retry/test_retry_unary.py
+++ google_api_core-2.21.0/tests/unit/retry/test_retry_unary.py
@@ -14,8 +14,8 @@
import datetime
import re
+from unittest import mock
-import mock
import pytest
from google.api_core import exceptions
Index: google_api_core-2.21.0/tests/unit/test_bidi.py
===================================================================
--- google_api_core-2.21.0.orig/tests/unit/test_bidi.py
+++ google_api_core-2.21.0/tests/unit/test_bidi.py
@@ -16,8 +16,8 @@ import datetime
import logging
import queue
import threading
+from unittest import mock
-import mock
import pytest
try:
Index: google_api_core-2.21.0/tests/unit/test_exceptions.py
===================================================================
--- google_api_core-2.21.0.orig/tests/unit/test_exceptions.py
+++ google_api_core-2.21.0/tests/unit/test_exceptions.py
@@ -14,8 +14,8 @@
import http.client
import json
+from unittest import mock
-import mock
import pytest
import requests
Index: google_api_core-2.21.0/tests/unit/test_extended_operation.py
===================================================================
--- google_api_core-2.21.0.orig/tests/unit/test_extended_operation.py
+++ google_api_core-2.21.0/tests/unit/test_extended_operation.py
@@ -15,8 +15,8 @@
import dataclasses
import enum
import typing
+from unittest import mock
-import mock
import pytest
from google.api_core import exceptions
Index: google_api_core-2.21.0/tests/unit/test_grpc_helpers.py
===================================================================
--- google_api_core-2.21.0.orig/tests/unit/test_grpc_helpers.py
+++ google_api_core-2.21.0/tests/unit/test_grpc_helpers.py
@@ -12,7 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import mock
+from unittest import mock
+
import pytest
try:
Index: google_api_core-2.21.0/tests/unit/test_operation.py
===================================================================
--- google_api_core-2.21.0.orig/tests/unit/test_operation.py
+++ google_api_core-2.21.0/tests/unit/test_operation.py
@@ -13,7 +13,8 @@
# limitations under the License.
-import mock
+from unittest import mock
+
import pytest
try:
Index: google_api_core-2.21.0/tests/unit/test_page_iterator.py
===================================================================
--- google_api_core-2.21.0.orig/tests/unit/test_page_iterator.py
+++ google_api_core-2.21.0/tests/unit/test_page_iterator.py
@@ -14,8 +14,8 @@
import math
import types
+from unittest import mock
-import mock
import pytest
from google.api_core import page_iterator
Index: google_api_core-2.21.0/tests/unit/test_path_template.py
===================================================================
--- google_api_core-2.21.0.orig/tests/unit/test_path_template.py
+++ google_api_core-2.21.0/tests/unit/test_path_template.py
@@ -13,8 +13,8 @@
# limitations under the License.
from __future__ import unicode_literals
+from unittest import mock
-import mock
import pytest
from google.api import auth_pb2
Index: google_api_core-2.21.0/tests/unit/test_timeout.py
===================================================================
--- google_api_core-2.21.0.orig/tests/unit/test_timeout.py
+++ google_api_core-2.21.0/tests/unit/test_timeout.py
@@ -14,8 +14,7 @@
import datetime
import itertools
-
-import mock
+from unittest import mock
from google.api_core import timeout as timeouts

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Dec 4 14:22:59 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to 2.23.0
* Migrate to pyproject.toml (#736)
- from version 2.22.0
* Add support for python 3.13 (#696)
* Add type hints to ClientOptions (#735)
* Improve `Any` decode error (#712)
* Require proto-plus >= 1.25.0 for Python 3.13 (#740)
* Switch to unittest.mock from mock (#713)
- Drop python-google-api-core-no-mock.patch, merged upstream
-------------------------------------------------------------------
Tue Oct 29 04:42:29 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>

View File

@ -26,15 +26,12 @@
%endif
%{?sle15_python_module_pythons}
Name: python-google-api-core
Version: 2.21.0
Version: 2.23.0
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 Based on gh#googleapis/python-api-core#713
Patch0: python-google-api-core-no-mock.patch
# Needed for python_sitelib/google
BuildRequires: %{python_module googleapis-common-protos >= 1.56.2}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools >= 40.3.0}
@ -57,7 +54,7 @@ Requires: python-googleapis-common-protos >= 1.56.2
Requires: python-grpcio >= 1.49.1
Requires: python-grpcio-status >= 1.49.1
Requires: python-requests >= 2.18.0
Requires: (python-proto-plus >= 1.22.3 with python-proto-plus < 2.0.0dev0)
Requires: (python-proto-plus >= 1.25.0 with python-proto-plus < 2.0.0dev0)
Requires: (python-protobuf >= 3.19.5 with python-protobuf < 6.0.0.dev0)
BuildArch: noarch
%python_subpackages