experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle breakage caused by new numpy and setuptools.

Browse Source 
PiperOrigin-RevId: 355019618
Change-Id: Ie3f6df6cb88dd4f6b995f31474266cc9d8c281da
This commit is contained in:
Mihai Maruseac 2021-02-01 13:54:55 -08:00 committed by TensorFlower Gardener
parent 68eb84d0ec
commit 784ea35c01
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tensorflow/tools/ci_build/release/common.sh
View File

@ -120,7 +120,12 @@ function install_ubuntu_16_pip_deps {
# To have reproducible builds, these dependencies should be pinned always.
# Prefer pinning to the same version as in setup.py
# First, upgrade pypi wheels
"${PIP_CMD}" install --user --upgrade setuptools pip wheel
"${PIP_CMD}" install --user --upgrade 'setuptools<53' pip wheel
# NOTE: As numpy has releases that break semver guarantees and several other
# deps depend on numpy without an upper bound, we must install numpy before
# everything else.
# TODO(mihaimaruseac): Convert to requirements.txt
"${PIP_CMD}" install --user 'numpy ~= 1.19.2'
# Now, install the deps, as listed in setup.py
"${PIP_CMD}" install --user 'absl-py ~= 0.10'
"${PIP_CMD}" install --user 'astunparse ~= 1.6.3'
@ -128,7 +133,6 @@ function install_ubuntu_16_pip_deps {
"${PIP_CMD}" install --user 'google_pasta ~= 0.2'
"${PIP_CMD}" install --user 'h5py ~= 3.1.0'
"${PIP_CMD}" install --user 'keras_preprocessing ~= 1.1.2'
"${PIP_CMD}" install --user 'numpy ~= 1.19.5'
"${PIP_CMD}" install --user 'opt_einsum ~= 3.3.0'
"${PIP_CMD}" install --user 'protobuf >= 3.9.2'
"${PIP_CMD}" install --user 'six ~= 1.15.0'

8
tensorflow/tools/ci_build/release/common_win.bat
View File

@ -26,7 +26,12 @@ SET PATH=%PATH%;C:\%PYTHON_DIRECTORY%
@REM To have reproducible builds, these dependencies should be pinned always.
@REM Prefer pinning to the same version as in setup.py
@REM First, upgrade pypi wheels
%PY_EXE% -m pip install --upgrade setuptools pip wheel
%PY_EXE% -m pip install --upgrade "setuptools<53" pip wheel
@REM NOTE: As numpy has releases that break semver guarantees and several other
@REM deps depend on numpy without an upper bound, we must install numpy before
@REM everything else.
@REM TODO(mihaimaruseac): Convert to requirements.txt
%PY_EXE% -m pip install "numpy ~= 1.19.2"
@REM Now, install the deps, as listed in setup.py
%PY_EXE% -m pip install "absl-py ~= 0.10"
%PY_EXE% -m pip install "astunparse ~= 1.6.3"
@ -34,7 +39,6 @@ SET PATH=%PATH%;C:\%PYTHON_DIRECTORY%
%PY_EXE% -m pip install "google_pasta ~= 0.2"
%PY_EXE% -m pip install "h5py ~= 3.1.0"
%PY_EXE% -m pip install "keras_preprocessing ~= 1.1.2"
%PY_EXE% -m pip install "numpy ~= 1.19.5"
%PY_EXE% -m pip install "opt_einsum ~= 3.3.0"
%PY_EXE% -m pip install "protobuf >= 3.9.2"
%PY_EXE% -m pip install "six ~= 1.15.0"

6
tensorflow/tools/pip_package/setup.py
View File

@ -75,13 +75,17 @@ if '--project_name' in sys.argv:
# comment the versioning scheme.
# NOTE: Please add test only packages to `TEST_PACKAGES` below.
REQUIRED_PACKAGES = [
# NOTE: As numpy has releases that break semver guarantees and several other
# deps depend on numpy without an upper bound, we must install numpy before
# everything else.
'numpy ~= 1.19.2',
# Install other dependencies
'absl-py ~= 0.10',
'astunparse ~= 1.6.3',
'flatbuffers ~= 1.12.0',
'google_pasta ~= 0.2',
'h5py ~= 3.1.0',
'keras_preprocessing ~= 1.1.2',
'numpy ~= 1.19.5',
'opt_einsum ~= 3.3.0',
'protobuf >= 3.9.2',
'six ~= 1.15.0',