From d910b4029059b5632596451ed0f5a107de197559 Mon Sep 17 00:00:00 2001
From: Nick Felt <nickfelt@google.com>
Date: Tue, 21 Apr 2020 14:15:44 -0700
Subject: [PATCH 1/2] Bump Bazel minimum version to 2.1.0 to match CI

---
 WORKSPACE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WORKSPACE b/WORKSPACE
index 40c8a6283e..d647808129 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -16,7 +16,7 @@ http_archive(
 load("@bazel_skylib//lib:versions.bzl", "versions")
 # Keep this version in sync with the BAZEL environment variable defined
 # in our .travis.yml config.
-versions.check(minimum_bazel_version = "1.0.0")
+versions.check(minimum_bazel_version = "2.1.0")
 
 http_archive(
     name = "io_bazel_rules_webtesting",

From 8b19315b1dcab0d951dbc2b810b9d1e6058cdaea Mon Sep 17 00:00:00 2001
From: Nick Felt <nickfelt@google.com>
Date: Tue, 21 Apr 2020 14:17:34 -0700
Subject: [PATCH 2/2] Remove obsolete .bazelrc settings

---
 .bazelrc | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index a65fb1e584..18e5411d24 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,5 +1 @@
-# For compatibility with Bazel 0.27 through 0.29. See:
-# <https://github.com/tensorflow/tensorboard/issues/2355>
-aquery --incompatible_use_python_toolchains=false
-build --incompatible_use_python_toolchains=false
-test --incompatible_use_python_toolchains=false
+# No options currently needed. Leaving empty file to preserve history.