diff --git a/dataproc/docs/conf.py b/dataproc/docs/conf.py index db716f4190c9..29deb60276bb 100644 --- a/dataproc/docs/conf.py +++ b/dataproc/docs/conf.py @@ -54,6 +54,7 @@ # The suffix(es) of source filenames. # You can specify multiple suffix as a list of string: +# source_suffix = ['.rst', '.md'] source_suffix = [".rst", ".md"] # The encoding of source files. @@ -130,10 +131,10 @@ # further. For a list of options available for each theme, see the # documentation. html_theme_options = { - #'description': 'Google Cloud Client Libraries for Python', - #'github_user': 'GoogleCloudPlatform', - #'github_repo': 'google-cloud-python', - #'github_banner': True, + "description": "Google Cloud Client Libraries for Python", + "github_user": "googleapis", + "github_repo": "google-cloud-python", + "github_banner": True, "font_family": "'Roboto', Georgia, sans", "head_font_family": "'Roboto', Georgia, serif", "code_font_family": "'Roboto Mono', 'Consolas', monospace", @@ -226,18 +227,17 @@ # Output file base name for HTML help builder. htmlhelp_basename = "google-cloud-dataproc-doc" - # -- Options for warnings ------------------------------------------------------ - suppress_warnings = [ - # Temporarily suppress ths to avoid "more than one target found for + # Temporarily suppress this to avoid "more than one target found for # cross-reference" warning, which are intractable for us to avoid while in # a mono-repo. # See https://github.com/sphinx-doc/sphinx/blob # /2a65ffeef5c107c19084fabdd706cdff3f52d93c/sphinx/domains/python.py#L843 "ref.python" ] + # -- Options for LaTeX output --------------------------------------------- latex_elements = { @@ -330,15 +330,20 @@ # If true, do not generate a @detailmenu in the "Top" node's menu. # texinfo_no_detailmenu = False -# Configuration for intersphinx: +# Example configuration for intersphinx: refer to the Python standard library. intersphinx_mapping = { + "python": ("http://python.readthedocs.org/en/latest/", None), + "gax": ("https://gax-python.readthedocs.org/en/latest/", None), "google-auth": ("https://google-auth.readthedocs.io/en/stable", None), "google-gax": ("https://gax-python.readthedocs.io/en/latest/", None), + "google.api_core": ( + "https://googleapis.github.io/google-cloud-python/latest", + None, + ), "grpc": ("https://grpc.io/grpc/python/", None), "requests": ("http://docs.python-requests.org/en/master/", None), "fastavro": ("https://fastavro.readthedocs.io/en/stable/", None), "pandas": ("https://pandas.pydata.org/pandas-docs/stable/", None), - "python": ("https://docs.python.org/3", None), } # Napoleon settings diff --git a/dataproc/google/cloud/dataproc_v1/gapic/cluster_controller_client.py b/dataproc/google/cloud/dataproc_v1/gapic/cluster_controller_client.py index 6fde7abbcea6..a72f3d12ec12 100644 --- a/dataproc/google/cloud/dataproc_v1/gapic/cluster_controller_client.py +++ b/dataproc/google/cloud/dataproc_v1/gapic/cluster_controller_client.py @@ -366,131 +366,26 @@ def update_cluster( .. raw:: html - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - -
- - Mask - - .. raw:: html - - - - Purpose - - .. raw:: html - -
- - labels - - .. raw:: html - - - - Update labels - - .. raw:: html - -
- - config.worker\_config.num\_instances - - .. raw:: html - - - - Resize primary worker group - - .. raw:: html - -
- - config.secondary\_worker\_config.num\_instances - - .. raw:: html - - - - Resize secondary worker group - - .. raw:: html - -
+ + + + + + + + + + + + + + + + + + + +
MaskPurpose
labelsUpdate labels
config.worker_config.num_instancesResize primary worker group
config.secondary_worker_config.num_instancesResize secondary worker group
If a dict is provided, it must be of the same form as the protobuf message :class:`~google.cloud.dataproc_v1.types.FieldMask` diff --git a/dataproc/google/cloud/dataproc_v1/gapic/workflow_template_service_client.py b/dataproc/google/cloud/dataproc_v1/gapic/workflow_template_service_client.py index 90882236e0f7..7ae4cc0a4f13 100644 --- a/dataproc/google/cloud/dataproc_v1/gapic/workflow_template_service_client.py +++ b/dataproc/google/cloud/dataproc_v1/gapic/workflow_template_service_client.py @@ -23,6 +23,7 @@ import google.api_core.gapic_v1.client_info import google.api_core.gapic_v1.config import google.api_core.gapic_v1.method +import google.api_core.gapic_v1.routing_header import google.api_core.grpc_helpers import google.api_core.operation import google.api_core.operations_v1 @@ -263,6 +264,19 @@ def create_workflow_template( request = workflow_templates_pb2.CreateWorkflowTemplateRequest( parent=parent, template=template ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("parent", parent)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["create_workflow_template"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -331,6 +345,19 @@ def get_workflow_template( request = workflow_templates_pb2.GetWorkflowTemplateRequest( name=name, version=version ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("name", name)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["get_workflow_template"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -434,6 +461,19 @@ def instantiate_workflow_template( request = workflow_templates_pb2.InstantiateWorkflowTemplateRequest( name=name, version=version, request_id=request_id, parameters=parameters ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("name", name)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + operation = self._inner_api_calls["instantiate_workflow_template"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -547,6 +587,19 @@ def instantiate_inline_workflow_template( request = workflow_templates_pb2.InstantiateInlineWorkflowTemplateRequest( parent=parent, template=template, request_id=request_id ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("parent", parent)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + operation = self._inner_api_calls["instantiate_inline_workflow_template"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -618,6 +671,19 @@ def update_workflow_template( request = workflow_templates_pb2.UpdateWorkflowTemplateRequest( template=template ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("template.name", template.name)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["update_workflow_template"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -699,6 +765,19 @@ def list_workflow_templates( request = workflow_templates_pb2.ListWorkflowTemplatesRequest( parent=parent, page_size=page_size ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("parent", parent)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + iterator = google.api_core.page_iterator.GRPCIterator( client=None, method=functools.partial( @@ -771,6 +850,19 @@ def delete_workflow_template( request = workflow_templates_pb2.DeleteWorkflowTemplateRequest( name=name, version=version ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("name", name)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + self._inner_api_calls["delete_workflow_template"]( request, retry=retry, timeout=timeout, metadata=metadata ) diff --git a/dataproc/google/cloud/dataproc_v1beta2/gapic/cluster_controller_client.py b/dataproc/google/cloud/dataproc_v1beta2/gapic/cluster_controller_client.py index ae8df76a4b2e..b031b60d9d02 100644 --- a/dataproc/google/cloud/dataproc_v1beta2/gapic/cluster_controller_client.py +++ b/dataproc/google/cloud/dataproc_v1beta2/gapic/cluster_controller_client.py @@ -368,207 +368,34 @@ def update_cluster( .. raw:: html - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - - - - .. raw:: html - -
- - Mask - - .. raw:: html - - - - Purpose - - .. raw:: html - -
- - labels - - .. raw:: html - - - - Updates labels - - .. raw:: html - -
- - config.worker\_config.num\_instances - - .. raw:: html - - - - Resize primary worker group - - .. raw:: html - -
- - config.secondary\_worker\_config.num\_instances - - .. raw:: html - - - - Resize secondary worker group - - .. raw:: html - -
- - config.lifecycle\_config.auto\_delete\_ttl - - .. raw:: html - - - - Reset MAX TTL duration - - .. raw:: html - -
- - config.lifecycle\_config.auto\_delete\_time - - .. raw:: html - - - - Update MAX TTL deletion timestamp - - .. raw:: html - -
- - config.lifecycle\_config.idle\_delete\_ttl - - .. raw:: html - - - - Update Idle TTL duration - - .. raw:: html - -
+ + + + + + + + + + + + + + + + + + + + + + +
MaskPurpose
labelsUpdates labels
config.worker_config.num_instancesResize primary worker + group
config.secondary_worker_config.num_instancesResize secondary + worker group
config.lifecycle_config.auto_delete_ttlReset MAX TTL + duration
config.lifecycle_config.auto_delete_timeUpdate MAX TTL + deletion timestamp
config.lifecycle_config.idle_delete_ttlUpdate Idle TTL + duration
If a dict is provided, it must be of the same form as the protobuf message :class:`~google.cloud.dataproc_v1beta2.types.FieldMask` diff --git a/dataproc/google/cloud/dataproc_v1beta2/gapic/workflow_template_service_client.py b/dataproc/google/cloud/dataproc_v1beta2/gapic/workflow_template_service_client.py index 378f9314450f..db1a0ac5a74b 100644 --- a/dataproc/google/cloud/dataproc_v1beta2/gapic/workflow_template_service_client.py +++ b/dataproc/google/cloud/dataproc_v1beta2/gapic/workflow_template_service_client.py @@ -23,6 +23,7 @@ import google.api_core.gapic_v1.client_info import google.api_core.gapic_v1.config import google.api_core.gapic_v1.method +import google.api_core.gapic_v1.routing_header import google.api_core.grpc_helpers import google.api_core.operation import google.api_core.operations_v1 @@ -263,6 +264,19 @@ def create_workflow_template( request = workflow_templates_pb2.CreateWorkflowTemplateRequest( parent=parent, template=template ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("parent", parent)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["create_workflow_template"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -331,6 +345,19 @@ def get_workflow_template( request = workflow_templates_pb2.GetWorkflowTemplateRequest( name=name, version=version ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("name", name)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["get_workflow_template"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -440,6 +467,19 @@ def instantiate_workflow_template( request_id=request_id, parameters=parameters, ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("name", name)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + operation = self._inner_api_calls["instantiate_workflow_template"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -558,6 +598,19 @@ def instantiate_inline_workflow_template( instance_id=instance_id, request_id=request_id, ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("parent", parent)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + operation = self._inner_api_calls["instantiate_inline_workflow_template"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -629,6 +682,19 @@ def update_workflow_template( request = workflow_templates_pb2.UpdateWorkflowTemplateRequest( template=template ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("template.name", template.name)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["update_workflow_template"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -710,6 +776,19 @@ def list_workflow_templates( request = workflow_templates_pb2.ListWorkflowTemplatesRequest( parent=parent, page_size=page_size ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("parent", parent)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + iterator = google.api_core.page_iterator.GRPCIterator( client=None, method=functools.partial( @@ -782,6 +861,19 @@ def delete_workflow_template( request = workflow_templates_pb2.DeleteWorkflowTemplateRequest( name=name, version=version ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("name", name)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + self._inner_api_calls["delete_workflow_template"]( request, retry=retry, timeout=timeout, metadata=metadata ) diff --git a/dataproc/noxfile.py b/dataproc/noxfile.py index 9fedd1bae939..0f528b7f3902 100644 --- a/dataproc/noxfile.py +++ b/dataproc/noxfile.py @@ -140,12 +140,12 @@ def cover(session): session.run("coverage", "erase") -@nox.session(python='3.6') +@nox.session(python="3.7") def docs(session): - """Build the docs.""" + """Build the docs for this library.""" - session.install('sphinx', 'alabaster', 'recommonmark') session.install('-e', '.') + session.install('sphinx', 'alabaster', 'recommonmark') shutil.rmtree(os.path.join('docs', '_build'), ignore_errors=True) session.run( diff --git a/dataproc/synth.metadata b/dataproc/synth.metadata index 60ff49f02006..4c741e6e2b3c 100644 --- a/dataproc/synth.metadata +++ b/dataproc/synth.metadata @@ -1,26 +1,26 @@ { - "updateTime": "2019-03-01T13:12:30.996129Z", + "updateTime": "2019-05-10T12:19:22.767746Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.14", - "dockerImage": "googleapis/artman@sha256:f3d61ae45abaeefb6be5f228cda22732c2f1b00fb687c79c4bd4f2c42bb1e1a7" + "version": "0.19.0", + "dockerImage": "googleapis/artman@sha256:d3df563538225ac6caac45d8ad86499500211d1bcb2536955a6dbda15e1b368e" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "41d72d444fbe445f4da89e13be02078734fb7875", - "internalRef": "236230004" + "sha": "07883be5bf3c3233095e99d8e92b8094f5d7084a", + "internalRef": "247530843" } }, { "template": { "name": "python_library", "origin": "synthtool.gcp", - "version": "2019.2.26" + "version": "2019.5.2" } } ],