From 8eb2c88d01eaa8a77c2f5fb242bd3e506870f8e1 Mon Sep 17 00:00:00 2001 From: Mariatta Wijaya Date: Wed, 26 Apr 2023 10:46:12 -0600 Subject: [PATCH 1/2] fix: expose Count, FieldFilter, Or, and And to firestore module (#706) Expose the `Count`, `FieldFilter`, `Or`, and `And` to the `firestore` module from the `firestore_v1`. --- google/cloud/firestore/__init__.py | 8 ++++++++ google/cloud/firestore_v1/__init__.py | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/google/cloud/firestore/__init__.py b/google/cloud/firestore/__init__.py index fb974af783..79095778db 100644 --- a/google/cloud/firestore/__init__.py +++ b/google/cloud/firestore/__init__.py @@ -19,6 +19,7 @@ __version__ = package_version.__version__ +from google.cloud.firestore_v1 import And from google.cloud.firestore_v1 import ArrayRemove from google.cloud.firestore_v1 import ArrayUnion from google.cloud.firestore_v1 import AsyncClient @@ -29,6 +30,7 @@ from google.cloud.firestore_v1 import AsyncTransaction from google.cloud.firestore_v1 import AsyncWriteBatch from google.cloud.firestore_v1 import Client +from google.cloud.firestore_v1 import CountAggregation from google.cloud.firestore_v1 import CollectionGroup from google.cloud.firestore_v1 import CollectionReference from google.cloud.firestore_v1 import DELETE_FIELD @@ -36,11 +38,13 @@ from google.cloud.firestore_v1 import DocumentSnapshot from google.cloud.firestore_v1 import DocumentTransform from google.cloud.firestore_v1 import ExistsOption +from google.cloud.firestore_v1 import FieldFilter from google.cloud.firestore_v1 import GeoPoint from google.cloud.firestore_v1 import Increment from google.cloud.firestore_v1 import LastUpdateOption from google.cloud.firestore_v1 import Maximum from google.cloud.firestore_v1 import Minimum +from google.cloud.firestore_v1 import Or from google.cloud.firestore_v1 import Query from google.cloud.firestore_v1 import ReadAfterWriteError from google.cloud.firestore_v1 import SERVER_TIMESTAMP @@ -55,6 +59,7 @@ __all__: List[str] = [ "__version__", + "And", "ArrayRemove", "ArrayUnion", "AsyncClient", @@ -65,6 +70,7 @@ "AsyncTransaction", "AsyncWriteBatch", "Client", + "CountAggregation", "CollectionGroup", "CollectionReference", "DELETE_FIELD", @@ -72,11 +78,13 @@ "DocumentSnapshot", "DocumentTransform", "ExistsOption", + "FieldFilter", "GeoPoint", "Increment", "LastUpdateOption", "Maximum", "Minimum", + "Or", "Query", "ReadAfterWriteError", "SERVER_TIMESTAMP", diff --git a/google/cloud/firestore_v1/__init__.py b/google/cloud/firestore_v1/__init__.py index 3ad2740b69..1d143556fe 100644 --- a/google/cloud/firestore_v1/__init__.py +++ b/google/cloud/firestore_v1/__init__.py @@ -29,6 +29,10 @@ from google.cloud.firestore_v1._helpers import LastUpdateOption from google.cloud.firestore_v1._helpers import ReadAfterWriteError from google.cloud.firestore_v1._helpers import WriteOption +from google.cloud.firestore_v1.base_aggregation import CountAggregation +from google.cloud.firestore_v1.base_query import And +from google.cloud.firestore_v1.base_query import FieldFilter +from google.cloud.firestore_v1.base_query import Or from google.cloud.firestore_v1.async_batch import AsyncWriteBatch from google.cloud.firestore_v1.async_client import AsyncClient from google.cloud.firestore_v1.async_collection import AsyncCollectionReference @@ -107,6 +111,7 @@ __all__: List[str] = [ "__version__", + "And", "ArrayRemove", "ArrayUnion", "AsyncClient", @@ -117,6 +122,7 @@ "AsyncTransaction", "AsyncWriteBatch", "Client", + "CountAggregation", "CollectionGroup", "CollectionReference", "DELETE_FIELD", @@ -124,11 +130,13 @@ "DocumentSnapshot", "DocumentTransform", "ExistsOption", + "FieldFilter", "GeoPoint", "Increment", "LastUpdateOption", "Maximum", "Minimum", + "Or", "Query", "ReadAfterWriteError", "SERVER_TIMESTAMP", From 15872858332b56fefcb40fdfbc4df9320cd5ed75 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 26 Apr 2023 11:02:16 -0600 Subject: [PATCH 2/2] chore(main): release 2.11.1 (#708) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .release-please-manifest.json | 2 +- CHANGELOG.md | 7 +++++++ google/cloud/firestore/gapic_version.py | 2 +- google/cloud/firestore_admin_v1/gapic_version.py | 2 +- google/cloud/firestore_bundle/gapic_version.py | 2 +- google/cloud/firestore_v1/gapic_version.py | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 4de8919570..7c0e7e00ec 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "2.11.0" + ".": "2.11.1" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b24375860..2dff8a00ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ [1]: https://pypi.org/project/google-cloud-firestore/#history +## [2.11.1](https://github.com/googleapis/python-firestore/compare/v2.11.0...v2.11.1) (2023-04-26) + + +### Bug Fixes + +* Expose Count, FieldFilter, Or, and And to firestore module ([#706](https://github.com/googleapis/python-firestore/issues/706)) ([8eb2c88](https://github.com/googleapis/python-firestore/commit/8eb2c88d01eaa8a77c2f5fb242bd3e506870f8e1)) + ## [2.11.0](https://github.com/googleapis/python-firestore/compare/v2.10.1...v2.11.0) (2023-04-03) diff --git a/google/cloud/firestore/gapic_version.py b/google/cloud/firestore/gapic_version.py index bb74f811a5..9ac1d4a820 100644 --- a/google/cloud/firestore/gapic_version.py +++ b/google/cloud/firestore/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.11.0" # {x-release-please-version} +__version__ = "2.11.1" # {x-release-please-version} diff --git a/google/cloud/firestore_admin_v1/gapic_version.py b/google/cloud/firestore_admin_v1/gapic_version.py index bb74f811a5..9ac1d4a820 100644 --- a/google/cloud/firestore_admin_v1/gapic_version.py +++ b/google/cloud/firestore_admin_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.11.0" # {x-release-please-version} +__version__ = "2.11.1" # {x-release-please-version} diff --git a/google/cloud/firestore_bundle/gapic_version.py b/google/cloud/firestore_bundle/gapic_version.py index bb74f811a5..9ac1d4a820 100644 --- a/google/cloud/firestore_bundle/gapic_version.py +++ b/google/cloud/firestore_bundle/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.11.0" # {x-release-please-version} +__version__ = "2.11.1" # {x-release-please-version} diff --git a/google/cloud/firestore_v1/gapic_version.py b/google/cloud/firestore_v1/gapic_version.py index bb74f811a5..9ac1d4a820 100644 --- a/google/cloud/firestore_v1/gapic_version.py +++ b/google/cloud/firestore_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.11.0" # {x-release-please-version} +__version__ = "2.11.1" # {x-release-please-version}