Merge pull request #30709 from tensorflow/patch-final-fixes

Final fixes for the patch release

tensorflow/python/tools/api/generator/api_gen.bzl

@@ -104,8 +104,5 @@ def gen_api_init_files(
         ),
         srcs = srcs,
         tools = [":" + api_gen_binary_target],
-        visibility = [
-            "//tensorflow:__pkg__",
-            "//tensorflow/tools/api/tests:__pkg__",
-        ],
+        visibility = ["//visibility:public"],
     )

tensorflow/tools/dist_test/scripts/BUILD

@@ -14,9 +14,9 @@ py_test(
     name = "k8s_tensorflow_test",
     srcs = ["k8s_tensorflow_test.py"],
     srcs_version = "PY2AND3",
+    tags = ["no_oss"],
     deps = [
         ":k8s_tensorflow_lib",
         "//tensorflow/python:platform_test",
     ],
-    tags = ["no_oss"],
 )

tensorflow/tools/pip_package/pip_smoke_test.py

@@ -137,7 +137,8 @@ def main():
   # tf_py_test_dependencies is the list of dependencies for all python
   # tests in tensorflow
   tf_py_test_dependencies = subprocess.check_output(
-      ["bazel", "cquery", PY_TEST_QUERY_EXPRESSION])
+      ["bazel", "cquery", "--incompatible_package_name_is_a_function=false",
+       PY_TEST_QUERY_EXPRESSION])
   tf_py_test_dependencies_list = tf_py_test_dependencies.strip().split("\n")
   tf_py_test_dependencies_list = [
       x.split()[0] for x in tf_py_test_dependencies.strip().split("\n")