From 4bbcd05cc15ac8bcd419a3892d77d68ea048a25c2cc979d073f6340db85e447c Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 25 Mar 2024 20:09:49 +0000 Subject: [PATCH] - update to 3.10.0: * Allow users to explicitly configure universe domain * Added placeholder kwargs to StructuredLogHandler * Allowed for a partial override of loggers that get excluded from setup_client * Remove usage in including_default_value_fields to prepare for protobuf 5.x * Use value of cluster-location in GKE for tagging location OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:google/python-google-cloud-logging?expand=0&rev=5 --- google-cloud-logging-3.10.0.tar.gz | 3 + google-cloud-logging-3.9.0.tar.gz | 3 - python-google-cloud-logging.changes | 12 +++ python-google-cloud-logging.spec | 6 +- remove-mock.patch | 161 ++++++++++++++++++++++++++++ 5 files changed, 179 insertions(+), 6 deletions(-) create mode 100644 google-cloud-logging-3.10.0.tar.gz delete mode 100644 google-cloud-logging-3.9.0.tar.gz create mode 100644 remove-mock.patch diff --git a/google-cloud-logging-3.10.0.tar.gz b/google-cloud-logging-3.10.0.tar.gz new file mode 100644 index 0000000..376cf4c --- /dev/null +++ b/google-cloud-logging-3.10.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d93d347351240ddb14cfe201987a2d32cf9d7f478b8b2fabed3015b425b3274f +size 261732 diff --git a/google-cloud-logging-3.9.0.tar.gz b/google-cloud-logging-3.9.0.tar.gz deleted file mode 100644 index 59159e4..0000000 --- a/google-cloud-logging-3.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4decb1b0bed4a0e3c0e58a376646e6002d6be7cad039e3466822e8665072ea33 -size 248134 diff --git a/python-google-cloud-logging.changes b/python-google-cloud-logging.changes index 60d9a01..2137ac3 100644 --- a/python-google-cloud-logging.changes +++ b/python-google-cloud-logging.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Mar 25 20:09:05 UTC 2024 - Dirk Müller + +- update to 3.10.0: + * Allow users to explicitly configure universe domain + * Added placeholder kwargs to StructuredLogHandler + * Allowed for a partial override of loggers that get excluded + from setup_client + * Remove usage in including_default_value_fields to prepare for + protobuf 5.x + * Use value of cluster-location in GKE for tagging location + ------------------------------------------------------------------- Wed Dec 13 12:59:18 UTC 2023 - Daniel Garcia diff --git a/python-google-cloud-logging.spec b/python-google-cloud-logging.spec index 2ba70e2..d781574 100644 --- a/python-google-cloud-logging.spec +++ b/python-google-cloud-logging.spec @@ -1,7 +1,7 @@ # # spec file for package python-google-cloud-logging # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,16 +18,16 @@ %{?sle15_python_module_pythons} Name: python-google-cloud-logging -Version: 3.9.0 +Version: 3.10.0 Release: 0 Summary: Stackdriver Logging API client library License: Apache-2.0 URL: https://github.com/googleapis/python-logging Source: https://files.pythonhosted.org/packages/source/g/google-cloud-logging/google-cloud-logging-%{version}.tar.gz -BuildRequires: python-rpm-macros BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} +BuildRequires: python-rpm-macros # SECTION test requirements BuildRequires: %{python_module google-api-core >= 1.33.2} BuildRequires: %{python_module google-cloud-appengine-logging >= 0.1.0} diff --git a/remove-mock.patch b/remove-mock.patch new file mode 100644 index 0000000..e023441 --- /dev/null +++ b/remove-mock.patch @@ -0,0 +1,161 @@ +--- google-cloud-logging-3.9.0/tests/unit/handlers/test_app_engine.py 2023-12-11 20:25:38.000000000 +0100 ++++ google-cloud-logging-3.9.0/tests/unit/handlers/test_app_engine.py 2023-12-17 21:32:42.578993894 +0100 +@@ -16,7 +16,7 @@ + import pytest + import unittest + +-import mock ++from unittest import mock + + + class TestAppEngineHandler(unittest.TestCase): +--- google-cloud-logging-3.9.0/tests/unit/handlers/test_handlers.py 2023-12-11 20:25:38.000000000 +0100 ++++ google-cloud-logging-3.9.0/tests/unit/handlers/test_handlers.py 2023-12-17 21:32:42.578993894 +0100 +@@ -15,7 +15,7 @@ + import logging + import unittest + from unittest.mock import patch +-import mock ++from unittest import mock + import json + + from google.cloud.logging_v2.handlers._monitored_resources import ( +--- google-cloud-logging-3.9.0/tests/unit/handlers/test__helpers.py 2023-12-11 20:25:38.000000000 +0100 ++++ google-cloud-logging-3.9.0/tests/unit/handlers/test__helpers.py 2023-12-17 21:32:42.578993894 +0100 +@@ -14,7 +14,7 @@ + + import unittest + +-import mock ++from unittest import mock + + _FLASK_TRACE_ID = "flask0id" + _FLASK_SPAN_ID = "span0flask" +--- google-cloud-logging-3.9.0/tests/unit/handlers/test__monitored_resources.py 2023-12-11 20:25:38.000000000 +0100 ++++ google-cloud-logging-3.9.0/tests/unit/handlers/test__monitored_resources.py 2023-12-17 21:32:42.578993894 +0100 +@@ -14,7 +14,7 @@ + + import unittest + +-import mock ++from unittest import mock + import os + import functools + +--- google-cloud-logging-3.9.0/tests/unit/handlers/test_structured_log.py 2023-12-11 20:25:38.000000000 +0100 ++++ google-cloud-logging-3.9.0/tests/unit/handlers/test_structured_log.py 2023-12-17 21:32:42.578993894 +0100 +@@ -597,7 +597,7 @@ + + def test_emits_instrumentation_info(self): + import logging +- import mock ++ from unittest import mock + import google.cloud.logging_v2 + + handler = self._make_one() +@@ -621,7 +621,7 @@ + + def test_valid_instrumentation_info(self): + import logging +- import mock ++ from unittest import mock + import json + + logger = logging.getLogger("google.cloud.logging_v2.handlers.structured_log") +--- google-cloud-logging-3.9.0/tests/unit/test_client.py 2023-12-11 20:25:38.000000000 +0100 ++++ google-cloud-logging-3.9.0/tests/unit/test_client.py 2023-12-17 21:28:41.254921633 +0100 +@@ -20,7 +20,7 @@ + + import unittest + +-import mock ++from unittest import mock + + VENEER_HEADER_REGEX = re.compile( + r"gapic\/[0-9]+\.[\w.-]+ gax\/[0-9]+\.[\w.-]+ gccl\/[0-9]+\.[\w.-]+ gl-python\/[0-9]+\.[\w.-]+ grpc\/[0-9]+\.[\w.-]+" +--- google-cloud-logging-3.9.0/tests/unit/test_entries.py 2023-12-11 20:25:38.000000000 +0100 ++++ google-cloud-logging-3.9.0/tests/unit/test_entries.py 2023-12-17 21:28:41.254921633 +0100 +@@ -14,7 +14,7 @@ + + import unittest + +-import mock ++from unittest import mock + + + class Test_logger_name_from_path(unittest.TestCase): +--- google-cloud-logging-3.9.0/tests/unit/test__gapic.py 2023-12-11 20:25:38.000000000 +0100 ++++ google-cloud-logging-3.9.0/tests/unit/test__gapic.py 2023-12-17 21:28:41.254921633 +0100 +@@ -15,7 +15,7 @@ + import unittest + + import google.auth.credentials +-import mock ++from unittest import mock + + import google.cloud.logging + from google.cloud import logging_v2 +--- google-cloud-logging-3.9.0/tests/unit/test__helpers.py 2023-12-11 20:25:38.000000000 +0100 ++++ google-cloud-logging-3.9.0/tests/unit/test__helpers.py 2023-12-17 21:28:41.254921633 +0100 +@@ -19,7 +19,7 @@ + import logging + import unittest + +-import mock ++from unittest import mock + + + class Test_entry_from_resource(unittest.TestCase): +@@ -30,7 +30,7 @@ + return entry_from_resource(resource, client, loggers) + + def _payload_helper(self, key, class_name): +- import mock ++ from unittest import mock + + resource = {} + if key is not None: +--- google-cloud-logging-3.9.0/tests/unit/test__http.py 2023-12-11 20:25:38.000000000 +0100 ++++ google-cloud-logging-3.9.0/tests/unit/test__http.py 2023-12-17 21:28:41.254921633 +0100 +@@ -14,7 +14,7 @@ + + import unittest + +-import mock ++from unittest import mock + + + def _make_credentials(): +--- google-cloud-logging-3.9.0/tests/unit/test_logger.py 2023-12-11 20:25:38.000000000 +0100 ++++ google-cloud-logging-3.9.0/tests/unit/test_logger.py 2023-12-17 21:28:41.254921633 +0100 +@@ -17,7 +17,7 @@ + from copy import deepcopy + from datetime import datetime, timedelta, timezone + +-import mock ++from unittest import mock + import pytest + + +--- google-cloud-logging-3.9.0/tests/unit/handlers/transports/test_background_thread.py 2023-12-11 20:25:38.000000000 +0100 ++++ google-cloud-logging-3.9.0/tests/unit/handlers/transports/test_background_thread.py 2023-12-17 21:34:41.267663425 +0100 +@@ -17,7 +17,7 @@ + import queue + import unittest + +-import mock ++from unittest import mock + + + class TestBackgroundThreadHandler(unittest.TestCase): +--- google-cloud-logging-3.9.0/tests/unit/handlers/middleware/test_request.py 2023-12-11 20:25:38.000000000 +0100 ++++ google-cloud-logging-3.9.0/tests/unit/handlers/middleware/test_request.py 2023-12-17 21:35:57.065609190 +0100 +@@ -14,7 +14,7 @@ + + import unittest + +-import mock ++from unittest import mock + + + class DjangoBase(unittest.TestCase):