Merge remote-tracking branch 'google_upstream/r2.14' into r2.14-rocm-…

…enhanced-fix-hermetic-py

tensorflow/BUILD

@@ -1717,8 +1717,8 @@ py_library(
         "//tensorflow/lite/python:lite",
         "//tensorflow/lite/python/authoring",
         "//tensorflow/python:no_contrib",
-        "@pypi_keras_nightly//:pkg",
-        "@pypi_tb_nightly//:pkg",
+        "@pypi_keras//:pkg",
+        "@pypi_tensorboard//:pkg",
     ],
 )
 # copybara:comment_end

tensorflow/python/estimator/BUILD

@@ -382,5 +382,5 @@ py_library(
 
 alias(
     name = "expect_tensorflow_estimator_installed",
-    actual = "@pypi_tf_estimator_nightly//:pkg",
+    actual = "@pypi_tensorflow_estimator//:pkg",
 )

tensorflow/python/summary/BUILD

@@ -121,6 +121,6 @@ tf_py_strict_test(
         "//tensorflow/python/ops:summary_ops_v2",
         "//tensorflow/python/platform:client_testlib",
         "//tensorflow/python/training:training_util",
-        "@pypi_tb_nightly//:pkg",
+        "@pypi_tensorboard//:pkg",
     ],
 )

tensorflow/workspace2.bzl

@@ -513,10 +513,10 @@ def _tf_repositories():
     tf_http_archive(
         name = "curl",
         build_file = "//third_party:curl.BUILD",
-        sha256 = "2e5a9b8fcdc095bdd2f079561f369de71c5eb3b80f00a702fbe9a8b8d9897891",
-        strip_prefix = "curl-8.1.2",
+        sha256 = "f98bdb06c0f52bdd19e63c4a77b5eb19b243bcbbd0f5b002b9f3cba7295a3a42",
+        strip_prefix = "curl-8.2.1",
         system_build_file = "//third_party/systemlibs:curl.BUILD",
-        urls = tf_mirror_urls("https://curl.haxx.se/download/curl-8.1.2.tar.gz"),
+        urls = tf_mirror_urls("https://curl.haxx.se/download/curl-8.2.1.tar.gz"),
     )
 
     # WARNING: make sure ncteisen@ and vpai@ are cc-ed on any CL to change the below rule

third_party/curl.BUILD

@@ -201,6 +201,8 @@ cc_library(
         "lib/ldap.c",
         "lib/llist.c",
         "lib/llist.h",
+        "lib/macos.c",
+        "lib/macos.h",
         "lib/md4.c",
         "lib/md5.c",
         "lib/memdebug.c",
@@ -345,6 +347,7 @@ cc_library(
         "lib/vtls/rustls.h",
         "lib/vtls/schannel.c",
         "lib/vtls/schannel.h",
+        "lib/vtls/schannel_int.h",
         "lib/vtls/schannel_verify.c",
         "lib/vtls/sectransp.h",
         "lib/vtls/vtls.c",