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

* chore(deps): allow google-api-core v2 on v1 release * ci: fix docs build * lint * chore: use newer black * chore: fix formatting in noxfile Co-authored-by: Anthonios Partheniou <partheniou@google.com>

Author: busunkim96

.gitignore

@@ -29,6 +29,7 @@ pip-log.txt
 .nox
 .cache
 .pytest_cache
+*_sponge_log.xml
 
 
 # Mac

docs/conf.py

@@ -66,9 +66,9 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"google-cloud-dataproc"
-copyright = u"2019, Google"
-author = u"Google APIs"
+project = "google-cloud-dataproc"
+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
@@ -267,7 +267,7 @@
  (
  master_doc,
  "google-cloud-dataproc.tex",
- u"google-cloud-dataproc Documentation",
+ "google-cloud-dataproc Documentation",
  author,
  "manual",
  )
@@ -302,7 +302,7 @@
  (
  master_doc,
  "google-cloud-dataproc",
- u"google-cloud-dataproc Documentation",
+ "google-cloud-dataproc Documentation",
  [author],
  1,
  )
@@ -321,7 +321,7 @@
  (
  master_doc,
  "google-cloud-dataproc",
- u"google-cloud-dataproc Documentation",
+ "google-cloud-dataproc Documentation",
  author,
  "google-cloud-dataproc",
  "google-cloud-dataproc Library",
@@ -346,7 +346,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/dataproc_v1/gapic/autoscaling_policy_service_client.py

@@ -102,7 +102,9 @@ def location_path(cls, project, location):
  def region_path(cls, project, region):
  """Return a fully-qualified region string."""
  return google.api_core.path_template.expand(
- "projects/{project}/regions/{region}", project=project, region=region,
+ "projects/{project}/regions/{region}",
+ project=project,
+ region=region,
  )
 
  def __init__(
@@ -192,7 +194,9 @@ def __init__(
  self.transport = transport
  else:
  self.transport = autoscaling_policy_service_grpc_transport.AutoscalingPolicyServiceGrpcTransport(
- address=api_endpoint, channel=channel, credentials=credentials,
+ address=api_endpoint,
+ channel=channel,
+ credentials=credentials,
  )
 
  if client_info is None:
@@ -287,7 +291,8 @@ def create_autoscaling_policy(
  )
 
  request = autoscaling_policies_pb2.CreateAutoscalingPolicyRequest(
- parent=parent, policy=policy,
+ parent=parent,
+ policy=policy,
  )
  if metadata is None:
  metadata = []
@@ -445,7 +450,9 @@ def get_autoscaling_policy(
  client_info=self._client_info,
  )
 
- request = autoscaling_policies_pb2.GetAutoscalingPolicyRequest(name=name,)
+ request = autoscaling_policies_pb2.GetAutoscalingPolicyRequest(
+ name=name,
+ )
  if metadata is None:
  metadata = []
  metadata = list(metadata)
@@ -545,7 +552,8 @@ def list_autoscaling_policies(
  )
 
  request = autoscaling_policies_pb2.ListAutoscalingPoliciesRequest(
- parent=parent, page_size=page_size,
+ parent=parent,
+ page_size=page_size,
  )
  if metadata is None:
  metadata = []
@@ -634,7 +642,9 @@ def delete_autoscaling_policy(
  client_info=self._client_info,
  )
 
- request = autoscaling_policies_pb2.DeleteAutoscalingPolicyRequest(name=name,)
+ request = autoscaling_policies_pb2.DeleteAutoscalingPolicyRequest(
+ name=name,
+ )
  if metadata is None:
  metadata = []
  metadata = list(metadata)

google/cloud/dataproc_v1/gapic/cluster_controller_client.py

@@ -169,8 +169,12 @@ def __init__(
  )
  self.transport = transport
  else:
- self.transport = cluster_controller_grpc_transport.ClusterControllerGrpcTransport(
- address=api_endpoint, channel=channel, credentials=credentials,
+ self.transport = (
+ cluster_controller_grpc_transport.ClusterControllerGrpcTransport(
+ address=api_endpoint,
+ channel=channel,
+ credentials=credentials,
+ )
  )
 
  if client_info is None:
@@ -677,7 +681,9 @@ def diagnose_cluster(
  )
 
  request = clusters_pb2.DiagnoseClusterRequest(
- project_id=project_id, region=region, cluster_name=cluster_name,
+ project_id=project_id,
+ region=region,
+ cluster_name=cluster_name,
  )
  operation = self._inner_api_calls["diagnose_cluster"](
  request, retry=retry, timeout=timeout, metadata=metadata
@@ -753,7 +759,9 @@ def get_cluster(
  )
 
  request = clusters_pb2.GetClusterRequest(
- project_id=project_id, region=region, cluster_name=cluster_name,
+ project_id=project_id,
+ region=region,
+ cluster_name=cluster_name,
  )
  return self._inner_api_calls["get_cluster"](
  request, retry=retry, timeout=timeout, metadata=metadata
@@ -860,7 +868,10 @@ def list_clusters(
  )
 
  request = clusters_pb2.ListClustersRequest(
- project_id=project_id, region=region, filter=filter_, page_size=page_size,
+ project_id=project_id,
+ region=region,
+ filter=filter_,
+ page_size=page_size,
  )
  iterator = google.api_core.page_iterator.GRPCIterator(
  client=None,

google/cloud/dataproc_v1/gapic/job_controller_client.py

@@ -169,7 +169,9 @@ def __init__(
  self.transport = transport
  else:
  self.transport = job_controller_grpc_transport.JobControllerGrpcTransport(
- address=api_endpoint, channel=channel, credentials=credentials,
+ address=api_endpoint,
+ channel=channel,
+ credentials=credentials,
  )
 
  if client_info is None:
@@ -273,7 +275,10 @@ def submit_job(
  )
 
  request = jobs_pb2.SubmitJobRequest(
- project_id=project_id, region=region, job=job, request_id=request_id,
+ project_id=project_id,
+ region=region,
+ job=job,
+ request_id=request_id,
  )
  return self._inner_api_calls["submit_job"](
  request, retry=retry, timeout=timeout, metadata=metadata
@@ -366,7 +371,10 @@ def submit_job_as_operation(
  )
 
  request = jobs_pb2.SubmitJobRequest(
- project_id=project_id, region=region, job=job, request_id=request_id,
+ project_id=project_id,
+ region=region,
+ job=job,
+ request_id=request_id,
  )
  operation = self._inner_api_calls["submit_job_as_operation"](
  request, retry=retry, timeout=timeout, metadata=metadata
@@ -442,7 +450,9 @@ def get_job(
  )
 
  request = jobs_pb2.GetJobRequest(
- project_id=project_id, region=region, job_id=job_id,
+ project_id=project_id,
+ region=region,
+ job_id=job_id,
  )
  return self._inner_api_calls["get_job"](
  request, retry=retry, timeout=timeout, metadata=metadata
@@ -735,7 +745,9 @@ def cancel_job(
  )
 
  request = jobs_pb2.CancelJobRequest(
- project_id=project_id, region=region, job_id=job_id,
+ project_id=project_id,
+ region=region,
+ job_id=job_id,
  )
  return self._inner_api_calls["cancel_job"](
  request, retry=retry, timeout=timeout, metadata=metadata
@@ -803,7 +815,9 @@ def delete_job(
  )
 
  request = jobs_pb2.DeleteJobRequest(
- project_id=project_id, region=region, job_id=job_id,
+ project_id=project_id,
+ region=region,
+ job_id=job_id,
  )
  self._inner_api_calls["delete_job"](
  request, retry=retry, timeout=timeout, metadata=metadata

google/cloud/dataproc_v1/gapic/workflow_template_service_client.py

@@ -104,7 +104,9 @@ def location_path(cls, project, location):
  def region_path(cls, project, region):
  """Return a fully-qualified region string."""
  return google.api_core.path_template.expand(
- "projects/{project}/regions/{region}", project=project, region=region,
+ "projects/{project}/regions/{region}",
+ project=project,
+ region=region,
  )
 
  @classmethod
@@ -204,7 +206,9 @@ def __init__(
  self.transport = transport
  else:
  self.transport = workflow_template_service_grpc_transport.WorkflowTemplateServiceGrpcTransport(
- address=api_endpoint, channel=channel, credentials=credentials,
+ address=api_endpoint,
+ channel=channel,
+ credentials=credentials,
  )
 
  if client_info is None:
@@ -338,7 +342,10 @@ def instantiate_workflow_template(
  )
 
  request = workflow_templates_pb2.InstantiateWorkflowTemplateRequest(
- name=name, version=version, request_id=request_id, parameters=parameters,
+ name=name,
+ version=version,
+ request_id=request_id,
+ parameters=parameters,
  )
  if metadata is None:
  metadata = []
@@ -474,7 +481,9 @@ def instantiate_inline_workflow_template(
  )
 
  request = workflow_templates_pb2.InstantiateInlineWorkflowTemplateRequest(
- parent=parent, template=template, request_id=request_id,
+ parent=parent,
+ template=template,
+ request_id=request_id,
  )
  if metadata is None:
  metadata = []
@@ -568,7 +577,8 @@ def create_workflow_template(
  )
 
  request = workflow_templates_pb2.CreateWorkflowTemplateRequest(
- parent=parent, template=template,
+ parent=parent,
+ template=template,
  )
  if metadata is None:
  metadata = []
@@ -657,7 +667,8 @@ def get_workflow_template(
  )
 
  request = workflow_templates_pb2.GetWorkflowTemplateRequest(
- name=name, version=version,
+ name=name,
+ version=version,
  )
  if metadata is None:
  metadata = []
@@ -836,7 +847,8 @@ def list_workflow_templates(
  )
 
  request = workflow_templates_pb2.ListWorkflowTemplatesRequest(
- parent=parent, page_size=page_size,
+ parent=parent,
+ page_size=page_size,
  )
  if metadata is None:
  metadata = []
@@ -929,7 +941,8 @@ def delete_workflow_template(
  )
 
  request = workflow_templates_pb2.DeleteWorkflowTemplateRequest(
- name=name, version=version,
+ name=name,
+ version=version,
  )
  if metadata is None:
  metadata = []

google/cloud/dataproc_v1/proto/autoscaling_policies_pb2_grpc.py

@@ -52,8 +52,7 @@ class AutoscalingPolicyServiceServicer(object):
  """
 
  def CreateAutoscalingPolicy(self, request, context):
- """Creates new autoscaling policy.
- """
+ """Creates new autoscaling policy."""
  context.set_code(grpc.StatusCode.UNIMPLEMENTED)
  context.set_details("Method not implemented!")
  raise NotImplementedError("Method not implemented!")
@@ -69,15 +68,13 @@ def UpdateAutoscalingPolicy(self, request, context):
  raise NotImplementedError("Method not implemented!")
 
  def GetAutoscalingPolicy(self, request, context):
- """Retrieves autoscaling policy.
- """
+ """Retrieves autoscaling policy."""
  context.set_code(grpc.StatusCode.UNIMPLEMENTED)
  context.set_details("Method not implemented!")
  raise NotImplementedError("Method not implemented!")
 
  def ListAutoscalingPolicies(self, request, context):
- """Lists autoscaling policies in the project.
- """
+ """Lists autoscaling policies in the project."""
  context.set_code(grpc.StatusCode.UNIMPLEMENTED)
  context.set_details("Method not implemented!")
  raise NotImplementedError("Method not implemented!")