Skip to content
This repository was archived by the owner on Mar 26, 2026. It is now read-only.

Commit aea00b2

Browse files
partheaparthea
authored
fix: resolve issue where pre-release versions of dependencies are installed (#2347)
1 parent fe65528 commit aea00b2

File tree

19 files changed

+76
-76
lines changed

19 files changed

+76
-76
lines changed

‎gapic/ads-templates/setup.py.j2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ else:
2929
release_status = "Development Status :: 5 - Production/Stable"
3030

3131
dependencies = [
32-
"google-api-core[grpc] >= 2.10.0, < 3.0.0dev",
33-
"google-auth >= 2.14.1, <3.0.0dev",
32+
"google-api-core[grpc] >= 2.10.0, < 3.0.0",
33+
"google-auth >= 2.14.1, <3.0.0",
3434
"googleapis-common-protos >= 1.53.0",
3535
"grpcio >= 1.10.0",
36-
"proto-plus >= 1.22.3, <2.0.0dev",
36+
"proto-plus >= 1.22.3, <2.0.0",
3737
{% if api.requires_package(('google', 'iam', 'v1')) %}
3838
"grpc-google-iam-v1",
3939
{% endif %}

‎gapic/templates/_pypi_packages.j2‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ allowed version.
77
Note: Set the minimum version for google-cloud-documentai to 2.0.0 which has support for `barcode` in `google.cloud.documentai.types`
88
-->
99
{% set pypi_packages = {
10-
("google", "apps", "card", "v1"): {"package_name": "google-apps-card", "lower_bound": "0.1.2", "upper_bound": "1.0.0dev"},
11-
("google", "apps", "script", "type"): {"package_name": "google-apps-script-type", "lower_bound": "0.2.0", "upper_bound": "1.0.0dev"},
12-
("google", "geo", "type"): {"package_name": "google-geo-type", "lower_bound": "0.1.0", "upper_bound": "1.0.0dev"},
13-
("google", "identity", "accesscontextmanager", "v1"): {"package_name": "google-cloud-access-context-manager", "lower_bound": "0.1.2", "upper_bound": "1.0.0dev"},
14-
("google", "cloud", "documentai", "v1"): {"package_name": "google-cloud-documentai", "lower_bound": "2.0.0", "upper_bound": "4.0.0dev"},
15-
("google", "cloud", "kms", "v1"): {"package_name": "google-cloud-kms", "lower_bound": "2.3.0", "upper_bound": "4.0.0dev"},
16-
("google", "cloud", "osconfig", "v1"): {"package_name": "google-cloud-os-config", "lower_bound": "1.0.0", "upper_bound": "2.0.0dev"},
17-
("google", "iam", "v1"): {"package_name": "grpc-google-iam-v1", "lower_bound": "0.14.0", "upper_bound": "1.0.0dev"},
18-
("google", "iam", "v2"): {"package_name": "google-cloud-iam", "lower_bound": "2.12.2", "upper_bound": "3.0.0dev"},
19-
("google", "shopping", "type"): {"package_name": "google-shopping-type", "lower_bound": "0.1.6", "upper_bound": "1.0.0dev"}
10+
("google", "apps", "card", "v1"): {"package_name": "google-apps-card", "lower_bound": "0.1.2", "upper_bound": "1.0.0"},
11+
("google", "apps", "script", "type"): {"package_name": "google-apps-script-type", "lower_bound": "0.2.0", "upper_bound": "1.0.0"},
12+
("google", "geo", "type"): {"package_name": "google-geo-type", "lower_bound": "0.1.0", "upper_bound": "1.0.0"},
13+
("google", "identity", "accesscontextmanager", "v1"): {"package_name": "google-cloud-access-context-manager", "lower_bound": "0.1.2", "upper_bound": "1.0.0"},
14+
("google", "cloud", "documentai", "v1"): {"package_name": "google-cloud-documentai", "lower_bound": "2.0.0", "upper_bound": "4.0.0"},
15+
("google", "cloud", "kms", "v1"): {"package_name": "google-cloud-kms", "lower_bound": "2.3.0", "upper_bound": "4.0.0"},
16+
("google", "cloud", "osconfig", "v1"): {"package_name": "google-cloud-os-config", "lower_bound": "1.0.0", "upper_bound": "2.0.0"},
17+
("google", "iam", "v1"): {"package_name": "grpc-google-iam-v1", "lower_bound": "0.14.0", "upper_bound": "1.0.0"},
18+
("google", "iam", "v2"): {"package_name": "google-cloud-iam", "lower_bound": "2.12.2", "upper_bound": "3.0.0"},
19+
("google", "shopping", "type"): {"package_name": "google-shopping-type", "lower_bound": "0.1.6", "upper_bound": "1.0.0"}
2020
}
2121
%}

‎gapic/templates/setup.py.j2‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ else:
3333
release_status = "Development Status :: 5 - Production/Stable"
3434

3535
dependencies = [
36-
"google-api-core[grpc] >= 1.34.1, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
36+
"google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
3737
# Exclude incompatible versions of `google-auth`
3838
# See https://github.com/googleapis/google-cloud-python/issues/12364
39-
"google-auth >= 2.14.1, <3.0.0dev,!=2.24.0,!=2.25.0",
40-
"proto-plus >= 1.22.3, <2.0.0dev",
41-
"proto-plus >= 1.25.0, <2.0.0dev; python_version >= '3.13'",
39+
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
40+
"proto-plus >= 1.22.3, <2.0.0",
41+
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
4242
{# Explicitly exclude protobuf versions mentioned in https://cloud.google.com/support/bulletins#GCP-2022-019 #}
43-
"protobuf>=3.20.2,<6.0.0dev,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
43+
"protobuf>=3.20.2,<6.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
4444
{% for package_tuple, package_info in pypi_packages.items() %}
4545
{# Quick check to make sure the package is different from this setup.py #}
4646
{% if api.naming.warehouse_package_name != package_info.package_name %}
@@ -53,8 +53,8 @@ dependencies = [
5353
extras = {
5454
{% if rest_async_io_enabled %}
5555
"async_rest": [
56-
"google-api-core[grpc] >= 2.21.0, < 3.0.0dev",
57-
"google-auth[aiohttp] >= 2.35.0, <3.0.0dev"
56+
"google-api-core[grpc] >= 2.21.0, < 3.0.0",
57+
"google-auth[aiohttp] >= 2.35.0, <3.0.0"
5858
],
5959
{% endif %}
6060
}

‎gapic/templates/testing/constraints-3.7.txt.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# are correct in setup.py
44
# List all library dependencies and extras in this file.
55
# Pin the version to the lower bound.
6-
# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev",
6+
# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
77
# Then this file should have google-cloud-foo==1.14.0
88
google-api-core==1.34.1
99
google-auth==2.14.1

‎setup.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@
2828
# Ensure that the lower bounds of these dependencies match what we have in the
2929
# templated setup.py.j2: https://github.com/googleapis/gapic-generator-python/blob/main/gapic/templates/setup.py.j2
3030
"click >= 6.7",
31-
"google-api-core[grpc] >= 1.34.1, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
31+
"google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
3232
"googleapis-common-protos >= 1.55.0",
3333
"grpcio >= 1.24.3",
3434
# 2.11.0 is required which adds the `default` argument to `jinja-filters.map()`
3535
# https://jinja.palletsprojects.com/en/3.0.x/templates/#jinja-filters.map
3636
# https://jinja.palletsprojects.com/en/2.11.x/changelog/#version-2-11-0
3737
"jinja2 >= 2.11",
38-
"protobuf>=3.20.2,<6.0.0dev,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
38+
"protobuf>=3.20.2,<6.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
3939
"pypandoc >= 1.4",
4040
"PyYAML >= 5.1.1",
41-
"grpc-google-iam-v1 >= 0.14.0, < 1.0.0dev",
42-
"libcst >= 0.4.9, < 2.0.0dev",
43-
"inflection >= 0.5.1, < 1.0.0dev",
41+
"grpc-google-iam-v1 >= 0.14.0, < 1.0.0",
42+
"libcst >= 0.4.9, < 2.0.0",
43+
"inflection >= 0.5.1, < 1.0.0",
4444
]
4545

4646
package_root = os.path.abspath(os.path.dirname(__file__))

‎tests/integration/goldens/asset/setup.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@
3939
release_status = "Development Status :: 5 - Production/Stable"
4040

4141
dependencies = [
42-
"google-api-core[grpc] >= 1.34.1, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
42+
"google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
4343
# Exclude incompatible versions of `google-auth`
4444
# See https://github.com/googleapis/google-cloud-python/issues/12364
45-
"google-auth >= 2.14.1, <3.0.0dev,!=2.24.0,!=2.25.0",
46-
"proto-plus >= 1.22.3, <2.0.0dev",
47-
"proto-plus >= 1.25.0, <2.0.0dev; python_version >= '3.13'",
48-
"protobuf>=3.20.2,<6.0.0dev,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
49-
"google-cloud-access-context-manager >= 0.1.2, <1.0.0dev",
50-
"google-cloud-os-config >= 1.0.0, <2.0.0dev",
51-
"grpc-google-iam-v1 >= 0.14.0, <1.0.0dev",
45+
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
46+
"proto-plus >= 1.22.3, <2.0.0",
47+
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
48+
"protobuf>=3.20.2,<6.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
49+
"google-cloud-access-context-manager >= 0.1.2, <1.0.0",
50+
"google-cloud-os-config >= 1.0.0, <2.0.0",
51+
"grpc-google-iam-v1 >= 0.14.0, <1.0.0",
5252
]
5353
extras = {
5454
}

‎tests/integration/goldens/asset/testing/constraints-3.7.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# are correct in setup.py
33
# List all library dependencies and extras in this file.
44
# Pin the version to the lower bound.
5-
# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev",
5+
# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
66
# Then this file should have google-cloud-foo==1.14.0
77
google-api-core==1.34.1
88
google-auth==2.14.1

‎tests/integration/goldens/credentials/setup.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
release_status = "Development Status :: 5 - Production/Stable"
4040

4141
dependencies = [
42-
"google-api-core[grpc] >= 1.34.1, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
42+
"google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
4343
# Exclude incompatible versions of `google-auth`
4444
# See https://github.com/googleapis/google-cloud-python/issues/12364
45-
"google-auth >= 2.14.1, <3.0.0dev,!=2.24.0,!=2.25.0",
46-
"proto-plus >= 1.22.3, <2.0.0dev",
47-
"proto-plus >= 1.25.0, <2.0.0dev; python_version >= '3.13'",
48-
"protobuf>=3.20.2,<6.0.0dev,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
45+
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
46+
"proto-plus >= 1.22.3, <2.0.0",
47+
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
48+
"protobuf>=3.20.2,<6.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
4949
]
5050
extras = {
5151
}

‎tests/integration/goldens/credentials/testing/constraints-3.7.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# are correct in setup.py
33
# List all library dependencies and extras in this file.
44
# Pin the version to the lower bound.
5-
# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev",
5+
# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
66
# Then this file should have google-cloud-foo==1.14.0
77
google-api-core==1.34.1
88
google-auth==2.14.1

‎tests/integration/goldens/eventarc/setup.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939
release_status = "Development Status :: 5 - Production/Stable"
4040

4141
dependencies = [
42-
"google-api-core[grpc] >= 1.34.1, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
42+
"google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
4343
# Exclude incompatible versions of `google-auth`
4444
# See https://github.com/googleapis/google-cloud-python/issues/12364
45-
"google-auth >= 2.14.1, <3.0.0dev,!=2.24.0,!=2.25.0",
46-
"proto-plus >= 1.22.3, <2.0.0dev",
47-
"proto-plus >= 1.25.0, <2.0.0dev; python_version >= '3.13'",
48-
"protobuf>=3.20.2,<6.0.0dev,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
49-
"grpc-google-iam-v1 >= 0.14.0, <1.0.0dev",
45+
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
46+
"proto-plus >= 1.22.3, <2.0.0",
47+
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
48+
"protobuf>=3.20.2,<6.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
49+
"grpc-google-iam-v1 >= 0.14.0, <1.0.0",
5050
]
5151
extras = {
5252
}

0 commit comments

Comments
 (0)