Skip to content

feat: add parse version helper and improve pre-release version parsing#17995

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

Closed
ohmayr wants to merge 7 commits into from
Closed

feat: add parse version helper and improve pre-release version parsing #17995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b1e0190
feat: add _parse_version_to_tuple helper and improve pre-release vers…
ohmayr Aug 4, 2026
0eba651
fix lint
ohmayr Aug 4, 2026
03b3cc9
fix lint
ohmayr Aug 4, 2026
c01e4b3
format
ohmayr Aug 4, 2026
cc9e229
add coverage
ohmayr Aug 4, 2026
bd6b3dd
update eventarc
ohmayr Aug 4, 2026
103597c
address feedback
ohmayr Aug 4, 2026
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
18 changes: 11 additions & 7 deletions packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/__init__.py.j2
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ else: # pragma: NO COVER

def parse_version_to_tuple(version_string: str):
"""Safely converts a semantic version string to a comparable tuple of integers.
Example: "6.33.5" -> (6, 33, 5)
Example: "6.33.5" -> (6, 33, 5), "1.83.1rc1" -> (1, 83, 1)

@daniel-sanchedaniel-sancheAug 4, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you give more context on how this change will be used?

Keep in mind that if the user has an old version of api_core installed, it will fall back to using that implementation. So if you need to depend on this specific parsing logic, that might be a problem

Ignores non-numeric parts and handles common version formats.
Args:
version_string: Version string in the format "x.y.z" or "x.y.z<suffix>"
Expand All@@ -100,15 +100,19 @@ else: # pragma: NO COVER
"""
parts = []
for part in version_string.split("."):
try:
parts.append(int(part))
except ValueError:
# If it's a non-numeric part (e.g., '1.0.0b1' -> 'b1'), stop here.
# This is a simplification compared to 'packaging.parse_version', but sufficient
# for comparing strictly numeric semantic versions.
digits = ""
for c in part:
if not c.isdigit():
break
digits += c
if digits:
parts.append(int(digits))
else:
break
return tuple(parts)



Comment thread
ohmayr marked this conversation as resolved.
def _get_version(dependency_name):
try:
version_string: str = metadata.version(dependency_name)
Expand Down
16 changes: 9 additions & 7 deletions packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset_v1/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,7 +142,7 @@

def parse_version_to_tuple(version_string: str):
"""Safely converts a semantic version string to a comparable tuple of integers.
Example: "6.33.5" -> (6, 33, 5)
Example: "6.33.5" -> (6, 33, 5), "1.83.1rc1" -> (1, 83, 1)
Ignores non-numeric parts and handles common version formats.
Args:
version_string: Version string in the format "x.y.z" or "x.y.z<suffix>"
Expand All@@ -151,12 +151,14 @@ def parse_version_to_tuple(version_string: str):
"""
parts = []
for part in version_string.split("."):
try:
parts.append(int(part))
except ValueError:
# If it's a non-numeric part (e.g., '1.0.0b1' -> 'b1'), stop here.
# This is a simplification compared to 'packaging.parse_version', but sufficient
# for comparing strictly numeric semantic versions.
digits = ""
for c in part:
if not c.isdigit():
break
digits += c
if digits:
parts.append(int(digits))
else:
break
return tuple(parts)

Expand Down
16 changes: 9 additions & 7 deletions ...pic-generator/tests/integration/goldens/credentials/google/iam/credentials_v1/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@

