diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 7d35f2a0..ebce0b43 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,4 +1,4 @@ { - ".": "2.33.0" + ".": "2.33.1" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index f81bef13..2efd00b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ [1]: https://pypi.org/project/google-cloud-bigquery-storage/#history +## [2.33.1](https://github.com/googleapis/python-bigquery-storage/compare/v2.33.0...v2.33.1) (2025-09-08) + + +### Bug Fixes + +* **deps:** Exclude google-auth 2.24.0 and 2.25.0 ([5b60dd4](https://github.com/googleapis/python-bigquery-storage/commit/5b60dd4ebf838f08e382cac12a6c84e1e0286862)) +* **deps:** Require google-api-core >= 1.34.1 ([5b60dd4](https://github.com/googleapis/python-bigquery-storage/commit/5b60dd4ebf838f08e382cac12a6c84e1e0286862)) +* **deps:** Require proto-plus >= 1.22.3 ([5b60dd4](https://github.com/googleapis/python-bigquery-storage/commit/5b60dd4ebf838f08e382cac12a6c84e1e0286862)) + ## [2.33.0](https://github.com/googleapis/python-bigquery-storage/compare/v2.32.0...v2.33.0) (2025-09-02) diff --git a/google/cloud/bigquery_storage/gapic_version.py b/google/cloud/bigquery_storage/gapic_version.py index 0c5de5c0..78406dbe 100644 --- a/google/cloud/bigquery_storage/gapic_version.py +++ b/google/cloud/bigquery_storage/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.33.0" # {x-release-please-version} +__version__ = "2.33.1" # {x-release-please-version} diff --git a/google/cloud/bigquery_storage_v1/gapic_version.py b/google/cloud/bigquery_storage_v1/gapic_version.py index 0c5de5c0..78406dbe 100644 --- a/google/cloud/bigquery_storage_v1/gapic_version.py +++ b/google/cloud/bigquery_storage_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.33.0" # {x-release-please-version} +__version__ = "2.33.1" # {x-release-please-version} diff --git a/google/cloud/bigquery_storage_v1/types/__init__.py b/google/cloud/bigquery_storage_v1/types/__init__.py index ab9f210a..93a69b9b 100644 --- a/google/cloud/bigquery_storage_v1/types/__init__.py +++ b/google/cloud/bigquery_storage_v1/types/__init__.py @@ -68,7 +68,6 @@ "StorageError", "StreamStats", "ThrottleState", - "DataFormat", "ReadSession", "ReadStream", "WriteStream", diff --git a/google/cloud/bigquery_storage_v1alpha/gapic_version.py b/google/cloud/bigquery_storage_v1alpha/gapic_version.py index 0c5de5c0..78406dbe 100644 --- a/google/cloud/bigquery_storage_v1alpha/gapic_version.py +++ b/google/cloud/bigquery_storage_v1alpha/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.33.0" # {x-release-please-version} +__version__ = "2.33.1" # {x-release-please-version} diff --git a/google/cloud/bigquery_storage_v1beta/gapic_version.py b/google/cloud/bigquery_storage_v1beta/gapic_version.py index 1eb64a9d..1b568355 100644 --- a/google/cloud/bigquery_storage_v1beta/gapic_version.py +++ b/google/cloud/bigquery_storage_v1beta/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.33.0" # {x-release-please-version} +__version__ = "2.33.1" # {x-release-please-version} diff --git a/google/cloud/bigquery_storage_v1beta2/gapic_version.py b/google/cloud/bigquery_storage_v1beta2/gapic_version.py index 0c5de5c0..78406dbe 100644 --- a/google/cloud/bigquery_storage_v1beta2/gapic_version.py +++ b/google/cloud/bigquery_storage_v1beta2/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.33.0" # {x-release-please-version} +__version__ = "2.33.1" # {x-release-please-version} diff --git a/google/cloud/bigquery_storage_v1beta2/types/__init__.py b/google/cloud/bigquery_storage_v1beta2/types/__init__.py index c3b74e54..98d72add 100644 --- a/google/cloud/bigquery_storage_v1beta2/types/__init__.py +++ b/google/cloud/bigquery_storage_v1beta2/types/__init__.py @@ -65,7 +65,6 @@ "StorageError", "StreamStats", "ThrottleState", - "DataFormat", "ReadSession", "ReadStream", "WriteStream", diff --git a/owlbot.py b/owlbot.py index 646c9df3..ac142d25 100644 --- a/owlbot.py +++ b/owlbot.py @@ -76,18 +76,6 @@ ), ) - # The DataFormat enum is not exposed in bigquery_storage_v1/types, add it there. - assert 1 == s.replace( - library / f"google/cloud/bigquery_storage_{library.name}*/types/__init__.py", - r"from \.stream import \(", - "\\g<0>\n DataFormat,", - ) - assert 1 == s.replace( - library / f"google/cloud/bigquery_storage_{library.name}*/types/__init__.py", - r"""["']ReadSession["']""", - '"DataFormat",\n \\g<0>', - ) - # Expose handwritten classes AppendRowsStream and ReadRowsStream here. assert 1 == s.replace( library / "google/cloud/bigquery_storage/__init__.py", diff --git a/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1.json b/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1.json index e7eaf5fe..de32aa4b 100644 --- a/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-bigquery-storage", - "version": "2.33.0" + "version": "2.33.1" }, "snippets": [ { diff --git a/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1beta2.json b/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1beta2.json index db1af5cb..1d65641c 100644 --- a/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1beta2.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.bigquery.storage.v1beta2.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-bigquery-storage", - "version": "2.33.0" + "version": "2.33.1" }, "snippets": [ { diff --git a/samples/pyarrow/requirements-test.txt b/samples/pyarrow/requirements-test.txt index 7561ed55..7e60ddb9 100644 --- a/samples/pyarrow/requirements-test.txt +++ b/samples/pyarrow/requirements-test.txt @@ -1,3 +1,3 @@ pytest===7.4.3; python_version == '3.7' pytest===8.3.5; python_version == '3.8' -pytest==8.4.1; python_version >= '3.9' +pytest==8.4.2; python_version >= '3.9' diff --git a/samples/quickstart/requirements-test.txt b/samples/quickstart/requirements-test.txt index 7561ed55..7e60ddb9 100644 --- a/samples/quickstart/requirements-test.txt +++ b/samples/quickstart/requirements-test.txt @@ -1,3 +1,3 @@ pytest===7.4.3; python_version == '3.7' pytest===8.3.5; python_version == '3.8' -pytest==8.4.1; python_version >= '3.9' +pytest==8.4.2; python_version >= '3.9' diff --git a/samples/quickstart/requirements.txt b/samples/quickstart/requirements.txt index 7ddaaef7..cc98abd3 100644 --- a/samples/quickstart/requirements.txt +++ b/samples/quickstart/requirements.txt @@ -1,2 +1,2 @@ fastavro -google-cloud-bigquery-storage==2.32.0 +google-cloud-bigquery-storage==2.33.0 diff --git a/samples/snippets/requirements-test.txt b/samples/snippets/requirements-test.txt index 230ca56d..4e4f7364 100644 --- a/samples/snippets/requirements-test.txt +++ b/samples/snippets/requirements-test.txt @@ -1,4 +1,4 @@ google-cloud-testutils==1.6.4 pytest===7.4.3; python_version == '3.7' pytest===8.3.5; python_version == '3.8' -pytest==8.4.1; python_version >= '3.9' +pytest==8.4.2; python_version >= '3.9' diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt index cab18ea2..e9bcafd7 100644 --- a/samples/snippets/requirements.txt +++ b/samples/snippets/requirements.txt @@ -1,6 +1,6 @@ -google-cloud-bigquery-storage==2.32.0 +google-cloud-bigquery-storage==2.33.0 google-cloud-bigquery===3.30.0; python_version <= '3.8' google-cloud-bigquery==3.36.0; python_version >= '3.9' pytest===7.4.3; python_version == '3.7' pytest===8.3.5; python_version == '3.8' -pytest==8.4.1; python_version >= '3.9' +pytest==8.4.2; python_version >= '3.9' diff --git a/samples/to_dataframe/requirements-test.txt b/samples/to_dataframe/requirements-test.txt index 7561ed55..7e60ddb9 100644 --- a/samples/to_dataframe/requirements-test.txt +++ b/samples/to_dataframe/requirements-test.txt @@ -1,3 +1,3 @@ pytest===7.4.3; python_version == '3.7' pytest===8.3.5; python_version == '3.8' -pytest==8.4.1; python_version >= '3.9' +pytest==8.4.2; python_version >= '3.9' diff --git a/samples/to_dataframe/requirements.txt b/samples/to_dataframe/requirements.txt index 15e8e85c..ece37ce4 100644 --- a/samples/to_dataframe/requirements.txt +++ b/samples/to_dataframe/requirements.txt @@ -1,5 +1,5 @@ google-auth==2.40.3 -google-cloud-bigquery-storage==2.32.0 +google-cloud-bigquery-storage==2.33.0 google-cloud-bigquery===3.30.0; python_version <= '3.8' google-cloud-bigquery==3.36.0; python_version >= '3.9' pyarrow===12.0.1; python_version == '3.7' @@ -9,7 +9,7 @@ ipython===7.31.1; python_version == '3.7' ipython===8.10.0; python_version == '3.8' ipython===8.18.1; python_version == '3.9' ipython===8.33.0; python_version == '3.10' -ipython==9.4.0; python_version >= '3.11' +ipython==9.5.0; python_version >= '3.11' ipywidgets==8.1.7 pandas===1.3.5; python_version == '3.7' pandas===2.0.3; python_version == '3.8' diff --git a/setup.py b/setup.py index 764c8b8b..94e2b66e 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2022 Google LLC +# Copyright 2025 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ # import io import os +import re import setuptools # type: ignore @@ -25,12 +26,14 @@ description = "Google Cloud Bigquery Storage API client library" -version = {} +version = None + with open( os.path.join(package_root, "google/cloud/bigquery_storage/gapic_version.py") ) as fp: - exec(fp.read(), version) -version = version["__version__"] + version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read()) + assert len(version_candidates) == 1 + version = version_candidates[0] if version[0] == "0": release_status = "Development Status :: 4 - Beta" @@ -38,12 +41,13 @@ release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "google-api-core[grpc] >= 1.34.0, <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.*", - "google-auth >= 2.14.1, <3.0.0", - "proto-plus >= 1.22.0, <2.0.0", - "proto-plus >= 1.22.2, <2.0.0; python_version>='3.11'", - "proto-plus >= 1.25.0, <2.0.0; python_version>='3.13'", - "protobuf>=3.20.2,<7.0.0,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", + "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.*", + # 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", + "proto-plus >= 1.22.3, <2.0.0", + "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", + "protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", ] extras = { # 'importlib-metadata' is required for Python 3.7 compatibility @@ -95,7 +99,6 @@ python_requires=">=3.7", install_requires=dependencies, extras_require=extras, - scripts=["scripts/fixup_bigquery_storage_v1_keywords.py"], include_package_data=True, zip_safe=False, ) diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt index 7dccdd4f..450b2fa1 100644 --- a/testing/constraints-3.7.txt +++ b/testing/constraints-3.7.txt @@ -2,11 +2,11 @@ # are correct in setup.py # List all library dependencies and extras in this file. # Pin the version to the lower bound. -# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev", +# e.g., 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==1.34.0 +google-api-core==1.34.1 google-auth==2.14.1 -proto-plus==1.22.0 +proto-plus==1.22.3 libcst==0.2.5 fastavro==0.21.2 pandas==1.0.5