From 24e89576a8a8c885459141cd9a55589d8ba35f4b Mon Sep 17 00:00:00 2001
From: TensorFlower Gardener <gardener@tensorflow.org>
Date: Tue, 25 Feb 2020 08:54:47 -0800
Subject: [PATCH] Merge pull request #36830 from
 AnotherGroupChat:hermetic-build-fix

PiperOrigin-RevId: 297125647
Change-Id: Ifda9d063b080ccd52e2c493db7928f7320ccf8f7
---
 tensorflow/tools/git/BUILD             | 1 -
 tensorflow/tools/git/gen_git_source.py | 6 ++----
 tensorflow/tools/lib_package/BUILD     | 2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/tensorflow/tools/git/BUILD b/tensorflow/tools/git/BUILD
index 8a47f4c4c2d1e1..c1f0577f33b4c8 100644
--- a/tensorflow/tools/git/BUILD
+++ b/tensorflow/tools/git/BUILD
@@ -13,5 +13,4 @@ py_binary(
     srcs = ["gen_git_source.py"],
     python_version = "PY3",
     srcs_version = "PY2AND3",
-    deps = ["@six_archive//:six"],
 )
diff --git a/tensorflow/tools/git/gen_git_source.py b/tensorflow/tools/git/gen_git_source.py
index 011406e2288047..0cb1d00614280a 100755
--- a/tensorflow/tools/git/gen_git_source.py
+++ b/tensorflow/tools/git/gen_git_source.py
@@ -35,8 +35,6 @@
 import shutil
 import subprocess
 
-import six
-
 
 def parse_branch_ref(filename):
   """Given a filename of a .git/HEAD file return ref path.
@@ -169,8 +167,8 @@ def get_git_version(git_base_path, git_tag_override):
         subprocess.check_output([
             "git",
             str("--git-dir=%s/.git" % git_base_path),
-            str("--work-tree=" + six.ensure_str(git_base_path)), "describe",
-            "--long", "--tags"
+            str("--work-tree=%s" % git_base_path), "describe", "--long",
+            "--tags"
         ]).strip())
     version_separator = b"-"
     if git_tag_override and val:
diff --git a/tensorflow/tools/lib_package/BUILD b/tensorflow/tools/lib_package/BUILD
index fb88a61b4248c1..09e3d1b9c2108b 100644
--- a/tensorflow/tools/lib_package/BUILD
+++ b/tensorflow/tools/lib_package/BUILD
@@ -161,7 +161,6 @@ genrule(
         "@nasm//:LICENSE",
         "@nsync//:LICENSE",
         "@png//:LICENSE",
-        "@six_archive//:LICENSE",
         "@snappy//:COPYING",
         "@sobol_data//:LICENSE",
         "@zlib_archive//:zlib.h",
@@ -241,7 +240,6 @@ genrule(
         "@nasm//:LICENSE",
         "@nsync//:LICENSE",
         "@png//:LICENSE",
-        "@six_archive//:LICENSE",
         "@snappy//:COPYING",
         "@sobol_data//:LICENSE",
         "@zlib_archive//:zlib.h",