feat(gapic-generator): setup.py matches prerelease versions (#17370)

noahdietz · web-flow · commit 25b857e1bc19 · 2026-06-04T15:16:43.000-07:00
diff --git 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+[^\"\s]*(?=\")",
+        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
@@ -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+[^\"\s]*(?=\")",
+        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
@@ -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+[^\"\s]*(?=\")",
+        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
@@ -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+[^\"\s]*(?=\")",
+        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
@@ -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+[^\"\s]*(?=\")",
+        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
@@ -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+[^\"\s]*(?=\")",
+        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
@@ -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+[^\"\s]*(?=\")",
+        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
@@ -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+[^\"\s]*(?=\")",
+        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
@@ -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+[^\"\s]*(?=\")",
+        fp.read(),
+    )
     assert (len(version_candidates) == 1)
     version = version_candidates[0]
 
