fix(deps): require google-api-core >= 1.31.5, >= 2.3.2 on v1 release (#500)

* chore(deps): allow google-api-core v2 on v1 release

* chore: also update google-cloud-core

* chore: run blacken

* ci: fix tests

* docs(samples): resolve TypeError in create_topic/delete_topic

Co-authored-by: Anthonios Partheniou <[email protected]>

Author: busunkim96

docs/conf.py

@@ -65,9 +65,9 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"google-cloud-logging"
-copyright = u"2019, Google"
-author = u"Google APIs"
+project = "google-cloud-logging"
+copyright = "2019, Google"
+author = "Google APIs"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -261,7 +261,7 @@
     (
         master_doc,
         "google-cloud-logging.tex",
-        u"google-cloud-logging Documentation",
+        "google-cloud-logging Documentation",
         author,
         "manual",
     )
@@ -296,7 +296,7 @@
     (
         master_doc,
         "google-cloud-logging",
-        u"google-cloud-logging Documentation",
+        "google-cloud-logging Documentation",
         [author],
         1,
     )
@@ -315,7 +315,7 @@
     (
         master_doc,
         "google-cloud-logging",
-        u"google-cloud-logging Documentation",
+        "google-cloud-logging Documentation",
         author,
         "google-cloud-logging",
         "google-cloud-logging Library",
@@ -340,7 +340,10 @@
 intersphinx_mapping = {
     "python": ("http://python.readthedocs.org/en/latest/", None),
     "google-auth": ("https://google-auth.readthedocs.io/en/stable", None),
-    "google.api_core": ("https://googleapis.dev/python/google-api-core/latest/", None,),
+    "google.api_core": (
+        "https://googleapis.dev/python/google-api-core/latest/",
+        None,
+    ),
     "grpc": ("https://grpc.io/grpc/python/", None),
 }
 

google/cloud/logging/entries.py

@@ -232,8 +232,7 @@ def from_api_repr(cls, resource, client, loggers=None):
         return inst
 
     def to_api_repr(self):
-        """API repr (JSON format) for entry.
-        """
+        """API repr (JSON format) for entry."""
         info = {}
         if self.log_name is not None:
             info["logName"] = self.log_name
@@ -285,8 +284,7 @@ def _extract_payload(cls, resource):
         return resource["textPayload"]
 
     def to_api_repr(self):
-        """API repr (JSON format) for entry.
-        """
+        """API repr (JSON format) for entry."""
         info = super(TextEntry, self).to_api_repr()
         info["textPayload"] = self.payload
         return info
@@ -313,8 +311,7 @@ def _extract_payload(cls, resource):
         return resource["jsonPayload"]
 
     def to_api_repr(self):
-        """API repr (JSON format) for entry.
-        """
+        """API repr (JSON format) for entry."""
         info = super(StructEntry, self).to_api_repr()
         info["jsonPayload"] = self.payload
         return info
@@ -351,8 +348,7 @@ def payload_json(self):
             return self.payload
 
     def to_api_repr(self):
-        """API repr (JSON format) for entry.
-        """
+        """API repr (JSON format) for entry."""
         info = super(ProtobufEntry, self).to_api_repr()
         info["protoPayload"] = MessageToDict(self.payload)
         return info

google/cloud/logging/handlers/_helpers.py

@@ -41,8 +41,8 @@
 def format_stackdriver_json(record, message):
     """Helper to format a LogRecord in in Stackdriver fluentd format.
 
-        :rtype: str
-        :returns: JSON str to be written to the log file.
+    :rtype: str
+    :returns: JSON str to be written to the log file.
     """
     subsecond, second = math.modf(record.created)
 

google/cloud/logging/logger.py

@@ -114,8 +114,7 @@ def batch(self, client=None):
         return Batch(self, client)
 
     def _do_log(self, client, _entry_class, payload=None, **kw):
-        """Helper for :meth:`log_empty`, :meth:`log_text`, etc.
-        """
+        """Helper for :meth:`log_empty`, :meth:`log_text`, etc."""
         client = self._require_client(client)
 
         # Apply defaults

google/cloud/logging_v2/gapic/config_service_v2_client.py

@@ -40,7 +40,9 @@
 from google.protobuf import field_mask_pb2
 
 
-_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution("google-cloud-logging",).version
+_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution(
+    "google-cloud-logging",
+).version
 
 
 class ConfigServiceV2Client(object):
@@ -77,7 +79,8 @@ def from_service_account_file(cls, filename, *args, **kwargs):
     def billing_path(cls, billing_account):
         """Return a fully-qualified billing string."""
         return google.api_core.path_template.expand(
-            "billingAccounts/{billing_account}", billing_account=billing_account,
+            "billingAccounts/{billing_account}",
+            billing_account=billing_account,
         )
 
     @classmethod
@@ -110,7 +113,10 @@ def exclusion_path(cls, project, exclusion):
     @classmethod
     def folder_path(cls, folder):
         """Return a fully-qualified folder string."""
-        return google.api_core.path_template.expand("folders/{folder}", folder=folder,)
+        return google.api_core.path_template.expand(
+            "folders/{folder}",
+            folder=folder,
+        )
 
     @classmethod
     def folder_exclusion_path(cls, folder, exclusion):
@@ -125,14 +131,17 @@ def folder_exclusion_path(cls, folder, exclusion):
     def folder_sink_path(cls, folder, sink):
         """Return a fully-qualified folder_sink string."""
         return google.api_core.path_template.expand(
-            "folders/{folder}/sinks/{sink}", folder=folder, sink=sink,
+            "folders/{folder}/sinks/{sink}",
+            folder=folder,
+            sink=sink,
         )
 
     @classmethod
     def organization_path(cls, organization):
         """Return a fully-qualified organization string."""
         return google.api_core.path_template.expand(
-            "organizations/{organization}", organization=organization,
+            "organizations/{organization}",
+            organization=organization,
         )
 
     @classmethod
@@ -157,14 +166,17 @@ def organization_sink_path(cls, organization, sink):
     def project_path(cls, project):
         """Return a fully-qualified project string."""
         return google.api_core.path_template.expand(
-            "projects/{project}", project=project,
+            "projects/{project}",
+            project=project,
         )
 
     @classmethod
     def sink_path(cls, project, sink):
         """Return a fully-qualified sink string."""
         return google.api_core.path_template.expand(
-            "projects/{project}/sinks/{sink}", project=project, sink=sink,
+            "projects/{project}/sinks/{sink}",
+            project=project,
+            sink=sink,
         )
 
     def __init__(
@@ -253,8 +265,12 @@ def __init__(
                     )
                 self.transport = transport
         else:
-            self.transport = config_service_v2_grpc_transport.ConfigServiceV2GrpcTransport(
-                address=api_endpoint, channel=channel, credentials=credentials,
+            self.transport = (
+                config_service_v2_grpc_transport.ConfigServiceV2GrpcTransport(
+                    address=api_endpoint,
+                    channel=channel,
+                    credentials=credentials,
+                )
             )
 
         if client_info is None:
@@ -360,7 +376,8 @@ def list_sinks(
             )
 
         request = logging_config_pb2.ListSinksRequest(
-            parent=parent, page_size=page_size,
+            parent=parent,
+            page_size=page_size,
         )
         if metadata is None:
             metadata = []
@@ -450,7 +467,9 @@ def get_sink(
                 client_info=self._client_info,
             )
 
-        request = logging_config_pb2.GetSinkRequest(sink_name=sink_name,)
+        request = logging_config_pb2.GetSinkRequest(
+            sink_name=sink_name,
+        )
         if metadata is None:
             metadata = []
         metadata = list(metadata)
@@ -554,7 +573,9 @@ def create_sink(
             )
 
         request = logging_config_pb2.CreateSinkRequest(
-            parent=parent, sink=sink, unique_writer_identity=unique_writer_identity,
+            parent=parent,
+            sink=sink,
+            unique_writer_identity=unique_writer_identity,
         )
         if metadata is None:
             metadata = []
@@ -759,7 +780,9 @@ def delete_sink(
                 client_info=self._client_info,
             )
 
-        request = logging_config_pb2.DeleteSinkRequest(sink_name=sink_name,)
+        request = logging_config_pb2.DeleteSinkRequest(
+            sink_name=sink_name,
+        )
         if metadata is None:
             metadata = []
         metadata = list(metadata)
@@ -857,7 +880,8 @@ def list_exclusions(
             )
 
         request = logging_config_pb2.ListExclusionsRequest(
-            parent=parent, page_size=page_size,
+            parent=parent,
+            page_size=page_size,
         )
         if metadata is None:
             metadata = []
@@ -947,7 +971,9 @@ def get_exclusion(
                 client_info=self._client_info,
             )
 
-        request = logging_config_pb2.GetExclusionRequest(name=name,)
+        request = logging_config_pb2.GetExclusionRequest(
+            name=name,
+        )
         if metadata is None:
             metadata = []
         metadata = list(metadata)
@@ -1038,7 +1064,8 @@ def create_exclusion(
             )
 
         request = logging_config_pb2.CreateExclusionRequest(
-            parent=parent, exclusion=exclusion,
+            parent=parent,
+            exclusion=exclusion,
         )
         if metadata is None:
             metadata = []
@@ -1142,7 +1169,9 @@ def update_exclusion(
             )
 
         request = logging_config_pb2.UpdateExclusionRequest(
-            name=name, exclusion=exclusion, update_mask=update_mask,
+            name=name,
+            exclusion=exclusion,
+            update_mask=update_mask,
         )
         if metadata is None:
             metadata = []
@@ -1218,7 +1247,9 @@ def delete_exclusion(
                 client_info=self._client_info,
             )
 
-        request = logging_config_pb2.DeleteExclusionRequest(name=name,)
+        request = logging_config_pb2.DeleteExclusionRequest(
+            name=name,
+        )
         if metadata is None:
             metadata = []
         metadata = list(metadata)
@@ -1306,7 +1337,9 @@ def get_cmek_settings(
                 client_info=self._client_info,
             )
 
-        request = logging_config_pb2.GetCmekSettingsRequest(name=name,)
+        request = logging_config_pb2.GetCmekSettingsRequest(
+            name=name,
+        )
         if metadata is None:
             metadata = []
         metadata = list(metadata)
@@ -1422,7 +1455,9 @@ def update_cmek_settings(
             )
 
         request = logging_config_pb2.UpdateCmekSettingsRequest(
-            name=name, cmek_settings=cmek_settings, update_mask=update_mask,
+            name=name,
+            cmek_settings=cmek_settings,
+            update_mask=update_mask,
         )
         if metadata is None:
             metadata = []