add @six back as dep pt 1

ci/official/requirements_updater/requirements.in

@@ -14,6 +14,7 @@ astor == 0.7.1
 termcolor == 2.3.0
 wrapt == 1.14.1
 tblib == 1.7.0
+six == 1.16.0
 
 # Install tensorboard and estimator and keras
 # Note that here we want the latest version that matches TF major.minor version

requirements_lock_3_10.txt

@@ -196,8 +196,8 @@ keras-nightly==2.14.0.dev2023080207 \
     --hash=sha256:0b31c7006b50fa1ca4682af03335d29a9edc8dc599452ff74184bfdb66bdb553 \
     --hash=sha256:6662fe3d915081d573cc479d7b7e32ce3a4eb6b2a1f53d47b4164073f1f58325
     # via -r ./requirements.in
-lit==16.0.6 \
-    --hash=sha256:84623c9c23b6b14763d637f4e63e6b721b3446ada40bf7001d8fee70b8e77a9a
+lit==16.0.5.post0 \
+    --hash=sha256:71745d9e58dad3717735d27e2a9cca0e9ca6861d067da73c307e02fd38c98479
     # via -r ./requirements.in
 markdown==3.4.4 \
     --hash=sha256:225c6123522495d4119a90b3a3ba31a1e87a70369e03f14799ea9c0d7183a3d6 \

requirements_lock_3_11.txt

@@ -196,8 +196,8 @@ keras-nightly==2.14.0.dev2023080207 \
     --hash=sha256:0b31c7006b50fa1ca4682af03335d29a9edc8dc599452ff74184bfdb66bdb553 \
     --hash=sha256:6662fe3d915081d573cc479d7b7e32ce3a4eb6b2a1f53d47b4164073f1f58325
     # via -r ./requirements.in
-lit==16.0.6 \
-    --hash=sha256:84623c9c23b6b14763d637f4e63e6b721b3446ada40bf7001d8fee70b8e77a9a
+lit==16.0.5.post0 \
+    --hash=sha256:71745d9e58dad3717735d27e2a9cca0e9ca6861d067da73c307e02fd38c98479
     # via -r ./requirements.in
 markdown==3.4.4 \
     --hash=sha256:225c6123522495d4119a90b3a3ba31a1e87a70369e03f14799ea9c0d7183a3d6 \

requirements_lock_3_9.txt

@@ -200,8 +200,8 @@ keras-nightly==2.14.0.dev2023080207 \
     --hash=sha256:0b31c7006b50fa1ca4682af03335d29a9edc8dc599452ff74184bfdb66bdb553 \
     --hash=sha256:6662fe3d915081d573cc479d7b7e32ce3a4eb6b2a1f53d47b4164073f1f58325
     # via -r ./requirements.in
-lit==16.0.6 \
-    --hash=sha256:84623c9c23b6b14763d637f4e63e6b721b3446ada40bf7001d8fee70b8e77a9a
+lit==16.0.5.post0 \
+    --hash=sha256:71745d9e58dad3717735d27e2a9cca0e9ca6861d067da73c307e02fd38c98479
     # via -r ./requirements.in
 markdown==3.4.4 \
     --hash=sha256:225c6123522495d4119a90b3a3ba31a1e87a70369e03f14799ea9c0d7183a3d6 \

tensorflow/python/BUILD

@@ -570,6 +570,7 @@ py_strict_library(
         ":keras_lib",
         "//third_party/py/numpy",
         "@pypi_scipy//:pkg",
+        "@pypi_six//:pkg",
     ],
 )
 

tensorflow/python/client/BUILD

@@ -357,6 +357,7 @@ tf_py_strict_test(
         "//tensorflow/python/training:server_lib",
         "//tensorflow/python/util:compat",
         "//third_party/py/numpy",
+        "@pypi_six//:pkg",
     ],
 )
 

tensorflow/python/compiler/tensorrt/BUILD

@@ -70,6 +70,7 @@ py_strict_library(
         "//tensorflow/python/util:tf_export",
         "//third_party/py/numpy",
         "@pypi_packaging//:pkg",
+        "@pypi_six//:pkg",
     ],
 )
 

