Add back six pt 2

requirements_lock_3_10.txt

@@ -420,6 +420,7 @@ six==1.16.0 \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
     # via
+    #   -r ./requirements.in
     #   astunparse
     #   google-auth
 tb-nightly==2.14.0a20230808 \

requirements_lock_3_11.txt

@@ -420,6 +420,7 @@ six==1.16.0 \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
     # via
+    #   -r ./requirements.in
     #   astunparse
     #   google-auth
 tb-nightly==2.14.0a20230808 \

requirements_lock_3_9.txt

@@ -424,6 +424,7 @@ six==1.16.0 \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
     # via
+    #   -r ./requirements.in
     #   astunparse
     #   google-auth
 tb-nightly==2.14.0a20230808 \

tensorflow/compiler/aot/tests/BUILD

@@ -87,6 +87,7 @@ py_strict_binary(
         "//tensorflow/python/ops:variables",
         "//tensorflow/python/training:saver",
         "@absl_py//absl:app",
+        "@pypi_six//:pkg",
     ],
 )
 

tensorflow/compiler/tests/BUILD

@@ -70,6 +70,7 @@ py_strict_library(
     srcs_version = "PY3",
     deps = [
         "//third_party/py/numpy",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -1730,6 +1731,7 @@ tf_xla_py_strict_test(
         "//tensorflow/python/ops:nn_ops_gen",
         "//tensorflow/python/platform:test",
         "//third_party/py/numpy",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -2222,6 +2224,7 @@ py_strict_library(
         "//tensorflow/python/ops:math_ops",
         "//tensorflow/python/ops:random_ops",
         "//tensorflow/python/ops:variable_v1",
+        "@pypi_six//:pkg",
     ],
 )
 

tensorflow/python/distribute/BUILD

@@ -2298,7 +2298,7 @@ py_strict_library(
         "//tensorflow/python/util:tf_export",
         "@absl_py//absl/logging",
         "@pypi_dill//:pkg",  # build_cleaner: keep
-        "@pypi_six//:pkg"
+        "@pypi_six//:pkg",
         "@pypi_tblib//:pkg",  # build_cleaner: keep
     ],
 )

tensorflow/python/distribute/cluster_resolver/BUILD

@@ -39,6 +39,7 @@ py_strict_library(
         "//tensorflow/python/framework:ops",
         "//tensorflow/python/training:server_lib",
         "//tensorflow/python/util:tf_export",
+        "@pypi_six//:pkg",
     ],
 )
 

tensorflow/python/distribute/coordinator/BUILD

@@ -30,6 +30,7 @@ py_strict_library(
         "//tensorflow/python/platform:tf_logging",
         "//tensorflow/python/util:nest",
         "//tensorflow/python/util:tf_export",
+        "@pypi_six//:pkg",
     ],
 )
 

tensorflow/python/eager/polymorphic_function/BUILD

@@ -600,6 +600,7 @@ py_strict_library(
         "//tensorflow/python/ops:resource_variable_ops",
         "//tensorflow/python/util:nest",
         "//third_party/py/numpy",
+        "@pypi_six//:pkg",
     ],
 )
 

tensorflow/python/feature_column/BUILD

@@ -104,6 +104,7 @@ py_strict_library(
         "//tensorflow/python/util:tf_export",
         "//tensorflow/tools/docs:doc_controls",
         "//third_party/py/numpy",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -120,6 +121,7 @@ py_strict_library(
         "//tensorflow/python/util:tf_decorator",
         "//tensorflow/python/util:tf_export",
         "//tensorflow/tools/docs:doc_controls",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -260,6 +262,7 @@ py_strict_library(
         "//tensorflow/python/ops:array_ops",
         "//tensorflow/python/ops:math_ops",
         "//tensorflow/python/util:nest",
+        "@pypi_six//:pkg",
     ],
 )
 

tensorflow/python/ops/numpy_ops/tests/BUILD

@@ -97,6 +97,7 @@ py_strict_library(
         "//tensorflow/python/tpu/ops",
         "//tensorflow/python/util:nest",
         "//third_party/py/numpy",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -217,6 +218,7 @@ py_strict_test(
         "//third_party/py/numpy",
         "@absl_py//absl/testing:absltest",
         "@absl_py//absl/testing:parameterized",
+        "@pypi_six//:pkg",
     ],
 )
 

tensorflow/python/util/BUILD

@@ -909,6 +909,7 @@ py_strict_library(
         # py_test because not all tensorflow tests use tensorflow.bzl's py_test.
         "//tensorflow/python:global_test_configuration",
         ":tf_decorator",
+        "@pypi_six//:pkg",
     ],
 )
 

tensorflow/python/util/protobuf/BUILD

@@ -87,7 +87,7 @@ py_strict_library(
         # py_test because not all tensorflow tests use tensorflow.bzl's py_test.
         "//tensorflow/python:global_test_configuration",
         "@com_google_protobuf//:protobuf_python",
-        "@pypi_six//:pkg"
+        "@pypi_six//:pkg",
         "//tensorflow/python/util:compat",
     ],
 )

tensorflow/tools/test/BUILD

@@ -32,6 +32,7 @@ py_library(
         "//tensorflow/python/client",
         "//tensorflow/python/framework:errors",
         "//tensorflow/python/platform:gfile",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -56,6 +57,7 @@ py_library(
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python/platform:gfile",
         "@absl_py//absl/logging",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -67,6 +69,7 @@ py_binary(
     visibility = ["//visibility:public"],
     deps = [
         ":run_and_gather_logs_main_lib",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -81,6 +84,7 @@ py_library(
         "//tensorflow/python/platform:client_testlib",
         "//tensorflow/python/platform:gfile",
         "//tensorflow/python/platform:tf_logging",
+        "@pypi_six//:pkg",
     ],
 )