From 0d79df4d4a0865903e1c5e7c08a74cd7e65cde1f Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Thu, 6 Apr 2017 11:45:30 -0700 Subject: [PATCH 1/2] Cut release 1.0.0 of logging package. --- error_reporting/setup.py | 4 ++-- logging/setup.py | 2 +- setup.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/error_reporting/setup.py b/error_reporting/setup.py index 1c9f55f720db..8c25c9308a07 100644 --- a/error_reporting/setup.py +++ b/error_reporting/setup.py @@ -52,13 +52,13 @@ REQUIREMENTS = [ 'google-cloud-core >= 0.24.0, < 0.25dev', - 'google-cloud-logging >= 0.24.0, < 0.25dev', + 'google-cloud-logging >= 1.0.0, < 2.0dev', 'gapic-google-cloud-error-reporting-v1beta1 >= 0.15.0, < 0.16dev' ] setup( name='google-cloud-error-reporting', - version='0.24.0', + version='0.24.1', description='Python Client for Stackdriver Error Reporting', long_description=README, namespace_packages=[ diff --git a/logging/setup.py b/logging/setup.py index e7b4b3b6beba..a2656e744a91 100644 --- a/logging/setup.py +++ b/logging/setup.py @@ -58,7 +58,7 @@ setup( name='google-cloud-logging', - version='0.24.0', + version='1.0.0', description='Python Client for Stackdriver Logging', long_description=README, namespace_packages=[ diff --git a/setup.py b/setup.py index a5f86fc890d1..41f085045021 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,7 @@ 'google-cloud-dns >= 0.24.0, < 0.25dev', 'google-cloud-error-reporting >= 0.24.0, < 0.25dev', 'google-cloud-language >= 0.24.0, < 0.25dev', - 'google-cloud-logging >= 0.24.0, < 0.25dev', + 'google-cloud-logging >= 1.0.0, < 2.0dev', 'google-cloud-monitoring >= 0.24.0, < 0.25dev', 'google-cloud-pubsub >= 0.24.0, < 0.25dev', 'google-cloud-resource-manager >= 0.24.0, < 0.25dev', @@ -71,7 +71,7 @@ setup( name='google-cloud', - version='0.24.0', + version='0.24.1', description='API Client library for Google Cloud', long_description=README, install_requires=REQUIREMENTS, From 1fbfb322a604571d574928e908ca783f0d93bc21 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Thu, 6 Apr 2017 13:37:03 -0700 Subject: [PATCH 2/2] Windows unit test fix: logging Any comparison. --- logging/tests/unit/test__gax.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/logging/tests/unit/test__gax.py b/logging/tests/unit/test__gax.py index 57041097efac..f1b98696dc9e 100644 --- a/logging/tests/unit/test__gax.py +++ b/logging/tests/unit/test__gax.py @@ -1151,11 +1151,12 @@ def test_unregistered_type(self): entry_pb = LogEntry(proto_payload=any_pb, timestamp=timestamp) result = self._call_fut(entry_pb) - expected = { - 'protoPayload': any_pb, - 'timestamp': '1970-01-01T00:01:01.001234Z', - } - self.assertEqual(result, expected) + self.assertEqual(len(result), 2) + self.assertEqual(result['timestamp'], '1970-01-01T00:01:01.001234Z') + # NOTE: This "hack" is needed on Windows, where the equality check + # for an ``Any`` instance fails on unregistered types. + self.assertEqual(result['protoPayload'].type_url, type_url) + self.assertEqual(result['protoPayload'].value, metadata_bytes) def test_registered_type(self): from google.cloud.proto.logging.v2.log_entry_pb2 import LogEntry