diff --git a/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml b/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml index 7ee33fd85053..5b0cbdac5797 100644 --- a/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml +++ b/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml @@ -131,6 +131,7 @@ replacements: count: 1 - paths: [ packages/google-cloud-speech/google/cloud/speech_v1/__init__.py, + packages/google-cloud-speech/google/cloud/speech_v1p1beta1/__init__.py, ] before: | \) @@ -140,24 +141,16 @@ replacements: ) from google.cloud.speech_v1.helpers import SpeechHelpers\n\n - class SpeechClient(SpeechHelpers, SpeechClient): - __doc__ = SpeechClient.__doc__\n\n - __all__ = ( - count: 1 - - paths: [ - packages/google-cloud-speech/google/cloud/speech_v1p1beta1/__init__.py, - ] - before: | - \)\n - __all__ = \( - after: | - )\n - from google.cloud.speech_v1.helpers import SpeechHelpers - \n - class SpeechClient(SpeechHelpers, SpeechClient): + # This class merges the auto-generated GAPIC client with handwritten helper methods. + # We ignore [misc] because mypy is flagging that both parent classes have a method + # named `streaming_recognize`, + # but their type signatures don't match. + # We ignore [no-redef] because of the name shadow with SpeechClient. We don't want + # to expose the GAPIC client without the helpers. + class SpeechClient(SpeechHelpers, SpeechClient): # type: ignore[no-redef, misc] __doc__ = SpeechClient.__doc__\n\n __all__ = ( - count: 1 + count: 2 - paths: [ packages/google-cloud-speech/google/cloud/speech/__init__.py, ] @@ -301,3 +294,14 @@ replacements: "pandas-stubs", ) count: 1 + - paths: [ + packages/google-cloud-monitoring/noxfile.py, + ] + before: | + "types-protobuf", + \ \) + after: | + "types-protobuf", + "pandas-stubs", + ) + count: 1 diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/_dataframe.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/_dataframe.py index d7d73c859f0e..15c0f1148f28 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/_dataframe.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/_dataframe.py @@ -19,7 +19,7 @@ try: import pandas except ImportError: # pragma: NO COVER - pandas = None + pandas = None # type: ignore[assignment] from google.cloud import monitoring_v3 diff --git a/packages/google-cloud-monitoring/noxfile.py b/packages/google-cloud-monitoring/noxfile.py index 8364b2c75d85..f1682f6c8d4b 100644 --- a/packages/google-cloud-monitoring/noxfile.py +++ b/packages/google-cloud-monitoring/noxfile.py @@ -101,6 +101,7 @@ def mypy(session): "mypy<1.16.0", "types-requests", "types-protobuf", + "pandas-stubs", ) session.install(".") session.run( diff --git a/packages/google-cloud-org-policy/google/cloud/orgpolicy/v1/__init__.py b/packages/google-cloud-org-policy/google/cloud/orgpolicy/v1/__init__.py index 8d4431ecf577..d96b91a2cf45 100644 --- a/packages/google-cloud-org-policy/google/cloud/orgpolicy/v1/__init__.py +++ b/packages/google-cloud-org-policy/google/cloud/orgpolicy/v1/__init__.py @@ -17,13 +17,15 @@ from __future__ import absolute_import +from typing import List + from google.api_core.protobuf_helpers import get_messages from google.cloud.orgpolicy.v1 import orgpolicy_pb2 _modules = [orgpolicy_pb2] -names = [] +names: List[str] = [] for module in _modules: for name, message in get_messages(module).items(): diff --git a/packages/google-cloud-speech/google/cloud/speech_v1/__init__.py b/packages/google-cloud-speech/google/cloud/speech_v1/__init__.py index bfcc3f05fb46..3c564fd1c822 100644 --- a/packages/google-cloud-speech/google/cloud/speech_v1/__init__.py +++ b/packages/google-cloud-speech/google/cloud/speech_v1/__init__.py @@ -169,7 +169,13 @@ def _get_version(dependency_name): from google.cloud.speech_v1.helpers import SpeechHelpers -class SpeechClient(SpeechHelpers, SpeechClient): +# This class merges the auto-generated GAPIC client with handwritten helper methods. +# We ignore [misc] because mypy is flagging that both parent classes have a method +# named `streaming_recognize`, +# but their type signatures don't match. +# We ignore [no-redef] because of the name shadow with SpeechClient. We don't want +# to expose the GAPIC client without the helpers. +class SpeechClient(SpeechHelpers, SpeechClient): # type: ignore[no-redef, misc] __doc__ = SpeechClient.__doc__ diff --git a/packages/google-cloud-speech/google/cloud/speech_v1p1beta1/__init__.py b/packages/google-cloud-speech/google/cloud/speech_v1p1beta1/__init__.py index 5dc5d8aba240..9c13f52f4c66 100644 --- a/packages/google-cloud-speech/google/cloud/speech_v1p1beta1/__init__.py +++ b/packages/google-cloud-speech/google/cloud/speech_v1p1beta1/__init__.py @@ -169,7 +169,13 @@ def _get_version(dependency_name): from google.cloud.speech_v1.helpers import SpeechHelpers -class SpeechClient(SpeechHelpers, SpeechClient): +# This class merges the auto-generated GAPIC client with handwritten helper methods. +# We ignore [misc] because mypy is flagging that both parent classes have a method +# named `streaming_recognize`, +# but their type signatures don't match. +# We ignore [no-redef] because of the name shadow with SpeechClient. We don't want +# to expose the GAPIC client without the helpers. +class SpeechClient(SpeechHelpers, SpeechClient): # type: ignore[no-redef, misc] __doc__ = SpeechClient.__doc__ diff --git a/packages/google-cloud-vision/google/cloud/vision_helpers/__init__.py b/packages/google-cloud-vision/google/cloud/vision_helpers/__init__.py index fbcbd209bc74..039b43416477 100644 --- a/packages/google-cloud-vision/google/cloud/vision_helpers/__init__.py +++ b/packages/google-cloud-vision/google/cloud/vision_helpers/__init__.py @@ -15,7 +15,7 @@ from __future__ import absolute_import from google.api_core import protobuf_helpers as protobuf -import proto +import proto # type: ignore class VisionHelpers(object):