def parse_version_to_tuple(version_string: str):
"""Safely converts a semantic version string to a comparable tuple of integers.
Example: "6.33.5" -> (6, 33, 5)
Example: "6.33.5" -> (6, 33, 5), "1.83.1rc1" -> (1, 83, 1)
Ignores non-numeric parts and handles common version formats.
Args:
version_string: Version string in the format "x.y.z" or "x.y.z<suffix>"
Expand All@@ -77,12 +77,14 @@ def parse_version_to_tuple(version_string: str):
"""
parts = []
for part in version_string.split("."):
try:
parts.append(int(part))
except ValueError:
# If it's a non-numeric part (e.g., '1.0.0b1' -> 'b1'), stop here.
# This is a simplification compared to 'packaging.parse_version', but sufficient
# for comparing strictly numeric semantic versions.
digits = ""
for c in part:
if not c.isdigit():
break
digits += c
if digits:
parts.append(int(digits))
else:
break
return tuple(parts)

Expand Down
16 changes: 9 additions & 7 deletions ...s/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@

def parse_version_to_tuple(version_string: str):
"""Safely converts a semantic version string to a comparable tuple of integers.
Example: "6.33.5" -> (6, 33, 5)
Example: "6.33.5" -> (6, 33, 5), "1.83.1rc1" -> (1, 83, 1)
Ignores non-numeric parts and handles common version formats.
Args:
version_string: Version string in the format "x.y.z" or "x.y.z<suffix>"
Expand All@@ -149,12 +149,14 @@ def parse_version_to_tuple(version_string: str):
"""
parts = []
for part in version_string.split("."):
try:
parts.append(int(part))
except ValueError:
# If it's a non-numeric part (e.g., '1.0.0b1' -> 'b1'), stop here.
# This is a simplification compared to 'packaging.parse_version', but sufficient
# for comparing strictly numeric semantic versions.
digits = ""
for c in part:
if not c.isdigit():
break
digits += c
if digits:
parts.append(int(digits))
else:
break
return tuple(parts)

Expand Down
16 changes: 9 additions & 7 deletions ...ges/gapic-generator/tests/integration/goldens/logging/google/cloud/logging_v2/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@

def parse_version_to_tuple(version_string: str):
"""Safely converts a semantic version string to a comparable tuple of integers.
Example: "6.33.5" -> (6, 33, 5)
Example: "6.33.5" -> (6, 33, 5), "1.83.1rc1" -> (1, 83, 1)
Ignores non-numeric parts and handles common version formats.
Args:
version_string: Version string in the format "x.y.z" or "x.y.z<suffix>"
Expand All@@ -153,12 +153,14 @@ def parse_version_to_tuple(version_string: str):
"""
parts = []
for part in version_string.split("."):
try:
parts.append(int(part))
except ValueError:
# If it's a non-numeric part (e.g., '1.0.0b1' -> 'b1'), stop here.
# This is a simplification compared to 'packaging.parse_version', but sufficient
# for comparing strictly numeric semantic versions.
digits = ""
for c in part:
if not c.isdigit():
break
digits += c
if digits:
parts.append(int(digits))
else:
break
return tuple(parts)

Expand Down
16 changes: 9 additions & 7 deletions ...-generator/tests/integration/goldens/logging_internal/google/cloud/logging_v2/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@

def parse_version_to_tuple(version_string: str):
"""Safely converts a semantic version string to a comparable tuple of integers.
Example: "6.33.5" -> (6, 33, 5)
Example: "6.33.5" -> (6, 33, 5), "1.83.1rc1" -> (1, 83, 1)
Ignores non-numeric parts and handles common version formats.
Args:
version_string: Version string in the format "x.y.z" or "x.y.z<suffix>"
Expand All@@ -153,12 +153,14 @@ def parse_version_to_tuple(version_string: str):
"""
parts = []
for part in version_string.split("."):
try:
parts.append(int(part))
except ValueError:
# If it's a non-numeric part (e.g., '1.0.0b1' -> 'b1'), stop here.
# This is a simplification compared to 'packaging.parse_version', but sufficient
# for comparing strictly numeric semantic versions.
digits = ""
for c in part:
if not c.isdigit():
break
digits += c
if digits:
parts.append(int(digits))
else:
break
return tuple(parts)

Expand Down
16 changes: 9 additions & 7 deletions packages/gapic-generator/tests/integration/goldens/redis/google/cloud/redis_v1/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@

