From 28310aed63f9fc849a55c163b523564db106c901 Mon Sep 17 00:00:00 2001
From: Mihai Maruseac <mihaimaruseac@google.com>
Date: Wed, 10 Jul 2019 17:29:08 -0700
Subject: [PATCH] Automated rollback of commit
08370f31ad948a9508df5f9630611c28c699e5e6
PiperOrigin-RevId: 257516611
---
tensorflow/tools/ci_build/ci_sanity.sh | 2 --
tensorflow/tools/pip_package/check_load_py_test.py | 2 --
tensorflow/tools/pip_package/pip_smoke_test.py | 11 +++--------
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/tensorflow/tools/ci_build/ci_sanity.sh b/tensorflow/tools/ci_build/ci_sanity.sh
index f7ae00db99e..b78281dfc23 100755
--- a/tensorflow/tools/ci_build/ci_sanity.sh
+++ b/tensorflow/tools/ci_build/ci_sanity.sh
@@ -449,8 +449,6 @@ do_bazel_nobuild() {
BUILD_TARGET="${BUILD_TARGET} -//tensorflow/lite/delegates/gpu/..."
BUILD_TARGET="${BUILD_TARGET} -//tensorflow/lite/java/demo/app/..."
BUILD_TARGET="${BUILD_TARGET} -//tensorflow/lite/schema/..."
- BAZEL_FLAGS="${BAZEL_FLAGS} --incompatible_package_name_is_a_function=false"
- BAZEL_FLAGS="${BAZEL_FLAGS} --incompatible_remove_native_http_archive=false"
BUILD_CMD="bazel build --nobuild ${BAZEL_FLAGS} -- ${BUILD_TARGET}"
${BUILD_CMD}
diff --git a/tensorflow/tools/pip_package/check_load_py_test.py b/tensorflow/tools/pip_package/check_load_py_test.py
index 10415d7feab..8e9de562a30 100644
--- a/tensorflow/tools/pip_package/check_load_py_test.py
+++ b/tensorflow/tools/pip_package/check_load_py_test.py
@@ -47,8 +47,6 @@ def main():
try:
targets = subprocess.check_output([
'bazel', 'query',
- "--incompatible_package_name_is_a_function=false",
- "--incompatible_remove_native_http_archive=false",
'kind(py_test, //tensorflow/contrib/... + '
'//tensorflow/python/... - '
'//tensorflow/contrib/tensorboard/...)']).strip()
diff --git a/tensorflow/tools/pip_package/pip_smoke_test.py b/tensorflow/tools/pip_package/pip_smoke_test.py
index 4c076a9891b..9adbb36a74a 100644
--- a/tensorflow/tools/pip_package/pip_smoke_test.py
+++ b/tensorflow/tools/pip_package/pip_smoke_test.py
@@ -30,10 +30,6 @@ os.chdir(os.path.abspath(os.path.join(os.path.dirname(__file__), "../../..")))
PIP_PACKAGE_QUERY_EXPRESSION = (
"deps(//tensorflow/tools/pip_package:build_pip_package)")
-RELEASE_PATCH_FLAGS = (
- " --incompatible_package_name_is_a_function=false"
- " --incompatible_remove_native_http_archive=false")
-
# List of file paths containing BUILD files that should not be included for the
# pip smoke test.
BUILD_BLACKLIST = [
@@ -144,7 +140,7 @@ def main():
# pip_package_dependencies_list is the list of included files in pip packages
pip_package_dependencies = subprocess.check_output(
- ["bazel", "cquery", RELEASE_PATCH_FLAGS, PIP_PACKAGE_QUERY_EXPRESSION])
+ ["bazel", "cquery", PIP_PACKAGE_QUERY_EXPRESSION])
if isinstance(pip_package_dependencies, bytes):
pip_package_dependencies = pip_package_dependencies.decode("utf-8")
pip_package_dependencies_list = pip_package_dependencies.strip().split("\n")
@@ -156,7 +152,7 @@ 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", RELEASE_PATCH_FLAGS, PY_TEST_QUERY_EXPRESSION])
+ ["bazel", "cquery", PY_TEST_QUERY_EXPRESSION])
if isinstance(tf_py_test_dependencies, bytes):
tf_py_test_dependencies = tf_py_test_dependencies.decode("utf-8")
tf_py_test_dependencies_list = tf_py_test_dependencies.strip().split("\n")
@@ -197,8 +193,7 @@ def main():
print("Affected Tests:")
rdep_query = ("rdeps(kind(py_test, %s), %s)" %
(" + ".join(PYTHON_TARGETS), missing_dependency))
- affected_tests = subprocess.check_output(
- ["bazel", "cquery", RELEASE_PATCH_FLAGS, rdep_query])
+ affected_tests = subprocess.check_output(["bazel", "cquery", rdep_query])
affected_tests_list = affected_tests.split("\n")[:-2]
print("\n".join(affected_tests_list))