Skip to content

Commit 5632238

Browse files
committed
Revert "update get-pip to look for sha"
This reverts commit a2f3ff7.
1 parent dc87844 commit 5632238

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

bin/steps/python

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,10 @@ fi
101101
# https://github.com/pypa/get-pip
102102
GETPIP="https://lang-python.s3.amazonaws.com/etc/get-pip.py"
103103

104-
# Grab SHA from get-pip
105-
CHECK_SHA="$(curl -s "$GETPIP" | sha256sum | cut -d ' ' -f 1)"
106-
107-
# validate the sha is the same one we want
108-
if [ ! "$CHECK_SHA" == "$GETPIP_SHA" ]; then
109-
mcount "failure.python.get-pip.wrong-sha"
110-
echo "Incorrect SHA found"
111-
exit 1
112-
else
113-
curl "$GETPIP" -o "$ROOT_DIR/get-pip.py"
114-
mcount "python.get-pip.install"
104+
if ! curl "${GETPIP}" -o "$ROOT_DIR/get-pip.py"; then
105+
mcount "failure.python.get-pip"
106+
echo "Failed to pull down get-pip"
107+
exit 1
115108
fi
116109

117110
# If Pip isn't up to date:
@@ -123,7 +116,7 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_UPDATE* ]]; then
123116
rm -fr /app/.heroku/python/lib/python*/site-packages/pip-*
124117
rm -fr /app/.heroku/python/lib/python*/site-packages/setuptools-*
125118

126-
/app/.heroku/python/bin/python "$ROOT_DIR/get-pip.py" pip=="$PIP_UPDATE" #&> /dev/null
119+
/app/.heroku/python/bin/python "$ROOT_DIR/get-pip.py" pip=="$PIP_UPDATE" &> /dev/null
127120
/app/.heroku/python/bin/pip install "$ROOT_DIR/vendor/setuptools-39.0.1-py2.py3-none-any.whl" &> /dev/null
128121
fi
129122

0 commit comments

Comments
 (0)