From 0c979a595d0996a3e01d6207f5b9037675d2377a Mon Sep 17 00:00:00 2001 From: Noah Dietz Date: Wed, 3 Jun 2026 22:14:42 +0000 Subject: [PATCH 1/2] feat(gapic-generator-python): setup.py matches prereleases --- packages/gapic-generator/gapic/templates/setup.py.j2 | 5 ++++- .../gapic-generator/tests/integration/goldens/asset/setup.py | 5 ++++- .../tests/integration/goldens/credentials/setup.py | 5 ++++- .../tests/integration/goldens/eventarc/setup.py | 5 ++++- .../tests/integration/goldens/logging/setup.py | 5 ++++- .../tests/integration/goldens/logging_internal/setup.py | 5 ++++- .../gapic-generator/tests/integration/goldens/redis/setup.py | 5 ++++- .../tests/integration/goldens/redis_selective/setup.py | 5 ++++- .../integration/goldens/storagebatchoperations/setup.py | 5 ++++- 9 files changed, 36 insertions(+), 9 deletions(-) diff --git a/packages/gapic-generator/gapic/templates/setup.py.j2 b/packages/gapic-generator/gapic/templates/setup.py.j2 index 9834a2884c95..d8747e4a4890 100644 --- a/packages/gapic-generator/gapic/templates/setup.py.j2 +++ b/packages/gapic-generator/gapic/templates/setup.py.j2 @@ -23,7 +23,10 @@ description = "{{ warehouse_description }} API client library" version = None with open(os.path.join(package_root, '{{ package_path }}/gapic_version.py')) as fp: - version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read()) + version_candidates = re.findall( + r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + fp.read(), + ) assert (len(version_candidates) == 1) version = version_candidates[0] diff --git a/packages/gapic-generator/tests/integration/goldens/asset/setup.py b/packages/gapic-generator/tests/integration/goldens/asset/setup.py index 197a610bff72..a61dcdfd092b 100755 --- a/packages/gapic-generator/tests/integration/goldens/asset/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/asset/setup.py @@ -29,7 +29,10 @@ version = None with open(os.path.join(package_root, 'google/cloud/asset/gapic_version.py')) as fp: - version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read()) + version_candidates = re.findall( + r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + fp.read(), + ) assert (len(version_candidates) == 1) version = version_candidates[0] diff --git a/packages/gapic-generator/tests/integration/goldens/credentials/setup.py b/packages/gapic-generator/tests/integration/goldens/credentials/setup.py index 4d4533c20e18..e52d0ff1e096 100755 --- a/packages/gapic-generator/tests/integration/goldens/credentials/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/credentials/setup.py @@ -29,7 +29,10 @@ version = None with open(os.path.join(package_root, 'google/iam/credentials/gapic_version.py')) as fp: - version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read()) + version_candidates = re.findall( + r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + fp.read(), + ) assert (len(version_candidates) == 1) version = version_candidates[0] diff --git a/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py b/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py index 0a0aae863942..78b99b2e9e87 100755 --- a/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py @@ -29,7 +29,10 @@ version = None with open(os.path.join(package_root, 'google/cloud/eventarc_v1/gapic_version.py')) as fp: - version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read()) + version_candidates = re.findall( + r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + fp.read(), + ) assert (len(version_candidates) == 1) version = version_candidates[0] diff --git a/packages/gapic-generator/tests/integration/goldens/logging/setup.py b/packages/gapic-generator/tests/integration/goldens/logging/setup.py index 38c15878df5e..e1ef9057038a 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/logging/setup.py @@ -29,7 +29,10 @@ version = None with open(os.path.join(package_root, 'google/cloud/logging/gapic_version.py')) as fp: - version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read()) + version_candidates = re.findall( + r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + fp.read(), + ) assert (len(version_candidates) == 1) version = version_candidates[0] diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py b/packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py index 38c15878df5e..e1ef9057038a 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py @@ -29,7 +29,10 @@ version = None with open(os.path.join(package_root, 'google/cloud/logging/gapic_version.py')) as fp: - version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read()) + version_candidates = re.findall( + r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + fp.read(), + ) assert (len(version_candidates) == 1) version = version_candidates[0] diff --git a/packages/gapic-generator/tests/integration/goldens/redis/setup.py b/packages/gapic-generator/tests/integration/goldens/redis/setup.py index 18e5226c7306..e78f33e8071b 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/redis/setup.py @@ -29,7 +29,10 @@ version = None with open(os.path.join(package_root, 'google/cloud/redis/gapic_version.py')) as fp: - version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read()) + version_candidates = re.findall( + r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + fp.read(), + ) assert (len(version_candidates) == 1) version = version_candidates[0] diff --git a/packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py b/packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py index 18e5226c7306..e78f33e8071b 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py @@ -29,7 +29,10 @@ version = None with open(os.path.join(package_root, 'google/cloud/redis/gapic_version.py')) as fp: - version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read()) + version_candidates = re.findall( + r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + fp.read(), + ) assert (len(version_candidates) == 1) version = version_candidates[0] diff --git a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py index 56c8e3127f42..db56857c44b5 100755 --- a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py @@ -29,7 +29,10 @@ version = None with open(os.path.join(package_root, 'google/cloud/storagebatchoperations/gapic_version.py')) as fp: - version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read()) + version_candidates = re.findall( + r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + fp.read(), + ) assert (len(version_candidates) == 1) version = version_candidates[0] From bba10cf54e0c0a6084adcfaf7eaa1d2e3caae4a8 Mon Sep 17 00:00:00 2001 From: Noah Dietz Date: Wed, 3 Jun 2026 23:30:24 +0000 Subject: [PATCH 2/2] use more broad suffix matcher --- packages/gapic-generator/gapic/templates/setup.py.j2 | 2 +- .../gapic-generator/tests/integration/goldens/asset/setup.py | 2 +- .../tests/integration/goldens/credentials/setup.py | 2 +- .../gapic-generator/tests/integration/goldens/eventarc/setup.py | 2 +- .../gapic-generator/tests/integration/goldens/logging/setup.py | 2 +- .../tests/integration/goldens/logging_internal/setup.py | 2 +- .../gapic-generator/tests/integration/goldens/redis/setup.py | 2 +- .../tests/integration/goldens/redis_selective/setup.py | 2 +- .../tests/integration/goldens/storagebatchoperations/setup.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/gapic-generator/gapic/templates/setup.py.j2 b/packages/gapic-generator/gapic/templates/setup.py.j2 index d8747e4a4890..fb902178055f 100644 --- a/packages/gapic-generator/gapic/templates/setup.py.j2 +++ b/packages/gapic-generator/gapic/templates/setup.py.j2 @@ -24,7 +24,7 @@ version = None with open(os.path.join(package_root, '{{ package_path }}/gapic_version.py')) as fp: version_candidates = re.findall( - r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")", fp.read(), ) assert (len(version_candidates) == 1) diff --git a/packages/gapic-generator/tests/integration/goldens/asset/setup.py b/packages/gapic-generator/tests/integration/goldens/asset/setup.py index a61dcdfd092b..d5e4623ee04b 100755 --- a/packages/gapic-generator/tests/integration/goldens/asset/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/asset/setup.py @@ -30,7 +30,7 @@ with open(os.path.join(package_root, 'google/cloud/asset/gapic_version.py')) as fp: version_candidates = re.findall( - r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")", fp.read(), ) assert (len(version_candidates) == 1) diff --git a/packages/gapic-generator/tests/integration/goldens/credentials/setup.py b/packages/gapic-generator/tests/integration/goldens/credentials/setup.py index e52d0ff1e096..57e35ca4e0c0 100755 --- a/packages/gapic-generator/tests/integration/goldens/credentials/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/credentials/setup.py @@ -30,7 +30,7 @@ with open(os.path.join(package_root, 'google/iam/credentials/gapic_version.py')) as fp: version_candidates = re.findall( - r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")", fp.read(), ) assert (len(version_candidates) == 1) diff --git a/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py b/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py index 78b99b2e9e87..a7179a051924 100755 --- a/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py @@ -30,7 +30,7 @@ with open(os.path.join(package_root, 'google/cloud/eventarc_v1/gapic_version.py')) as fp: version_candidates = re.findall( - r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")", fp.read(), ) assert (len(version_candidates) == 1) diff --git a/packages/gapic-generator/tests/integration/goldens/logging/setup.py b/packages/gapic-generator/tests/integration/goldens/logging/setup.py index e1ef9057038a..0c230d719cdd 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/logging/setup.py @@ -30,7 +30,7 @@ with open(os.path.join(package_root, 'google/cloud/logging/gapic_version.py')) as fp: version_candidates = re.findall( - r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")", fp.read(), ) assert (len(version_candidates) == 1) diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py b/packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py index e1ef9057038a..0c230d719cdd 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py @@ -30,7 +30,7 @@ with open(os.path.join(package_root, 'google/cloud/logging/gapic_version.py')) as fp: version_candidates = re.findall( - r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")", fp.read(), ) assert (len(version_candidates) == 1) diff --git a/packages/gapic-generator/tests/integration/goldens/redis/setup.py b/packages/gapic-generator/tests/integration/goldens/redis/setup.py index e78f33e8071b..02095ef25809 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/redis/setup.py @@ -30,7 +30,7 @@ with open(os.path.join(package_root, 'google/cloud/redis/gapic_version.py')) as fp: version_candidates = re.findall( - r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")", fp.read(), ) assert (len(version_candidates) == 1) diff --git a/packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py b/packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py index e78f33e8071b..02095ef25809 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py @@ -30,7 +30,7 @@ with open(os.path.join(package_root, 'google/cloud/redis/gapic_version.py')) as fp: version_candidates = re.findall( - r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")", fp.read(), ) assert (len(version_candidates) == 1) diff --git a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py index db56857c44b5..1250019e9117 100755 --- a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py @@ -30,7 +30,7 @@ with open(os.path.join(package_root, 'google/cloud/storagebatchoperations/gapic_version.py')) as fp: version_candidates = re.findall( - r"(?<=\")\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?(?=\")", + r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")", fp.read(), ) assert (len(version_candidates) == 1)