diff --git a/.librarian/generator-input/client-post-processing/bigtable-integration.yaml b/.librarian/generator-input/client-post-processing/bigtable-integration.yaml index b2edca54a00c..ae96f7317dff 100644 --- a/.librarian/generator-input/client-post-processing/bigtable-integration.yaml +++ b/.librarian/generator-input/client-post-processing/bigtable-integration.yaml @@ -194,12 +194,12 @@ replacements: packages/google-cloud-bigtable/setup.py, ] before: | - "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", + "grpc-google-iam-v1 >= 0.14.2, <1.0.0", "google-crc32c>=1.6.0, <2.0.0dev", ] count: 1 @@ -207,12 +207,12 @@ 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 + grpc-google-iam-v1==0.14.2 google-crc32c==1.6.0 google-auth==2.14.1 count: 1 diff --git a/.release-please-bulk-manifest.json b/.release-please-bulk-manifest.json index 9f50239c8d86..bc3c2dc05cb8 100644 --- a/.release-please-bulk-manifest.json +++ b/.release-please-bulk-manifest.json @@ -64,6 +64,7 @@ "packages/google-cloud-bigquery-migration": "0.15.0", "packages/google-cloud-bigquery-reservation": "1.25.0", "packages/google-cloud-bigquery-storage": "2.39.0", + "packages/google-cloud-bigtable": "2.39.0", "packages/google-cloud-billing": "1.20.0", "packages/google-cloud-billing-budgets": "1.21.0", "packages/google-cloud-binary-authorization": "1.17.0", diff --git a/.release-please-individual-manifest.json b/.release-please-individual-manifest.json index aaee0777a123..e0d1268f2501 100644 --- a/.release-please-individual-manifest.json +++ b/.release-please-individual-manifest.json @@ -1,6 +1,5 @@ { "packages/bigframes": "2.43.0", - "packages/google-cloud-bigtable": "2.39.0", "packages/google-crc32c": "1.8.0", "packages/pandas-gbq": "0.35.0", "packages/sqlalchemy-bigquery": "1.17.0" diff --git a/librarian.yaml b/librarian.yaml index 6834aed84713..21a07d2dbf91 100644 --- a/librarian.yaml +++ b/librarian.yaml @@ -636,8 +636,6 @@ libraries: apis: - path: google/bigtable/v2 - path: google/bigtable/admin/v2 - skip_generate: true - skip_release: true python: library_type: GAPIC_COMBO opt_args_by_api: diff --git a/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/__init__.py b/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/__init__.py index ba8a489befb4..cce3f00aa270 100644 --- a/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/__init__.py +++ b/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/__init__.py @@ -185,7 +185,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" @@ -214,9 +214,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( diff --git a/packages/google-cloud-bigtable/google/cloud/bigtable_v2/__init__.py b/packages/google-cloud-bigtable/google/cloud/bigtable_v2/__init__.py index 2912b389aced..29d6dfdc1c76 100644 --- a/packages/google-cloud-bigtable/google/cloud/bigtable_v2/__init__.py +++ b/packages/google-cloud-bigtable/google/cloud/bigtable_v2/__init__.py @@ -148,7 +148,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" @@ -177,9 +177,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( diff --git a/packages/google-cloud-bigtable/setup.py b/packages/google-cloud-bigtable/setup.py index af210c742f7c..cc161af33de1 100644 --- a/packages/google-cloud-bigtable/setup.py +++ b/packages/google-cloud-bigtable/setup.py @@ -29,7 +29,10 @@ version = None with open(os.path.join(package_root, "google/cloud/bigtable/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] @@ -39,17 +42,16 @@ 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", "google-cloud-core >= 2.0.0, <3.0.0", - "grpc-google-iam-v1 >= 0.14.0, <1.0.0", + "grpc-google-iam-v1 >= 0.14.2, <1.0.0", "google-crc32c>=1.6.0, <2.0.0dev", ] extras = { diff --git a/packages/google-cloud-bigtable/testing/constraints-3.10.txt b/packages/google-cloud-bigtable/testing/constraints-3.10.txt index 3c682654e6fa..46c9f96012d1 100644 --- a/packages/google-cloud-bigtable/testing/constraints-3.10.txt +++ b/packages/google-cloud-bigtable/testing/constraints-3.10.txt @@ -4,11 +4,11 @@ # 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-cloud-core==2.0.0 -grpc-google-iam-v1==0.14.0 +grpc-google-iam-v1==0.14.2 google-crc32c==1.6.0 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 diff --git a/packages/google-cloud-bigtable/testing/constraints-3.13.txt b/packages/google-cloud-bigtable/testing/constraints-3.13.txt index 1e93c60e50aa..6bd7e1f5b03d 100644 --- a/packages/google-cloud-bigtable/testing/constraints-3.13.txt +++ b/packages/google-cloud-bigtable/testing/constraints-3.13.txt @@ -9,4 +9,4 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 diff --git a/packages/google-cloud-bigtable/testing/constraints-3.14.txt b/packages/google-cloud-bigtable/testing/constraints-3.14.txt index 1e93c60e50aa..6bd7e1f5b03d 100644 --- a/packages/google-cloud-bigtable/testing/constraints-3.14.txt +++ b/packages/google-cloud-bigtable/testing/constraints-3.14.txt @@ -9,4 +9,4 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 diff --git a/release-please-bulk-config.json b/release-please-bulk-config.json index 6412e6a14956..465a7f61eee4 100644 --- a/release-please-bulk-config.json +++ b/release-please-bulk-config.json @@ -795,6 +795,20 @@ } ] }, + "packages/google-cloud-bigtable": { + "component": "google-cloud-bigtable", + "extra-files": [ + "google/cloud/bigtable/gapic_version.py", + "google/cloud/bigtable_admin/gapic_version.py", + "google/cloud/bigtable_admin_v2/gapic_version.py", + "google/cloud/bigtable_v2/gapic_version.py", + { + "jsonpath": "$.clientLibrary.version", + "path": "samples/generated_samples/snippet_metadata_google.bigtable.admin.v2.json", + "type": "json" + } + ] + }, "packages/google-cloud-billing": { "component": "google-cloud-billing", "extra-files": [ diff --git a/release-please-individual-config.json b/release-please-individual-config.json index 2102f5406bde..f9abdc852d2a 100644 --- a/release-please-individual-config.json +++ b/release-please-individual-config.json @@ -5,20 +5,6 @@ "packages/bigframes": { "component": "bigframes" }, - "packages/google-cloud-bigtable": { - "component": "google-cloud-bigtable", - "extra-files": [ - "google/cloud/bigtable/gapic_version.py", - "google/cloud/bigtable_admin/gapic_version.py", - "google/cloud/bigtable_admin_v2/gapic_version.py", - "google/cloud/bigtable_v2/gapic_version.py", - { - "jsonpath": "$.clientLibrary.version", - "path": "samples/generated_samples/snippet_metadata_google.bigtable.admin.v2.json", - "type": "json" - } - ] - }, "packages/google-crc32c": { "component": "google-crc32c" },