Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
"grpcio >= 1.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.17.1, <3.0.0",
"google-api-core[grpc] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
"grpcio >= 1.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.17.1, <3.0.0",
"google-api-core[grpc] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
Expand All @@ -38,14 +38,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
"grpcio >= 1.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.17.1, <3.0.0",
"google-api-core[grpc] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
Expand All @@ -57,14 +57,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
"grpcio >= 1.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.17.1, <3.0.0",
"google-api-core[grpc] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
Expand All @@ -76,14 +76,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
"grpcio >= 1.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.17.1, <3.0.0",
"google-api-core[grpc] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
Expand All @@ -95,14 +95,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
"grpcio >= 1.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.17.1, <3.0.0",
"google-api-core[grpc] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
Expand All @@ -114,14 +114,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
"grpcio >= 1.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.17.1, <3.0.0",
"google-api-core[grpc] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
"grpcio >= 1.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.17.1, <3.0.0",
"google-api-core[grpc] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
Expand All @@ -38,10 +38,10 @@ replacements:
packages/google-cloud-asset/testing/constraints-3.10.txt
]
before: |
google-api-core==2.17.1
google-api-core==2.24.2
google-auth==2.14.1
after: |
google-api-core==2.17.1
google-api-core==2.24.2
google-cloud-org-policy==1.11.1
google-auth==2.14.1
count: 1
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,10 @@ replacements:
packages/google-cloud-bigtable/setup.py,
]
before: |
Comment thread
zhumin8 marked this conversation as resolved.
"protobuf >= 4.25.8, < 8.0.0",
\]
"protobuf >= 6.33.5, < 8.0.0",
]
after: |
"protobuf >= 4.25.8, < 8.0.0",
"protobuf >= 6.33.5, < 8.0.0",
"google-cloud-core >= 2.0.0, <3.0.0",
"grpc-google-iam-v1 >= 0.14.0, <1.0.0",
"google-crc32c>=1.6.0, <2.0.0dev",
Expand All @@ -207,10 +207,10 @@ replacements:
packages/google-cloud-bigtable/testing/constraints-3.10.txt,
]
before: |
google-api-core==2.17.1
google-api-core==2.24.2
google-auth==2.14.1
after: |
google-api-core==2.17.1
google-api-core==2.24.2
google-cloud-core==2.0.0
grpc-google-iam-v1==0.14.0
google-crc32c==1.6.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
"grpcio >= 1.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.17.1, <3.0.0",
"google-api-core[grpc] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
"grpcio >= 1.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.17.1, <3.0.0",
"google-api-core[grpc] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
Expand Down Expand Up @@ -210,10 +210,10 @@ replacements:
packages/google-cloud-automl/testing/constraints-3.10.txt,
]
before: |
google-api-core==2.17.1
google-api-core==2.24.2
google-auth==2.14.1
after: |
google-api-core==2.17.1
google-api-core==2.24.2
google-cloud-storage==2.14.0
libcst==0.2.5
pandas==1.3.4
Expand Down Expand Up @@ -424,10 +424,10 @@ replacements:
"packages/google-cloud-monitoring/testing/constraints-3.10.txt",
]
before: |
google-api-core==2.17.1
google-api-core==2.24.2
google-auth==2.14.1
after: |
google-api-core==2.17.1
google-api-core==2.24.2
pandas==1.3.4
numpy==1.21.3
google-auth==2.14.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -506,9 +506,9 @@ replacements:

- paths:
- "packages/google-cloud-pubsub/testing/constraints-3.10.txt"
before: 'grpc-google-iam-v1==0\.14\.0\n(?!grpcio-status)'
before: 'grpc-google-iam-v1==0\.14\.2\n(?!grpcio-status)'
after: |-
grpc-google-iam-v1==0.14.0
grpc-google-iam-v1==0.14.2
grpcio-status==1.51.3
opentelemetry-api==1.27.0
opentelemetry-sdk==1.27.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ replacements:
before: '(?s)dependencies = \[.*?\]\nextras = \{\s*\}'
after: |
dependencies = [
"google-api-core[grpc] >= 2.17.1, <3.0.0",
"google-api-core[grpc] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
Expand Down Expand Up @@ -1397,9 +1397,9 @@ replacements:
"""Run all tests with core dependencies installed from source,
count: 1
- paths: [packages/google-cloud-spanner/testing/constraints-3.10.txt]
before: '(?s)protobuf==4.25.8\n(?!google-cloud-core)'
before: '(?s)protobuf==6.33.5\n(?!google-cloud-core)'
after: |
protobuf==4.25.8
protobuf==6.33.5
google-cloud-core==2.0.0
grpc-google-iam-v1==0.12.4
sqlparse==0.4.4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -640,12 +640,12 @@ replacements:
packages/google-cloud-storage/testing/constraints-3.10.txt
]
before: |
google-api-core==2.17.1
google-api-core==2.24.2
google-auth==2.14.1
grpcio==1.59.0
proto-plus==1.22.3
protobuf==4.25.8
grpc-google-iam-v1==0.14.0
proto-plus==1.26.1
protobuf==6.33.5
grpc-google-iam-v1==0.14.2
after: |
google-auth==2.26.1
# cryptography is a direct dependency of google-auth
Expand Down
2 changes: 1 addition & 1 deletion librarian.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
language: python
version: v0.19.0
version: v0.21.0
repo: googleapis/google-cloud-python
sources:
googleapis:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@

def parse_version_to_tuple(version_string: str):
"""Safely converts a semantic version string to a comparable tuple of integers.
Example: "4.25.8" -> (4, 25, 8)
Example: "6.33.5" -> (6, 33, 5)
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 Down Expand Up @@ -611,9 +611,9 @@ def _get_version(dependency_name):
return (None, "--")

_dependency_package = "google.protobuf"
_next_supported_version = "4.25.8"
_next_supported_version_tuple = (4, 25, 8)
_recommendation = " (we recommend 6.x)"
_next_supported_version = "6.33.5"
_next_supported_version_tuple = (6, 33, 5)
_recommendation = " (we recommend 7.x)"
(_version_used, _version_used_string) = _get_version(_dependency_package)
if _version_used and _version_used < _next_supported_version_tuple:
warnings.warn(
Expand Down
12 changes: 7 additions & 5 deletions packages/google-ads-admanager/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@
version = None

with open(os.path.join(package_root, "google/ads/admanager/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]

Expand All @@ -39,15 +42,14 @@
release_status = "Development Status :: 5 - Production/Stable"

dependencies = [
"google-api-core[grpc] >= 2.17.1, <3.0.0",
"google-api-core[grpc] >= 2.24.2, <3.0.0",
# Exclude incompatible versions of `google-auth`
# See https://github.com/googleapis/google-cloud-python/issues/12364
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
"grpcio >= 1.59.0, < 2.0.0",
"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
"proto-plus >= 1.22.3, <2.0.0",
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
"protobuf >= 4.25.8, < 8.0.0",
"proto-plus >= 1.26.1, <2.0.0",
"protobuf >= 6.33.5, < 8.0.0",
]
extras = {}
url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-ads-admanager"
Expand Down
6 changes: 3 additions & 3 deletions packages/google-ads-admanager/testing/constraints-3.10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
# pinning their versions to their lower bounds.
# For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
# then this file should have google-cloud-foo==1.14.0
google-api-core==2.17.1
google-api-core==2.24.2
google-auth==2.14.1
grpcio==1.59.0
proto-plus==1.22.3
protobuf==4.25.8
proto-plus==1.26.1
protobuf==6.33.5
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ google-api-core>=2
google-auth>=2
grpcio>=1
proto-plus>=1
protobuf>=6
protobuf>=7
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ google-api-core>=2
google-auth>=2
grpcio>=1
proto-plus>=1
protobuf>=6
protobuf>=7
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@

def parse_version_to_tuple(version_string: str):
"""Safely converts a semantic version string to a comparable tuple of integers.
Example: "4.25.8" -> (4, 25, 8)
Example: "6.33.5" -> (6, 33, 5)
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 Down Expand Up @@ -220,9 +220,9 @@ def _get_version(dependency_name):
return (None, "--")

_dependency_package = "google.protobuf"
_next_supported_version = "4.25.8"
_next_supported_version_tuple = (4, 25, 8)
_recommendation = " (we recommend 6.x)"
_next_supported_version = "6.33.5"
_next_supported_version_tuple = (6, 33, 5)
_recommendation = " (we recommend 7.x)"
(_version_used, _version_used_string) = _get_version(_dependency_package)
if _version_used and _version_used < _next_supported_version_tuple:
warnings.warn(
Expand Down
Loading
Loading