tensorflow/python/distribute/BUILD

@@ -58,6 +58,7 @@ py_strict_library(
         "//tensorflow/python/util:tf_export",
         "//tensorflow/tools/docs:doc_controls",
         "//third_party/py/numpy",
+        "@pypi_six//:pkg"
     ],
 )
 
@@ -177,6 +178,7 @@ py_strict_library(
         "//tensorflow/python/util:tf_decorator",
         "//tensorflow/python/util:tf_export",
         "//tensorflow/tools/docs:doc_controls",
+        "@pypi_six//:pkg"
     ],
 )
 
@@ -261,6 +263,7 @@ py_strict_test(
         "//tensorflow/python/training:coordinator",
         "//tensorflow/python/training:monitored_session",
         "//tensorflow/python/training:session_manager",
+        "@pypi_six//:pkg"
     ],
 )
 
@@ -595,6 +598,7 @@ py_strict_library(
         "//tensorflow/python/types:distribute",
         "//tensorflow/python/util:compat",
         "//tensorflow/python/util:nest",
+        "@pypi_six//:pkg"
     ],
 )
 
@@ -836,6 +840,7 @@ py_strict_library(
         ":multi_worker_util",
         "//tensorflow/python/platform:tf_logging",
         "//tensorflow/python/training:server_lib",
+        "@pypi_six//:pkg"
     ],
 )
 
@@ -1121,6 +1126,7 @@ py_strict_library(
         "//tensorflow/python/util:tf_decorator",
         "//tensorflow/python/util:tf_export",
         "@absl_py//absl:app",
+        "@pypi_six//:pkg"
     ],
 )
 
@@ -1231,6 +1237,7 @@ py_strict_library(
         "//tensorflow/python/util:deprecation",
         "//tensorflow/python/util:nest",
         "//tensorflow/python/util:tf_export",
+        "@pypi_six//:pkg"
     ],
 )
 
@@ -2291,6 +2298,7 @@ py_strict_library(
         "//tensorflow/python/util:tf_export",
         "@absl_py//absl/logging",
         "@pypi_dill//:pkg",  # build_cleaner: keep
+        "@pypi_six//:pkg"
         "@pypi_tblib//:pkg",  # build_cleaner: keep
     ],
 )

tensorflow/python/distribute/failure_handling/BUILD

@@ -48,6 +48,7 @@ py_strict_library(
         "//tensorflow/python/eager:context",
         "//tensorflow/python/platform:tf_logging",
         "@pypi_requests//:pkg",
+        "@pypi_six//:pkg"
     ],
 )
 

tensorflow/python/estimator/BUILD

