diff --git a/monitoring/google/cloud/monitoring_v3/__init__.py b/monitoring/google/cloud/monitoring_v3/__init__.py index 00cdaaf7aed6..946324414d44 100644 --- a/monitoring/google/cloud/monitoring_v3/__init__.py +++ b/monitoring/google/cloud/monitoring_v3/__init__.py @@ -19,7 +19,8 @@ from google.cloud.monitoring_v3.gapic import enums from google.cloud.monitoring_v3.gapic import group_service_client from google.cloud.monitoring_v3.gapic import metric_service_client -from google.cloud.monitoring_v3.gapic import notification_channel_service_client +from google.cloud.monitoring_v3.gapic import \ + notification_channel_service_client from google.cloud.monitoring_v3.gapic import uptime_check_service_client @@ -41,7 +42,8 @@ class MetricServiceClient(metric_service_client.MetricServiceClient): class NotificationChannelServiceClient( notification_channel_service_client.NotificationChannelServiceClient): - __doc__ = notification_channel_service_client.NotificationChannelServiceClient.__doc__ + __doc__ = notification_channel_service_client.\ + NotificationChannelServiceClient.__doc__ enums = enums diff --git a/monitoring/google/cloud/monitoring_v3/_dataframe.py b/monitoring/google/cloud/monitoring_v3/_dataframe.py index f2624853c21e..24708249e562 100644 --- a/monitoring/google/cloud/monitoring_v3/_dataframe.py +++ b/monitoring/google/cloud/monitoring_v3/_dataframe.py @@ -17,7 +17,7 @@ import itertools try: import pandas -except ImportError: +except ImportError: # pragma: NO COVER pandas = None from google.cloud.monitoring_v3.types import TimeSeries diff --git a/monitoring/google/cloud/monitoring_v3/proto/common_pb2.py b/monitoring/google/cloud/monitoring_v3/proto/common_pb2.py index c1dfba6392c7..40805bc689b2 100644 --- a/monitoring/google/cloud/monitoring_v3/proto/common_pb2.py +++ b/monitoring/google/cloud/monitoring_v3/proto/common_pb2.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/cloud/monitoring_v3/proto/common.proto diff --git a/monitoring/tests/unit/test__dataframe.py b/monitoring/tests/unit/test__dataframe.py index 553a3a6afc8e..e4efb46adce7 100644 --- a/monitoring/tests/unit/test__dataframe.py +++ b/monitoring/tests/unit/test__dataframe.py @@ -104,7 +104,9 @@ def test_simple_label(self): self.assertEqual(dataframe.shape, DIMENSIONS) self.assertEqual(dataframe.values.tolist(), ARRAY) - self.assertEqual(list(dataframe.columns), INSTANCE_NAMES) + expected_headers = [(instance_name,) + for instance_name in INSTANCE_NAMES] + self.assertEqual(list(dataframe.columns), expected_headers) self.assertIsNone(dataframe.columns.name) self.assertEqual(list(dataframe.index), parse_timestamps()) @@ -138,9 +140,10 @@ def test_multiple_labels_with_just_one(self): self.assertEqual(dataframe.shape, DIMENSIONS) self.assertEqual(dataframe.values.tolist(), ARRAY) - self.assertEqual(list(dataframe.columns), INSTANCE_IDS) + expected_headers = [(instance_id,) for instance_id in INSTANCE_IDS] + self.assertEqual(list(dataframe.columns), expected_headers) self.assertEqual(dataframe.columns.names, NAMES) - self.assertEqual(dataframe.columns.name, NAME) + self.assertIsNone(dataframe.columns.name) self.assertEqual(list(dataframe.index), parse_timestamps()) self.assertIsNone(dataframe.index.name) @@ -189,7 +192,7 @@ def test_empty_table_multiple_labels_with_just_one(self): dataframe = self._call_fut([], labels=NAMES) self.assertEqual(dataframe.shape, (0, 0)) self.assertEqual(dataframe.columns.names, NAMES) - self.assertEqual(dataframe.columns.name, NAME) + self.assertIsNone(dataframe.columns.name) self.assertIsNone(dataframe.index.name) self.assertIsInstance(dataframe.index, pandas.DatetimeIndex) @@ -199,7 +202,7 @@ def test_empty_table_smart_labels(self): dataframe = self._call_fut([]) self.assertEqual(dataframe.shape, (0, 0)) self.assertEqual(dataframe.columns.names, NAMES) - self.assertEqual(dataframe.columns.name, NAME) + self.assertIsNone(dataframe.columns.name) self.assertIsNone(dataframe.index.name) self.assertIsInstance(dataframe.index, pandas.DatetimeIndex) diff --git a/monitoring/tests/unit/test_query.py b/monitoring/tests/unit/test_query.py index 224adae9e416..6feb24d5db5e 100644 --- a/monitoring/tests/unit/test_query.py +++ b/monitoring/tests/unit/test_query.py @@ -14,7 +14,6 @@ from __future__ import absolute_import -import copy import datetime import unittest import mock @@ -297,7 +296,6 @@ def test_request_parameters_maximal(self): FIELD1, FIELD2 = 'resource.zone', 'metric.instance_name' PAGE_SIZE = 100 - PAGE_TOKEN = 'second-page-please' channel = ChannelStub() client = MetricServiceClient(channel=channel)