diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 258342d..d9d5699 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.5.2" + ".": "0.5.3" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 4102412..4dc04f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.5.3](https://github.com/googleapis/python-bigquery-data-exchange/compare/v0.5.2...v0.5.3) (2023-04-13) + + +### Bug Fixes + +* Remove `common` module ([#71](https://github.com/googleapis/python-bigquery-data-exchange/issues/71)) ([3bed959](https://github.com/googleapis/python-bigquery-data-exchange/commit/3bed9598d04e9c67e3ef3208d4ff5ff21b1779f6)) + ## [0.5.2](https://github.com/googleapis/python-bigquery-data-exchange/compare/v0.5.1...v0.5.2) (2023-03-23) diff --git a/docs/common/services.rst b/docs/common/services.rst deleted file mode 100644 index 6ccbbca..0000000 --- a/docs/common/services.rst +++ /dev/null @@ -1,4 +0,0 @@ -Services for Google Cloud Bigquery_data_exchange Common API -============================================================ -.. toctree:: - :maxdepth: 2 diff --git a/docs/common/types.rst b/docs/common/types.rst deleted file mode 100644 index 0e21d83..0000000 --- a/docs/common/types.rst +++ /dev/null @@ -1,7 +0,0 @@ -Types for Google Cloud Bigquery_data_exchange Common API -========================================================= - -.. automodule:: google.cloud.bigquery_data_exchange_v1beta1.common.types - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/index.rst b/docs/index.rst index 0de180d..71b845e 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -10,8 +10,6 @@ API Reference bigquery_data_exchange_v1beta1/services bigquery_data_exchange_v1beta1/types - common/services - common/types Changelog diff --git a/google/cloud/bigquery_data_exchange/gapic_version.py b/google/cloud/bigquery_data_exchange/gapic_version.py index 5c451c1..80dd2c5 100644 --- a/google/cloud/bigquery_data_exchange/gapic_version.py +++ b/google/cloud/bigquery_data_exchange/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.5.2" # {x-release-please-version} +__version__ = "0.5.3" # {x-release-please-version} diff --git a/google/cloud/bigquery_data_exchange_v1beta1/common/__init__.py b/google/cloud/bigquery_data_exchange_v1beta1/common/__init__.py deleted file mode 100644 index 552da12..0000000 --- a/google/cloud/bigquery_data_exchange_v1beta1/common/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -from .types.common import Category - -__all__ = ("Category",) diff --git a/google/cloud/bigquery_data_exchange_v1beta1/common/gapic_metadata.json b/google/cloud/bigquery_data_exchange_v1beta1/common/gapic_metadata.json deleted file mode 100644 index a8d200e..0000000 --- a/google/cloud/bigquery_data_exchange_v1beta1/common/gapic_metadata.json +++ /dev/null @@ -1,7 +0,0 @@ - { - "comment": "This file maps proto services/RPCs to the corresponding library clients/methods", - "language": "python", - "libraryPackage": "google.cloud.bigquery_data_exchange.common", - "protoPackage": "google.cloud.bigquery.dataexchange.common", - "schema": "1.0" -} diff --git a/google/cloud/bigquery_data_exchange_v1beta1/common/gapic_version.py b/google/cloud/bigquery_data_exchange_v1beta1/common/gapic_version.py deleted file mode 100644 index 5c451c1..0000000 --- a/google/cloud/bigquery_data_exchange_v1beta1/common/gapic_version.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -__version__ = "0.5.2" # {x-release-please-version} diff --git a/google/cloud/bigquery_data_exchange_v1beta1/common/py.typed b/google/cloud/bigquery_data_exchange_v1beta1/common/py.typed deleted file mode 100644 index b83e5e5..0000000 --- a/google/cloud/bigquery_data_exchange_v1beta1/common/py.typed +++ /dev/null @@ -1,2 +0,0 @@ -# Marker file for PEP 561. -# The google-cloud-bigquery-data-exchange-common package uses inline types. diff --git a/google/cloud/bigquery_data_exchange_v1beta1/common/services/__init__.py b/google/cloud/bigquery_data_exchange_v1beta1/common/services/__init__.py deleted file mode 100644 index e8e1c38..0000000 --- a/google/cloud/bigquery_data_exchange_v1beta1/common/services/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# diff --git a/google/cloud/bigquery_data_exchange_v1beta1/common/types/__init__.py b/google/cloud/bigquery_data_exchange_v1beta1/common/types/__init__.py deleted file mode 100644 index 107dd05..0000000 --- a/google/cloud/bigquery_data_exchange_v1beta1/common/types/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -__all__ = ("Category",) diff --git a/google/cloud/bigquery_data_exchange_v1beta1/common/types/common.py b/google/cloud/bigquery_data_exchange_v1beta1/common/types/common.py deleted file mode 100644 index 276d75d..0000000 --- a/google/cloud/bigquery_data_exchange_v1beta1/common/types/common.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -import proto # type: ignore - -__protobuf__ = proto.module( - package="google.cloud.bigquery.dataexchange.common", - manifest={ - "Category", - }, -) - - -class Category(proto.Enum): - r"""Listing categories.""" - CATEGORY_UNSPECIFIED = 0 - CATEGORY_OTHERS = 1 - CATEGORY_ADVERTISING_AND_MARKETING = 2 - CATEGORY_COMMERCE = 3 - CATEGORY_CLIMATE_AND_ENVIRONMENT = 4 - CATEGORY_DEMOGRAPHICS = 5 - CATEGORY_ECONOMICS = 6 - CATEGORY_EDUCATION = 7 - CATEGORY_ENERGY = 8 - CATEGORY_FINANCIAL = 9 - CATEGORY_GAMING = 10 - CATEGORY_GEOSPATIAL = 11 - CATEGORY_HEALTHCARE_AND_LIFE_SCIENCE = 12 - CATEGORY_MEDIA = 13 - CATEGORY_PUBLIC_SECTOR = 14 - CATEGORY_RETAIL = 15 - CATEGORY_SPORTS = 16 - CATEGORY_SCIENCE_AND_RESEARCH = 17 - CATEGORY_TRANSPORTATION_AND_LOGISTICS = 18 - CATEGORY_TRAVEL_AND_TOURISM = 19 - - -__all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/google/cloud/bigquery_data_exchange_v1beta1/gapic_version.py b/google/cloud/bigquery_data_exchange_v1beta1/gapic_version.py index 5c451c1..80dd2c5 100644 --- a/google/cloud/bigquery_data_exchange_v1beta1/gapic_version.py +++ b/google/cloud/bigquery_data_exchange_v1beta1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.5.2" # {x-release-please-version} +__version__ = "0.5.3" # {x-release-please-version} diff --git a/owlbot.py b/owlbot.py index a3a4af1..ce738f0 100644 --- a/owlbot.py +++ b/owlbot.py @@ -35,43 +35,7 @@ if clean_up_generated_samples: shutil.rmtree("samples/generated_samples", ignore_errors=True) clean_up_generated_samples = False - - s.replace( - [ - library / f"google/cloud/bigquery_data_exchange_{library.name}/**/*.py", - library / f"tests/unit/gapic/bigquery_data_exchange_{library.name}/**/*.py", - ], - f"from google.cloud.bigquery.dataexchange.common import common_pb2", - f"from google.cloud.bigquery_data_exchange_{library.name} import common", - ) - s.replace( - library / f"google/cloud/bigquery_data_exchange_{library.name}/**/*.py", - "google.cloud.bigquery.dataexchange.common.common_pb2.Category", - f"google.cloud.bigquery_data_exchange_{library.name}.common.Category", - ) - s.replace( - library / f"docs/common/types.rst", - "google.cloud.bigquery.data_exchange.common.types", - f"google.cloud.bigquery_data_exchange_{library.name}.common.types", - ) - s.replace( - [ - library / f"google/cloud/bigquery_data_exchange_{library.name}/**/*.py", - library / f"tests/unit/gapic/bigquery_data_exchange_{library.name}/**/*.py", - ], - "common_pb2", - "common", - ) - s.move( - library / "google/cloud/bigquery_data_exchange/common", - library / "google/cloud/bigquery_data_exchange_v1beta1/common", - ) - s.move( - library, - excludes=[ - "docs/index.rst", "**/gapic_version.py" - ], - ) + s.move([library], excludes=["**/gapic_version.py"]) s.remove_staging_dirs() # ---------------------------------------------------------------------------- @@ -83,23 +47,10 @@ microgenerator=True, versions=gcp.common.detect_versions(path="./google", default_first=True), ) -s.move( - templated_files, - excludes=[ - ".coveragerc", # the microgenerator has a good coveragerc file - ".github/auto-label.yaml", # the templated file is missing a license header - "docs/index.rst", # there is an additional module common which is added - ".github/release-please.yml", # configure release-please to use manifest - ], -) +s.move(templated_files, excludes=[".coveragerc", ".github/release-please.yml"]) python.py_samples(skip_readmes=True) -# ---------------------------------------------------------------------------- -# Run format session -# ---------------------------------------------------------------------------- - # run format session for all directories which have a noxfile for noxfile in Path(".").glob("**/noxfile.py"): s.shell.run(["nox", "-s", "format"], cwd=noxfile.parent, hide_output=False) - diff --git a/samples/generated_samples/snippet_metadata_google.cloud.bigquery.dataexchange.v1beta1.json b/samples/generated_samples/snippet_metadata_google.cloud.bigquery.dataexchange.v1beta1.json index 4943ca1..a8af747 100644 --- a/samples/generated_samples/snippet_metadata_google.cloud.bigquery.dataexchange.v1beta1.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.bigquery.dataexchange.v1beta1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-bigquery-data-exchange", - "version": "0.5.2" + "version": "0.5.3" }, "snippets": [ { diff --git a/tests/unit/gapic/common/__init__.py b/tests/unit/gapic/common/__init__.py deleted file mode 100644 index e8e1c38..0000000 --- a/tests/unit/gapic/common/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#