def parse_version_to_tuple(version_string: str):
"""Safely converts a semantic version string to a comparable tuple of integers.
Example: "6.33.5" -> (6, 33, 5)
Example: "6.33.5" -> (6, 33, 5), "1.83.1rc1" -> (1, 83, 1)
Ignores non-numeric parts and handles common version formats.
Args:
version_string: Version string in the format "x.y.z" or "x.y.z<suffix>"
Expand All@@ -95,12 +95,14 @@ def parse_version_to_tuple(version_string: str):
"""
parts = []
for part in version_string.split("."):
try:
parts.append(int(part))
except ValueError:
# If it's a non-numeric part (e.g., '1.0.0b1' -> 'b1'), stop here.
# This is a simplification compared to 'packaging.parse_version', but sufficient
# for comparing strictly numeric semantic versions.
digits = ""
for c in part:
if not c.isdigit():
break
digits += c
if digits:
parts.append(int(digits))
else:
break
return tuple(parts)

Expand Down
16 changes: 9 additions & 7 deletions ...pic-generator/tests/integration/goldens/redis_selective/google/cloud/redis_v1/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@

def parse_version_to_tuple(version_string: str):
"""Safely converts a semantic version string to a comparable tuple of integers.
Example: "6.33.5" -> (6, 33, 5)
Example: "6.33.5" -> (6, 33, 5), "1.83.1rc1" -> (1, 83, 1)
Ignores non-numeric parts and handles common version formats.
Args:
version_string: Version string in the format "x.y.z" or "x.y.z<suffix>"
Expand All@@ -88,12 +88,14 @@ def parse_version_to_tuple(version_string: str):
"""
parts = []
for part in version_string.split("."):
try:
parts.append(int(part))
except ValueError:
# If it's a non-numeric part (e.g., '1.0.0b1' -> 'b1'), stop here.
# This is a simplification compared to 'packaging.parse_version', but sufficient
# for comparing strictly numeric semantic versions.
digits = ""
for c in part:
if not c.isdigit():
break
digits += c
if digits:
parts.append(int(digits))
else:
break
return tuple(parts)

Expand Down
16 changes: 9 additions & 7 deletions ...gration/goldens/storagebatchoperations/google/cloud/storagebatchoperations_v1/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@

def parse_version_to_tuple(version_string: str):
"""Safely converts a semantic version string to a comparable tuple of integers.
Example: "6.33.5" -> (6, 33, 5)
Example: "6.33.5" -> (6, 33, 5), "1.83.1rc1" -> (1, 83, 1)
Ignores non-numeric parts and handles common version formats.
Args:
version_string: Version string in the format "x.y.z" or "x.y.z<suffix>"
Expand All@@ -97,12 +97,14 @@ def parse_version_to_tuple(version_string: str):
"""
parts = []
for part in version_string.split("."):
try:
parts.append(int(part))
except ValueError:
# If it's a non-numeric part (e.g., '1.0.0b1' -> 'b1'), stop here.
# This is a simplification compared to 'packaging.parse_version', but sufficient
# for comparing strictly numeric semantic versions.
digits = ""
for c in part:
if not c.isdigit():
break
digits += c
if digits:
parts.append(int(digits))
else:
break
return tuple(parts)

