Skip to content

Commit c4b4bfa

Browse files
authored
Merge branch 'master' into test-staged-binaries
2 parents 7c82017 + fe6a81d commit c4b4bfa

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# Master
44

55
- Test staged binaries on Travis
6+
- Unpin Heroku-18 binary build deps
7+
- Typo fixes
68

79
--------------------------------------------------------------------------------
810

bin/steps/pip-uninstall

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
1313

1414

1515
if ! pip-diff --stale requirements-declared.txt requirements.txt --exclude setuptools pip wheel > .heroku/python/requirements-stale.txt; then
16-
mount "failure.bad-requirements"
16+
mcount "failure.bad-requirements"
1717
fi
1818

1919
rm -fr requirements-declared.txt

builds/heroku-18.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENV WORKSPACE_DIR="/app/builds" \
77
DEBIAN_FRONTEND=noninteractive \
88
STACK="heroku-18"
99

10-
RUN apt-get update && apt-get install --no-install-recommends -y python-pip-whl=9.0.1-2 python-pip=9.0.1-2 python-setuptools python-wheel && rm -rf /var/lib/apt/lists/*
10+
RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/*
1111

1212
COPY requirements.txt /app/
1313
RUN pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt

0 commit comments

Comments
 (0)