From 7e2412c4859dfedb8630a08bc963e76b8032138d Mon Sep 17 00:00:00 2001 From: Vadym Matsishevskyi Date: Mon, 10 Jun 2024 11:06:32 -0700 Subject: [PATCH] fix nightly package installation for tf.text ci jobs PiperOrigin-RevId: 641960415 --- oss_scripts/configure.sh | 11 +++++++++++ oss_scripts/prepare_tf_dep.sh | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/oss_scripts/configure.sh b/oss_scripts/configure.sh index ed5267bd3..44c665cc0 100755 --- a/oss_scripts/configure.sh +++ b/oss_scripts/configure.sh @@ -68,6 +68,17 @@ elif (which python) | grep -q "python"; then installed_python="python" fi +HERMETIC_PYTHON_VERSION=$($installed_python -c "import sys; print('.'.join(map(str, sys.version_info[:2])))") +export HERMETIC_PYTHON_VERSION + +echo "TF_VERSION=$TF_VERSION" +REQUIREMENTS_EXTRA_FLAGS="--upgrade" +if [[ "$TF_VERSION" == *"rc"* ]]; then + REQUIREMENTS_EXTRA_FLAGS="$REQUIREMENTS_EXTRA_FLAGS --pre" +fi + +bazel run //oss_scripts/pip_package:requirements.update -- $REQUIREMENTS_EXTRA_FLAGS + TF_ABIFLAG=$(bazel run //oss_scripts/pip_package:tensorflow_build_info -- abi) HEADER_DIR=${TF_CFLAGS:2} diff --git a/oss_scripts/prepare_tf_dep.sh b/oss_scripts/prepare_tf_dep.sh index 639347a21..c1b449f09 100755 --- a/oss_scripts/prepare_tf_dep.sh +++ b/oss_scripts/prepare_tf_dep.sh @@ -13,16 +13,6 @@ if [[ "${osname}" == "darwin" ]]; then ext='""' fi -HERMETIC_PYTHON_VERSION=$($installed_python -c "import sys; print('.'.join(map(str, sys.version_info[:2])))") -export HERMETIC_PYTHON_VERSION - - -echo "TF_VERSION=$TF_VERSION" -REQUIREMENTS_EXTRA_FLAGS="--upgrade" -if [[ "$TF_VERSION" == *"rc"* ]]; then - REQUIREMENTS_EXTRA_FLAGS="$REQUIREMENTS_EXTRA_FLAGS --pre" -fi - bazel run //oss_scripts/pip_package:requirements.update -- $REQUIREMENTS_EXTRA_FLAGS # Update setup.nightly.py with current tf version.