Expand Down
18 changes: 10 additions & 8 deletions packages/google-api-core/google/api_core/_python_package_support.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,8 @@
def parse_version_to_tuple(version_string: str) -> ParsedVersion:
"""Safely converts a semantic version string to a comparable tuple of integers.

Example: "6.33.5" -> (6, 33, 5)
Ignores non-numeric parts and handles common version formats.
Example: "6.33.5" -> (6, 33, 5), "1.83.1rc1" -> (1, 83, 1)
Parses leading digits of each component to correctly handle pre-releases.

Args:
version_string: Version string in the format "x.y.z" or "x.y.z<suffix>"
Expand All@@ -61,12 +61,14 @@ def parse_version_to_tuple(version_string: str) -> ParsedVersion:
"""
parts = []
for part in version_string.split("."):
try:
parts.append(int(part))
except ValueError:
# If it's a non-numeric part (e.g., '1.0.0b1' -> 'b1'), stop here.
# This is a simplification compared to 'packaging.parse_version', but sufficient
# for comparing strictly numeric semantic versions.
digits = ""
for c in part:
if not c.isdigit():
break
digits += c
if digits:
parts.append(int(digits))
else:
break
return tuple(parts)

Expand Down
10 changes: 10 additions & 0 deletions packages/google-api-core/tests/unit/test_python_package_support.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,16 @@ def test_get_dependency_version(mocker, version_string_to_test):
assert get_dependency_version("not-a-package") == DependencyVersion(None, "--")


def test_parse_version_to_tuple_prerelease():
"""Test parse_version_to_tuple with pre-release versions."""
assert parse_version_to_tuple("1.83.1rc1") == (1, 83, 1)
assert parse_version_to_tuple("1.83.0dev0") == (1, 83, 0)
assert parse_version_to_tuple("6.33.5b2") == (6, 33, 5)
assert parse_version_to_tuple("1.83.0.dev0") == (1, 83, 0)
assert parse_version_to_tuple("1.83.dev0") == (1, 83)
assert parse_version_to_tuple("dev0") == ()


@patch("google.api_core._python_package_support._get_distribution_and_import_packages")
@patch("google.api_core._python_package_support.get_dependency_version")
def test_warn_deprecation_for_versions_less_than(mock_get_version, mock_get_packages):
Expand Down
26 changes: 26 additions & 0 deletions packages/google-auth/google/auth/_helpers.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -534,3 +534,29 @@ def response_log(logger: logging.Logger, response: Any) -> None:
if is_logging_enabled(logger):
json_response = _parse_response(response)
_response_log_base(logger, json_response)


def _parse_version_to_tuple(version_string):
Comment thread
ohmayr marked this conversation as resolved.

@daniel-sanchedaniel-sancheAug 4, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure we need to add the warning to both the clients, and google-auth? That would result in duplicate warnings to most end-users

That's probably ok, just wanted to make sure that's the intention

"""Safely converts a semantic version string to a comparable tuple of integers.

Example: "6.33.5" -> (6, 33, 5), "1.83.1rc1" -> (1, 83, 1)
Parses leading digits of each component to correctly handle pre-releases.

Args:
version_string: Version string in the format "x.y.z" or "x.y.z<suffix>"

Returns:
Tuple of integers for the parsed version string.
"""
parts = []
for part in version_string.split("."):
digits = ""
for c in part:
if not c.isdigit():
break
digits += c
if digits:
parts.append(int(digits))
else:
break
return tuple(parts)
10 changes: 10 additions & 0 deletions packages/google-auth/tests/test__helpers.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -697,3 +697,13 @@ def test_out_of_range(self):
with pytest.raises((OverflowError, OSError, ValueError)):
# Large enough to fail on most systems (Year 300,000+)
_helpers.utcfromtimestamp(9999999999999)


def test_parse_version_to_tuple():
assert _helpers._parse_version_to_tuple("1.83.0") == (1, 83, 0)
assert _helpers._parse_version_to_tuple("1.83.1rc1") == (1, 83, 1)
assert _helpers._parse_version_to_tuple("1.83.0dev0") == (1, 83, 0)
assert _helpers._parse_version_to_tuple("2.0") == (2, 0)
assert _helpers._parse_version_to_tuple("1.83.0.dev0") == (1, 83, 0)
assert _helpers._parse_version_to_tuple("1.83.dev0") == (1, 83)
assert _helpers._parse_version_to_tuple("dev0") == ()
Loading
Loading