@@ -66,6 +66,7 @@ py_library(
         ":expect_tensorflow_estimator_installed",
         ":export_output",
         "//tensorflow:tensorflow_py_no_contrib",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -79,6 +80,7 @@ py_library(
         ":exporter",
         ":run_config",
         "//tensorflow:tensorflow_py_no_contrib",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -89,6 +91,7 @@ py_library(
     deps = [
         ":expect_tensorflow_estimator_installed",
         "//tensorflow:tensorflow_py_no_contrib",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -103,6 +106,7 @@ py_library(
         ":model_fn",
         ":optimizers",
         "//tensorflow:tensorflow_py_no_contrib",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -117,6 +121,7 @@ py_library(
         ":model_fn",
         ":optimizers",
         "//tensorflow:tensorflow_py_no_contrib",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -136,6 +141,7 @@ py_library(
         "//tensorflow:tensorflow_py_no_contrib",
         "//third_party/py/numpy",
         "@absl_py//absl/testing:parameterized",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -152,6 +158,7 @@ py_library(
         ":model_fn",
         ":optimizers",
         "//tensorflow:tensorflow_py_no_contrib",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -181,6 +188,7 @@ py_library(
         ":util",
         "//tensorflow:tensorflow_py_no_contrib",
         "//third_party/py/numpy",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -193,6 +201,7 @@ py_library(
     deps = [
         ":expect_tensorflow_estimator_installed",
         "//tensorflow:tensorflow_py_no_contrib",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -203,6 +212,7 @@ py_library(
     deps = [
         ":expect_tensorflow_estimator_installed",
         "//tensorflow:tensorflow_py_no_contrib",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -230,6 +240,7 @@ py_library(
         ":expect_tensorflow_estimator_installed",
         ":util",
         "//tensorflow:tensorflow_py_no_contrib",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -244,6 +255,7 @@ py_library(
         ":model_fn",
         ":prediction_keys",
         "//tensorflow:tensorflow_py_no_contrib",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -269,6 +281,7 @@ py_library(
         ":head",
         ":optimizers",
         "//tensorflow:tensorflow_py_no_contrib",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -287,6 +300,7 @@ py_library(
         ":pandas_io",
         ":run_config",
         "//tensorflow:tensorflow_py_no_contrib",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -317,6 +331,7 @@ py_library(
     deps = [
         ":expect_tensorflow_estimator_installed",
         "//tensorflow:tensorflow_py_no_contrib",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -349,6 +364,7 @@ py_library(
     deps = [
         ":expect_tensorflow_estimator_installed",
         "//tensorflow:tensorflow_py_no_contrib",
+        "@pypi_six//:pkg",
     ],
 )
 

tensorflow/python/feature_column/BUILD

@@ -55,6 +55,7 @@ py_strict_library(
         "//tensorflow/python/util:nest",
         "//tensorflow/python/util:tf_export",
         "//tensorflow/tools/docs:doc_controls",
+        "@pypi_six//:pkg",
     ],
 )
 

tensorflow/python/lib/io/BUILD

@@ -51,6 +51,7 @@ py_strict_library(
         "//tensorflow/python/util:compat",
         "//tensorflow/python/util:deprecation",
         "//tensorflow/python/util:tf_export",
+        "@pypi_six//:pkg",
     ],
 )
 

tensorflow/python/util/protobuf/BUILD

@@ -48,6 +48,7 @@ tf_py_strict_test(
         ":compare_test_proto_py",
         ":protobuf",
         "//tensorflow/python/platform:test",
+        "@pypi_six//:pkg"
     ],
 )
 
@@ -86,6 +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"
         "//tensorflow/python/util:compat",
     ],
 )

tensorflow/tools/build_info/BUILD

@@ -16,5 +16,6 @@ py_binary(
     deps = [
         "@local_config_cuda//cuda:cuda_config_py",
         "@local_config_tensorrt//:tensorrt_config_py",
+        "@pypi_six//:pkg"
     ],
 )

tensorflow/tools/compatibility/BUILD

@@ -22,6 +22,7 @@ py_strict_library(
     srcs_version = "PY3",
     deps = [
         "@pasta",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -44,6 +45,7 @@ py_strict_binary(
     srcs_version = "PY3",
     deps = [
         ":tf_upgrade_lib",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -163,6 +165,7 @@ py_strict_test(
     deps = [
         ":ast_edits",
         ":tf_upgrade_v2_lib",
+        "@pypi_six//:pkg",
         # copybara:uncomment "//third_party/py/tensorflow:tensorflow_compat_v1_estimator",
         # copybara:uncomment "//third_party/py/tensorflow:tensorflow_compat_v2_estimator",
         "//tensorflow:tensorflow_py",

tensorflow/tools/tensorflow_builder/config_detector/BUILD

@@ -31,6 +31,7 @@ py_strict_binary(
     deps = [
         "@absl_py//absl:app",
         "@absl_py//absl/flags",
+        "@pypi_six//:pkg",
     ],
 )
 
@@ -41,5 +42,6 @@ py_strict_library(
     deps = [
         "@absl_py//absl:app",
         "@absl_py//absl/flags",
+        "@pypi_six//:pkg",
     ],
 )

tensorflow/workspace0.bzl

@@ -45,6 +45,11 @@ def _tf_bind():
         actual = str(Label("//third_party/python_runtime:headers")),
     )
 
+    # Needed by Protobuf
+    native.bind(
+        name = "six",
+        actual = "@pypi_six//:pkg",
+    )
 
 def workspace():
     http_archive(