Skip to content
This repository was archived by the owner on Mar 26, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gapic/utils/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ def tweak_path(p):
if service_yaml_paths:
# Just use the last file specified.
with open(service_yaml_paths[-1]) as f:
service_yaml_config = yaml.load(f, Loader=yaml.Loader)
service_yaml_config = yaml.safe_load(f)
# The yaml service files typically have this field,
# but it is not a field in the gogle.api.Service proto.
service_yaml_config.pop("type", None)
Expand Down
8 changes: 6 additions & 2 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,9 @@ def showcase(
"""Run the Showcase test suite."""

with showcase_library(session, templates=templates, other_opts=other_opts):
session.install("pytest", "pytest-asyncio")
# Exclude pytest-asyncio==1.0.0 while we investigate the recent failure described in
# https://github.com/googleapis/gapic-generator-python/issues/2399
session.install("pytest", "pytest-asyncio!=1.0.0")
test_directory = Path("tests", "system")
ignore_file = env.get("IGNORE_FILE")
pytest_command = [
Expand Down Expand Up @@ -422,7 +424,9 @@ def showcase_w_rest_async(
with showcase_library(
session, templates=templates, other_opts=other_opts, rest_async_io_enabled=True
):
session.install("pytest", "pytest-asyncio")
# Exclude pytest-asyncio==1.0.0 while we investigate the recent failure described in
# https://github.com/googleapis/gapic-generator-python/issues/2399
session.install("pytest", "pytest-asyncio!=1.0.0")
test_directory = Path("tests", "system")
ignore_file = env.get("IGNORE_FILE")
pytest_command = [
Expand Down
Loading