Skip to content

Commit

Permalink
fix!: update package names to avoid conflict with google-cloud-bigquery
Browse files Browse the repository at this point in the history
BREAKING CHANGE: update package names to avoid conflict with google-cloud-bigquery

The google-cloud-bigquery package uses the `google.cloud.bigquery` path as a
plain Python module, not a namespace package. When this package and
google-cloud-bigquery are installed in the same environment, conflicts can
result.

PiperOrigin-RevId: 339531446
  • Loading branch information
Google APIs authored and copybara-github committed Oct 28, 2020
1 parent a9dafb1 commit ab0498d
Showing 1 changed file with 6 additions and 42 deletions.
48 changes: 6 additions & 42 deletions google/cloud/bigquery/reservation/v1/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -144,62 +144,26 @@ go_gapic_assembly_pkg(
##############################################################################
# Python
##############################################################################
# This library is using Python microgenerator.
# DO NOT OVERRIDE this Python section with autogenerated rules.
load(
"@com_google_googleapis_imports//:imports.bzl",
"moved_proto_library",
"py_gapic_assembly_pkg",
"py_gapic_library",
"py_grpc_library",
"py_proto_library",
)

moved_proto_library(
name = "reservation_moved_proto",
srcs = [":reservation_proto"],
deps = [
"//google/api:annotations_proto",
"//google/api:client_proto",
"//google/api:field_behavior_proto",
"//google/api:resource_proto",
"//google/rpc:status_proto",
"@com_google_protobuf//:empty_proto",
"@com_google_protobuf//:field_mask_proto",
"@com_google_protobuf//:timestamp_proto",
],
)

py_proto_library(
name = "reservation_py_proto",
plugin = "@protoc_docs_plugin//:docs_plugin",
deps = [":reservation_moved_proto"],
)

py_grpc_library(
name = "reservation_py_grpc",
srcs = [":reservation_moved_proto"],
deps = [":reservation_py_proto"],
py_gapic_assembly_pkg = "py_gapic_assembly_pkg2",
py_gapic_library = "py_gapic_library2",
)

py_gapic_library(
name = "reservation_py_gapic",
src = ":reservation_proto_with_info",
gapic_yaml = "bigqueryreservation_gapic.yaml",
srcs = [":reservation_proto"],
grpc_service_config = "bigqueryreservation_grpc_service_config.json",
package = "google.cloud.bigquery.reservation.v1",
service_yaml = "bigqueryreservation_v1.yaml",
deps = [
":reservation_py_grpc",
":reservation_py_proto",
],
opt_args = ["python-gapic-namespace=google.cloud", "python-gapic-name=bigquery_reservation"],
)

# Open Source Packages
py_gapic_assembly_pkg(
name = "bigquery-reservation-v1-py",
deps = [
":reservation_py_gapic",
":reservation_py_grpc",
":reservation_py_proto",
],
)

Expand Down

0 comments on commit ab0498d

Please sign in to comment.