Integrate Python GAPIC Microgenerator in googleapis.

Google APIs · copybara-github · commit e0f9d9e1f9de · 2020-05-04T15:07:15.000-07:00
This PR uses using documentai as an example. Depends on googleapis/gapic-generator-python#402 PiperOrigin-RevId: 309824146
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -10,5 +10,5 @@ source .kokoro/setup.sh
 #
 # Run build and tests
 #
-${BAZEL} --output_user_root=${BAZEL_ROOT} build --keep_going //...
-${BAZEL} --output_user_root=${BAZEL_ROOT} test --flaky_test_attempts=3 --keep_going //...
+${BAZEL} --output_user_root=${BAZEL_ROOT} build --keep_going //... ${EXTRA_BUILD_FAGS}
+${BAZEL} --output_user_root=${BAZEL_ROOT} test --flaky_test_attempts=3 --keep_going //... ${EXTRA_BUILD_FAGS}
diff --git a/.kokoro/setup.sh b/.kokoro/setup.sh
@@ -12,5 +12,9 @@ chmod +x bazel
 mkdir bazel_root
 cd -
 
+# gapic-generator-python requires python 3.6+
+pyenv global 3.6.1
+
 BAZEL=${KOKORO_ROOT}/tools/bazel
 BAZEL_ROOT=${KOKORO_ROOT}/tools/bazel_root
+EXTRA_BUILD_FAGS="--extra_toolchains=@gapic_generator_python//:pyenv3_toolchain --define=gapic_gen_python=3.6"
diff --git a/WORKSPACE b/WORKSPACE
@@ -31,6 +31,14 @@ http_archive(
     urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz"],
 )
 
+# Python rules should go early in the dependencies list, otherwise a wrong
+# version of the library will be selected as a transitive dependency of gRPC.
+http_archive(
+    name = "rules_python",
+    url = "https://github.com/bazelbuild/rules_python/archive/748aa53d7701e71101dfd15d800e100f6ff8e5d1.zip",
+    strip_prefix = "rules_python-748aa53d7701e71101dfd15d800e100f6ff8e5d1"
+)
+
 http_archive(
     name = "com_google_protobuf",
     strip_prefix = "protobuf-fe1790ca0df67173702f70d5646b82f48f412b99",  # this is 3.11.2
@@ -192,6 +200,32 @@ protoc_docs_plugin_repositories()
 
 protoc_docs_plugin_register_toolchains()
 
+load("@rules_python//python:repositories.bzl", "py_repositories")
+py_repositories()
+
+load("@rules_python//python:pip.bzl", "pip_repositories")
+pip_repositories()
+
+# Change upstream repository once PR is merged
+http_archive(
+    name = "gapic_generator_python",
+    urls = ["https://github.com/googleapis/gapic-generator-python/archive/d18ed416240a064fffac0fd7915b61f6415fe140.zip"],
+    strip_prefix = "gapic-generator-python-d18ed416240a064fffac0fd7915b61f6415fe140",
+)
+
+load("@gapic_generator_python//:repositories.bzl",
+    "gapic_generator_python",
+    "gapic_generator_register_toolchains"
+)
+
+gapic_generator_python()
+
+gapic_generator_register_toolchains()
+
+load("@gapic_generator_python_pip_deps//:requirements.bzl", "pip_install")
+
+pip_install()
+
 ##############################################################################
 # Go
 ##############################################################################
diff --git a/google/cloud/documentai/v1beta2/BUILD.bazel b/google/cloud/documentai/v1beta2/BUILD.bazel
@@ -150,60 +150,29 @@ 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",
+    py_gapic_assembly_pkg = "py_gapic_assembly_pkg2",
+    py_gapic_library = "py_gapic_library2",
 )
 
-moved_proto_library(
-    name = "documentai_moved_proto",
+py_gapic_library(
+    name = "documentai_py_gapic2",
     srcs = [":documentai_proto"],
-    deps = [
-        "//google/api:annotations_proto",
-        "//google/api:client_proto",
-        "//google/api:field_behavior_proto",
-        "//google/longrunning:operations_proto",
-        "//google/rpc:status_proto",
-        "//google/type:color_proto",
-        "@com_google_protobuf//:timestamp_proto",
-    ],
 )
 
-py_proto_library(
-    name = "documentai_py_proto",
-    plugin = "@protoc_docs_plugin//:docs_plugin",
-    deps = [":documentai_moved_proto"],
-)
-
-py_grpc_library(
-    name = "documentai_py_grpc",
-    srcs = [":documentai_moved_proto"],
-    deps = [":documentai_py_proto"],
-)
 
 py_gapic_library(
     name = "documentai_py_gapic",
-    src = ":documentai_proto_with_info",
-    gapic_yaml = "documentai_gapic.yaml",
-    package = "google.cloud.documentai.v1beta2",
-    service_yaml = "documentai_v1beta2.yaml",
-    deps = [
-        ":documentai_py_grpc",
-        ":documentai_py_proto",
-    ],
+    srcs = [":documentai_proto"],
 )
 
-# Open Source Packages
 py_gapic_assembly_pkg(
     name = "documentai-v1beta2-py",
     deps = [
         ":documentai_py_gapic",
-        ":documentai_py_grpc",
-        ":documentai_py_proto",
     ],
 )
 
diff --git a/repository_rules.bzl b/repository_rules.bzl
@@ -170,6 +170,16 @@ def switched_rules_by_language(
         python and grpc and gapic,
         "@com_google_api_codegen//rules_gapic/python:py_gapic_pkg.bzl",
     )
+    rules["py_gapic_library2"] = _switch(
+        python and grpc and gapic,
+        "@gapic_generator_python//rules_python_gapic:py_gapic.bzl",
+        "py_gapic_library",
+    )
+    rules["py_gapic_assembly_pkg2"] = _switch(
+        python and grpc and gapic,
+        "@gapic_generator_python//rules_python_gapic:py_gapic_pkg.bzl",
+        "py_gapic_assembly_pkg",
+    )
 
     #
     # Go

Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,5 @@ source .kokoro/setup.sh`
`10`	`10`	`#`
`11`	`11`	`# Run build and tests`
`12`	`12`	`#`
`13`		`-${BAZEL} --output_user_root=${BAZEL_ROOT} build --keep_going //...`
`14`		`-${BAZEL} --output_user_root=${BAZEL_ROOT} test --flaky_test_attempts=3 --keep_going //...`
	`13`	`+${BAZEL} --output_user_root=${BAZEL_ROOT} build --keep_going //... ${EXTRA_BUILD_FAGS}`
	`14`	`+${BAZEL} --output_user_root=${BAZEL_ROOT} test --flaky_test_attempts=3 --keep_going //... ${EXTRA_BUILD_FAGS}`