Skip to content
This repository has been archived by the owner on Dec 5, 2022. It is now read-only.

Commit

Permalink
Output the installed version of pip in the build log (heroku#1007)
Browse files Browse the repository at this point in the history
Since:
* "explicit is better than implicit"
* we'll soon be upgrading pip, and debugging breakage caused by upgrades
  will be easier if versions are visible in the build log

Closes heroku#939.
  • Loading branch information
edmorley authored and dryan committed Nov 19, 2020
1 parent 4c5e3db commit 0e93678
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# Master

- Output the installed version of pip in the build log (#1007).
- Reduce the number of environment variables exposed to `bin/{pre,post}_compile` and other subprocesses (#1011)

# 173 (2020-07-21)
Expand Down
2 changes: 1 addition & 1 deletion bin/steps/python
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ fi
# If a new Python has been installed or Pip isn't up to date:
if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_UPDATE* ]]; then

puts-step "Installing pip"
puts-step "Installing pip ${PIP_UPDATE}"

# Remove old installations.
rm -fr /app/.heroku/python/lib/python*/site-packages/pip-*
Expand Down
1 change: 1 addition & 0 deletions test/run-features
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ testStandardRequirements() {

testPipenv() {
compile "pipenv"
assertCaptured "Installing pip 9.0.2"
assertCapturedSuccess
}

Expand Down
9 changes: 9 additions & 0 deletions test/run-versions
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ testPythonDefault() {
compile "pythonDefault"
assertCaptured $DEFAULT_PYTHON_VERSION
assertNotCaptured "security update"
assertCaptured "Installing pip 20.0.2"
assertCaptured "Installing SQLite3"
assertCapturedSuccess
}
Expand All @@ -24,6 +25,7 @@ testPython2() {
assertNotCaptured "python-2-7-eol-faq";
fi
assertNotCaptured "security update"
assertCaptured "Installing pip 20.0.2"
assertCaptured "Installing SQLite3"
assertCapturedSuccess
}
Expand Down Expand Up @@ -51,6 +53,7 @@ testPython3_4() {
compile "python3_4"
assertCaptured $LATEST_34
assertNotCaptured "security update"
assertCaptured "Installing pip 19.1.1"
# if cedar 14 and legacy binaries, fail. if cedar 14 and staging, succeed.
if [[ ! -n $USE_STAGING_BINARIES ]] && [[ $STACK == "cedar-14" ]]; then
assertCapturedError
Expand Down Expand Up @@ -86,6 +89,7 @@ testPython3_5() {
compile "python3_5"
assertCaptured $LATEST_35
assertNotCaptured "security update"
assertCaptured "Installing pip 20.0.2"
assertCaptured "Installing SQLite3"
assertCapturedSuccess
}
Expand All @@ -108,6 +112,7 @@ testPython3_6() {
compile "python3_6"
assertCaptured $LATEST_36
assertNotCaptured "security update"
assertCaptured "Installing pip 20.0.2"
assertCaptured "Installing SQLite3"
assertCapturedSuccess
}
Expand All @@ -134,6 +139,7 @@ testPython3_7() {
else
assertNotCaptured "security update"
assertCaptured $LATEST_37
assertCaptured "Installing pip 20.0.2"
assertCaptured "Installing SQLite3"
assertCapturedSuccess
fi
Expand Down Expand Up @@ -177,6 +183,7 @@ testPython3_8() {
else
assertNotCaptured "security update"
assertCaptured $LATEST_38
assertCaptured "Installing pip 20.0.2"
assertCaptured "Installing SQLite3"
assertCapturedSuccess
fi
Expand All @@ -195,6 +202,7 @@ testPypy3_6() {
else
assertCaptured "Installing pypy"
assertCaptured "$PYPY_36"
assertCaptured "Installing pip 20.0.2"
assertCapturedSuccess
fi
}
Expand All @@ -206,6 +214,7 @@ testPypy2_7() {
else
assertCaptured "Installing pypy"
assertCaptured "$PYPY_27"
assertCaptured "Installing pip 20.0.2"
assertCapturedSuccess
fi
}
Expand Down

0 comments on commit 0e93678

Please sign in to comment.