Skip to content

Commit 51f9aa0

Browse files
authored
chore: librarian update image pull request: 20260213T152756Z (#727)
feat: update image to us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:a38add811f7f139d6a385b22d283ad09ef305b8cf50382ef62f0ce690787f021 Fixes b/483054727
1 parent 3ef1acf commit 51f9aa0

File tree

19 files changed

+113
-30
lines changed

19 files changed

+113
-30
lines changed

packages/google-cloud-error-reporting/.librarian/state.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:b8058df4c45e9a6e07f6b4d65b458d0d059241dd34c814f151c8bf6b89211209
1+
image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:a38add811f7f139d6a385b22d283ad09ef305b8cf50382ef62f0ce690787f021
22
libraries:
33
- id: google-cloud-error-reporting
44
version: 1.14.0

packages/google-cloud-error-reporting/docs/conf.py

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
15-
#
16-
#
15+
##
1716
# google-cloud-error-reporting documentation build configuration file
1817
#
1918
# This file is execfile()d with the current directory set to its
@@ -25,9 +24,12 @@
2524
# All configuration values have a default; values that are commented out
2625
# serve to show the default.
2726

28-
import sys
27+
import logging
2928
import os
3029
import shlex
30+
import sys
31+
import logging
32+
from typing import Any
3133

3234
# If extensions (or modules to document with autodoc) are in another directory,
3335
# add these directories to sys.path here. If the directory is relative to the
@@ -383,3 +385,34 @@
383385
napoleon_use_ivar = False
384386
napoleon_use_param = True
385387
napoleon_use_rtype = True
388+
389+
390+
# Setup for sphinx behaviors such as warning filters.
391+
class UnexpectedUnindentFilter(logging.Filter):
392+
"""Filter out warnings about unexpected unindentation following bullet lists."""
393+
394+
def filter(self, record: logging.LogRecord) -> bool:
395+
"""Filter the log record.
396+
397+
Args:
398+
record (logging.LogRecord): The log record.
399+
400+
Returns:
401+
bool: False to suppress the warning, True to allow it.
402+
"""
403+
msg = record.getMessage()
404+
if "Bullet list ends without a blank line" in msg:
405+
return False
406+
return True
407+
408+
409+
def setup(app: Any) -> None:
410+
"""Setup the Sphinx application.
411+
412+
Args:
413+
app (Any): The Sphinx application.
414+
"""
415+
# Sphinx's logger is hierarchical. Adding a filter to the
416+
# root 'sphinx' logger will catch warnings from all sub-loggers.
417+
logger = logging.getLogger("sphinx")
418+
logger.addFilter(UnexpectedUnindentFilter())

packages/google-cloud-error-reporting/google/cloud/errorreporting_v1beta1/services/error_group_service/async_client.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
115115
Returns:
116116
ErrorGroupServiceAsyncClient: The constructed client.
117117
"""
118-
return ErrorGroupServiceClient.from_service_account_info.__func__(ErrorGroupServiceAsyncClient, info, *args, **kwargs) # type: ignore
118+
sa_info_func = (
119+
ErrorGroupServiceClient.from_service_account_info.__func__ # type: ignore
120+
)
121+
return sa_info_func(ErrorGroupServiceAsyncClient, info, *args, **kwargs)
119122

120123
@classmethod
121124
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -131,7 +134,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
131134
Returns:
132135
ErrorGroupServiceAsyncClient: The constructed client.
133136
"""
134-
return ErrorGroupServiceClient.from_service_account_file.__func__(ErrorGroupServiceAsyncClient, filename, *args, **kwargs) # type: ignore
137+
sa_file_func = (
138+
ErrorGroupServiceClient.from_service_account_file.__func__ # type: ignore
139+
)
140+
return sa_file_func(ErrorGroupServiceAsyncClient, filename, *args, **kwargs)
135141

136142
from_service_account_json = from_service_account_file
137143

packages/google-cloud-error-reporting/google/cloud/errorreporting_v1beta1/services/error_group_service/transports/base.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ def __init__(
8484
be used for service account credentials.
8585
"""
8686

87-
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
88-
8987
# Save the scopes.
9088
self._scopes = scopes
9189
if not hasattr(self, "_ignore_credentials"):
@@ -100,11 +98,16 @@ def __init__(
10098

10199
if credentials_file is not None:
102100
credentials, _ = google.auth.load_credentials_from_file(
103-
credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
101+
credentials_file,
102+
scopes=scopes,
103+
quota_project_id=quota_project_id,
104+
default_scopes=self.AUTH_SCOPES,
104105
)
105106
elif credentials is None and not self._ignore_credentials:
106107
credentials, _ = google.auth.default(
107-
**scopes_kwargs, quota_project_id=quota_project_id
108+
scopes=scopes,
109+
quota_project_id=quota_project_id,
110+
default_scopes=self.AUTH_SCOPES,
108111
)
109112
# Don't apply audience if the credentials file passed from user.
110113
if hasattr(credentials, "with_gdch_audience"):

packages/google-cloud-error-reporting/google/cloud/errorreporting_v1beta1/services/error_stats_service/async_client.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
118118
Returns:
119119
ErrorStatsServiceAsyncClient: The constructed client.
120120
"""
121-
return ErrorStatsServiceClient.from_service_account_info.__func__(ErrorStatsServiceAsyncClient, info, *args, **kwargs) # type: ignore
121+
sa_info_func = (
122+
ErrorStatsServiceClient.from_service_account_info.__func__ # type: ignore
123+
)
124+
return sa_info_func(ErrorStatsServiceAsyncClient, info, *args, **kwargs)
122125

123126
@classmethod
124127
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -134,7 +137,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
134137
Returns:
135138
ErrorStatsServiceAsyncClient: The constructed client.
136139
"""
137-
return ErrorStatsServiceClient.from_service_account_file.__func__(ErrorStatsServiceAsyncClient, filename, *args, **kwargs) # type: ignore
140+
sa_file_func = (
141+
ErrorStatsServiceClient.from_service_account_file.__func__ # type: ignore
142+
)
143+
return sa_file_func(ErrorStatsServiceAsyncClient, filename, *args, **kwargs)
138144

139145
from_service_account_json = from_service_account_file
140146

packages/google-cloud-error-reporting/google/cloud/errorreporting_v1beta1/services/error_stats_service/transports/base.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ def __init__(
8383
be used for service account credentials.
8484
"""
8585

86-
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
87-
8886
# Save the scopes.
8987
self._scopes = scopes
9088
if not hasattr(self, "_ignore_credentials"):
@@ -99,11 +97,16 @@ def __init__(
9997

10098
if credentials_file is not None:
10199
credentials, _ = google.auth.load_credentials_from_file(
102-
credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
100+
credentials_file,
101+
scopes=scopes,
102+
quota_project_id=quota_project_id,
103+
default_scopes=self.AUTH_SCOPES,
103104
)
104105
elif credentials is None and not self._ignore_credentials:
105106
credentials, _ = google.auth.default(
106-
**scopes_kwargs, quota_project_id=quota_project_id
107+
scopes=scopes,
108+
quota_project_id=quota_project_id,
109+
default_scopes=self.AUTH_SCOPES,
107110
)
108111
# Don't apply audience if the credentials file passed from user.
109112
if hasattr(credentials, "with_gdch_audience"):

packages/google-cloud-error-reporting/google/cloud/errorreporting_v1beta1/services/report_errors_service/async_client.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
110110
Returns:
111111
ReportErrorsServiceAsyncClient: The constructed client.
112112
"""
113-
return ReportErrorsServiceClient.from_service_account_info.__func__(ReportErrorsServiceAsyncClient, info, *args, **kwargs) # type: ignore
113+
sa_info_func = (
114+
ReportErrorsServiceClient.from_service_account_info.__func__ # type: ignore
115+
)
116+
return sa_info_func(ReportErrorsServiceAsyncClient, info, *args, **kwargs)
114117

115118
@classmethod
116119
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -126,7 +129,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
126129
Returns:
127130
ReportErrorsServiceAsyncClient: The constructed client.
128131
"""
129-
return ReportErrorsServiceClient.from_service_account_file.__func__(ReportErrorsServiceAsyncClient, filename, *args, **kwargs) # type: ignore
132+
sa_file_func = (
133+
ReportErrorsServiceClient.from_service_account_file.__func__ # type: ignore
134+
)
135+
return sa_file_func(ReportErrorsServiceAsyncClient, filename, *args, **kwargs)
130136

131137
from_service_account_json = from_service_account_file
132138

packages/google-cloud-error-reporting/google/cloud/errorreporting_v1beta1/services/report_errors_service/transports/base.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ def __init__(
8383
be used for service account credentials.
8484
"""
8585

86-
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
87-
8886
# Save the scopes.
8987
self._scopes = scopes
9088
if not hasattr(self, "_ignore_credentials"):
@@ -99,11 +97,16 @@ def __init__(
9997

10098
if credentials_file is not None:
10199
credentials, _ = google.auth.load_credentials_from_file(
102-
credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
100+
credentials_file,
101+
scopes=scopes,
102+
quota_project_id=quota_project_id,
103+
default_scopes=self.AUTH_SCOPES,
103104
)
104105
elif credentials is None and not self._ignore_credentials:
105106
credentials, _ = google.auth.default(
106-
**scopes_kwargs, quota_project_id=quota_project_id
107+
scopes=scopes,
108+
quota_project_id=quota_project_id,
109+
default_scopes=self.AUTH_SCOPES,
107110
)
108111
# Don't apply audience if the credentials file passed from user.
109112
if hasattr(credentials, "with_gdch_audience"):

packages/google-cloud-error-reporting/google/cloud/errorreporting_v1beta1/types/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import proto # type: ignore
2121

22-
from google.protobuf import timestamp_pb2 # type: ignore
22+
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore
2323

2424

2525
__protobuf__ = proto.module(

packages/google-cloud-error-reporting/google/cloud/errorreporting_v1beta1/types/error_stats_service.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import proto # type: ignore
2121

2222
from google.cloud.errorreporting_v1beta1.types import common
23-
from google.protobuf import duration_pb2 # type: ignore
24-
from google.protobuf import timestamp_pb2 # type: ignore
23+
import google.protobuf.duration_pb2 as duration_pb2 # type: ignore
24+
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore
2525

2626

2727
__protobuf__ = proto.module(

0 commit comments

Comments
 (0)