Skip to content

chore(librarian): resolve issue where release init fails for version.py #14809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
parthea merged 1 commit into from
Oct 27, 2025
Merged

chore(librarian): resolve issue where release init fails for version.py #14809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .generator/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,6 +1197,11 @@ def _update_version_for_library(
version_files = [pyproject_toml if pyproject_toml.exists() else setup_py]

for version_file in version_files:
# Do not process version files in the types directory as some
# GAPIC libraries have `version.py` which are generated from
# `version.proto` and do not include SDK versions.
if version_file.parent.name == "types":
continue
updated_content = _process_version_file(
_read_text_file(version_file), version, version_file
)
Expand Down
19 changes: 14 additions & 5 deletions .generator/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,20 +1014,29 @@ def test_update_global_changelog(mocker, mock_release_init_request_file):


def test_update_version_for_library_success_gapic(mocker):
mock_content = '__version__ = "1.2.2"'
mock_json_metadata = {"clientLibrary": {"version": "0.1.0"}}
mock_shutil_copy = mocker.patch("shutil.copy")

m = mock_open()

mock_rglob = mocker.patch("pathlib.Path.rglob")
mock_rglob.side_effect = [
[pathlib.Path("repo/gapic_version.py")], # 1st call (gapic_version.py)
[], # 2nd call (version.py)
[pathlib.Path("repo/types/version.py")], # 2nd call (types/version.py).
[pathlib.Path("repo/samples/snippet_metadata.json")], # 3rd call (snippets)
]
mock_shutil_copy = mocker.patch("shutil.copy")
mock_content = '__version__ = "1.2.2"'
mock_json_metadata = {"clientLibrary": {"version": "0.1.0"}}
mock_rglob = mocker.patch("cli._read_text_file")
mock_rglob.side_effect = [
mock_content, # 1st call (gapic_version.py)
# Do not process version files in the `types` directory as some
# GAPIC libraries have `version.py` which are generated from
# `version.proto` and do not include SDK versions.
# Leave the content as empty because it doesn't contain version information
"", # 2nd call (types/version.py)
]

with unittest.mock.patch("cli.open", m):
mocker.patch("cli._read_text_file", return_value=mock_content)
mocker.patch("cli._read_json_file", return_value=mock_json_metadata)
_update_version_for_library(
"repo", "output", "packages/google-cloud-language", "1.2.3"
Expand Down
Loading