Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change order of installations. #19780

Merged
merged 2 commits into from
Jun 5, 2018
Merged

Change order of installations. #19780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13b3439
Change order of installations.
Jun 5, 2018
23825b7
Making setuptools the last install to ensure it's accurate.
Jun 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions tensorflow/tools/ci_build/install/install_pip_packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ set -e
easy_install -U pip==9.0.3
easy_install3 -U pip==9.0.3

pip2 install --upgrade setuptools==39.1.0
pip3 install --upgrade setuptools==39.1.0

# Install pip packages from whl files to avoid the time-consuming process of
# building from source.

Expand Down Expand Up @@ -112,3 +109,7 @@ pip2 install --upgrade gast
pip3 install --upgrade gast
pip2 install --upgrade termcolor
pip3 install --upgrade termcolor

# Install last working version of setuptools.
pip2 install --upgrade setuptools==39.1.0
pip3 install --upgrade setuptools==39.1.0
4 changes: 3 additions & 1 deletion tensorflow/tools/ci_build/install/install_python3.5_pip_packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ if [[ -z $pip35_version ]]; then
fi

set -e
pip3.5 install --upgrade setuptools==39.1.0
pip3.5 install --upgrade pip

pip3.5 install --upgrade virtualenv
Expand Down Expand Up @@ -82,4 +81,7 @@ pip3.5 install --upgrade astor
pip3.5 install --upgrade gast
pip3.5 install --upgrade termcolor

# Install last working version of setuptools.
pip3.5 install --upgrade setuptools==39.1.0

# LINT.ThenChange(//tensorflow/tools/ci_build/install/install_python3.6_pip_packages.sh)
4 changes: 3 additions & 1 deletion tensorflow/tools/ci_build/install/install_python3.6_pip_packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ cd Python-3.6.1
make altinstall
ln -s /usr/local/bin/pip3.6 /usr/local/bin/pip3

pip3 install --upgrade setuptools==39.1.0
pip3 install --upgrade pip

pip3 install --upgrade virtualenv
Expand Down Expand Up @@ -98,4 +97,7 @@ pip3 install --upgrade astor
pip3 install --upgrade gast
pip3 install --upgrade termcolor

# Install last working version of setuptools.
pip3 install --upgrade setuptools==39.1.0

# LINT.ThenChange(//tensorflow/tools/ci_build/install/install_python3.5_pip_packages.sh)