Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 25b857e

Browse filesBrowse files
noahdietznoahdietz
authored
feat(gapic-generator): setup.py matches prerelease versions (#17370)
1 parent 65f059e commit 25b857e
Copy full SHA for 25b857e

9 files changed

+36-9Lines changed: 36 additions & 9 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎packages/gapic-generator/gapic/templates/setup.py.j2‎

Copy file name to clipboardExpand all lines: packages/gapic-generator/gapic/templates/setup.py.j2
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ description = "{{ warehouse_description }} API client library"
2323
version = None
2424

2525
with open(os.path.join(package_root, '{{ package_path }}/gapic_version.py')) as fp:
26-
version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read())
26+
version_candidates = re.findall(
27+
r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")",
28+
fp.read(),
29+
)
2730
assert (len(version_candidates) == 1)
2831
version = version_candidates[0]
2932

Collapse file

‎packages/gapic-generator/tests/integration/goldens/asset/setup.py‎

Copy file name to clipboardExpand all lines: packages/gapic-generator/tests/integration/goldens/asset/setup.py
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
version = None
3030

3131
with open(os.path.join(package_root, 'google/cloud/asset/gapic_version.py')) as fp:
32-
version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read())
32+
version_candidates = re.findall(
33+
r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")",
34+
fp.read(),
35+
)
3336
assert (len(version_candidates) == 1)
3437
version = version_candidates[0]
3538

Collapse file

‎packages/gapic-generator/tests/integration/goldens/credentials/setup.py‎

Copy file name to clipboardExpand all lines: packages/gapic-generator/tests/integration/goldens/credentials/setup.py
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
version = None
3030

3131
with open(os.path.join(package_root, 'google/iam/credentials/gapic_version.py')) as fp:
32-
version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read())
32+
version_candidates = re.findall(
33+
r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")",
34+
fp.read(),
35+
)
3336
assert (len(version_candidates) == 1)
3437
version = version_candidates[0]
3538

Collapse file

‎packages/gapic-generator/tests/integration/goldens/eventarc/setup.py‎

Copy file name to clipboardExpand all lines: packages/gapic-generator/tests/integration/goldens/eventarc/setup.py
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
version = None
3030

3131
with open(os.path.join(package_root, 'google/cloud/eventarc_v1/gapic_version.py')) as fp:
32-
version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read())
32+
version_candidates = re.findall(
33+
r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")",
34+
fp.read(),
35+
)
3336
assert (len(version_candidates) == 1)
3437
version = version_candidates[0]
3538

Collapse file

‎packages/gapic-generator/tests/integration/goldens/logging/setup.py‎

Copy file name to clipboardExpand all lines: packages/gapic-generator/tests/integration/goldens/logging/setup.py
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
version = None
3030

3131
with open(os.path.join(package_root, 'google/cloud/logging/gapic_version.py')) as fp:
32-
version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read())
32+
version_candidates = re.findall(
33+
r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")",
34+
fp.read(),
35+
)
3336
assert (len(version_candidates) == 1)
3437
version = version_candidates[0]
3538

Collapse file

‎packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py‎

Copy file name to clipboardExpand all lines: packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
version = None
3030

3131
with open(os.path.join(package_root, 'google/cloud/logging/gapic_version.py')) as fp:
32-
version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read())
32+
version_candidates = re.findall(
33+
r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")",
34+
fp.read(),
35+
)
3336
assert (len(version_candidates) == 1)
3437
version = version_candidates[0]
3538

Collapse file

‎packages/gapic-generator/tests/integration/goldens/redis/setup.py‎

Copy file name to clipboardExpand all lines: packages/gapic-generator/tests/integration/goldens/redis/setup.py
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
version = None
3030

3131
with open(os.path.join(package_root, 'google/cloud/redis/gapic_version.py')) as fp:
32-
version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read())
32+
version_candidates = re.findall(
33+
r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")",
34+
fp.read(),
35+
)
3336
assert (len(version_candidates) == 1)
3437
version = version_candidates[0]
3538

Collapse file

‎packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py‎

Copy file name to clipboardExpand all lines: packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
version = None
3030

3131
with open(os.path.join(package_root, 'google/cloud/redis/gapic_version.py')) as fp:
32-
version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read())
32+
version_candidates = re.findall(
33+
r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")",
34+
fp.read(),
35+
)
3336
assert (len(version_candidates) == 1)
3437
version = version_candidates[0]
3538

Collapse file

‎packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py‎

Copy file name to clipboardExpand all lines: packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
version = None
3030

3131
with open(os.path.join(package_root, 'google/cloud/storagebatchoperations/gapic_version.py')) as fp:
32-
version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read())
32+
version_candidates = re.findall(
33+
r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")",
34+
fp.read(),
35+
)
3336
assert (len(version_candidates) == 1)
3437
version = version_candidates[0]
3538

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.