Skip to content

Commit

Permalink
fix: Use google.cloud.bigquery_biglake to avoid conflict with `goog…
Browse files Browse the repository at this point in the history
…le.cloud.bigquery` (#11403)

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
  • Loading branch information
3 people committed Jun 19, 2023
1 parent fe65e8b commit 20f83e0
Show file tree
Hide file tree
Showing 121 changed files with 1,023 additions and 1,038 deletions.
4 changes: 2 additions & 2 deletions packages/google-cloud-bigquery-biglake/.coveragerc
Expand Up @@ -4,8 +4,8 @@ branch = True
[report]
show_missing = True
omit =
google/cloud/bigquery/biglake/__init__.py
google/cloud/bigquery/biglake/gapic_version.py
google/cloud/bigquery_biglake/__init__.py
google/cloud/bigquery_biglake/gapic_version.py
exclude_lines =
# Re-enable the standard pragma
pragma: NO COVER
Expand Down
12 changes: 0 additions & 12 deletions packages/google-cloud-bigquery-biglake/CONTRIBUTING.rst
Expand Up @@ -239,18 +239,6 @@ Supported versions can be found in our ``noxfile.py`` `config`_.
.. _config: https://github.com/googleapis/google-cloud-python/blob/main/noxfile.py


We also explicitly decided to support Python 3 beginning with version 3.7.
Reasons for this include:

- Encouraging use of newest versions of Python 3
- Taking the lead of `prominent`_ open-source `projects`_
- `Unicode literal support`_ which allows for a cleaner codebase that
works in both Python 2 and Python 3

.. _prominent: https://docs.djangoproject.com/en/1.9/faq/install/#what-python-version-can-i-use-with-django
.. _projects: http://flask.pocoo.org/docs/0.10/python3/
.. _Unicode literal support: https://www.python.org/dev/peps/pep-0414/

**********
Versioning
**********
Expand Down
@@ -1,10 +1,10 @@
MetastoreService
----------------------------------

.. automodule:: google.cloud.bigquery.biglake_v1.services.metastore_service
.. automodule:: google.cloud.bigquery_biglake_v1.services.metastore_service
:members:
:inherited-members:

.. automodule:: google.cloud.bigquery.biglake_v1.services.metastore_service.pagers
.. automodule:: google.cloud.bigquery_biglake_v1.services.metastore_service.pagers
:members:
:inherited-members:
@@ -1,6 +1,6 @@
Types for Google Cloud Bigquery Biglake v1 API
==============================================

.. automodule:: google.cloud.bigquery.biglake_v1.types
.. automodule:: google.cloud.bigquery_biglake_v1.types
:members:
:show-inheritance:
@@ -1,10 +1,10 @@
MetastoreService
----------------------------------

.. automodule:: google.cloud.bigquery.biglake_v1alpha1.services.metastore_service
.. automodule:: google.cloud.bigquery_biglake_v1alpha1.services.metastore_service
:members:
:inherited-members:

.. automodule:: google.cloud.bigquery.biglake_v1alpha1.services.metastore_service.pagers
.. automodule:: google.cloud.bigquery_biglake_v1alpha1.services.metastore_service.pagers
:members:
:inherited-members:
@@ -1,6 +1,6 @@
Types for Google Cloud Bigquery Biglake v1alpha1 API
====================================================

.. automodule:: google.cloud.bigquery.biglake_v1alpha1.types
.. automodule:: google.cloud.bigquery_biglake_v1alpha1.types
:members:
:show-inheritance:
10 changes: 5 additions & 5 deletions packages/google-cloud-bigquery-biglake/docs/index.rst
Expand Up @@ -3,24 +3,24 @@
.. include:: multiprocessing.rst

This package includes clients for multiple versions of BigLake API.
By default, you will get version ``biglake_v1``.
By default, you will get version ``bigquery_biglake_v1``.


API Reference
-------------
.. toctree::
:maxdepth: 2

biglake_v1/services
biglake_v1/types
bigquery_biglake_v1/services
bigquery_biglake_v1/types

API Reference
-------------
.. toctree::
:maxdepth: 2

biglake_v1alpha1/services
biglake_v1alpha1/types
bigquery_biglake_v1alpha1/services
bigquery_biglake_v1alpha1/types


Changelog
Expand Down
Expand Up @@ -13,18 +13,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
from google.cloud.bigquery.biglake import gapic_version as package_version
from google.cloud.bigquery_biglake import gapic_version as package_version

__version__ = package_version.__version__


from google.cloud.bigquery.biglake_v1.services.metastore_service.async_client import (
from google.cloud.bigquery_biglake_v1.services.metastore_service.async_client import (
MetastoreServiceAsyncClient,
)
from google.cloud.bigquery.biglake_v1.services.metastore_service.client import (
from google.cloud.bigquery_biglake_v1.services.metastore_service.client import (
MetastoreServiceClient,
)
from google.cloud.bigquery.biglake_v1.types.metastore import (
from google.cloud.bigquery_biglake_v1.types.metastore import (
Catalog,
CreateCatalogRequest,
CreateDatabaseRequest,
Expand Down
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2023 Google LLC
# 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.
Expand All @@ -13,5 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

__version__ = "0.3.0" # {x-release-please-version}
__version__ = "0.1.0" # {x-release-please-version}
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
from google.cloud.bigquery.biglake_v1 import gapic_version as package_version
from google.cloud.bigquery_biglake_v1 import gapic_version as package_version

__version__ = package_version.__version__

Expand Down
@@ -1,7 +1,7 @@
{
"comment": "This file maps proto services/RPCs to the corresponding library clients/methods",
"language": "python",
"libraryPackage": "google.cloud.bigquery.biglake_v1",
"libraryPackage": "google.cloud.bigquery_biglake_v1",
"protoPackage": "google.cloud.bigquery.biglake.v1",
"schema": "1.0",
"services": {
Expand Down
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2023 Google LLC
# 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.
Expand All @@ -13,5 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

__version__ = "0.3.0" # {x-release-please-version}
__version__ = "0.1.0" # {x-release-please-version}

0 comments on commit 20f83e0

Please sign in to comment.