From 0c701de466955e9d52a56a46dda30ddd8c096358 Mon Sep 17 00:00:00 2001 From: Claudio Jolowicz Date: Thu, 22 Aug 2019 13:17:03 +0200 Subject: [PATCH 1/6] Fix typo in command to log pip-diff failure The pip-diff tool from vendor/pip-pop is used to determine stale requirements. When pip-diff encounters an unexpected failure, a count is logged using mcount from heroku/buildpack-stdlib. Due to a typo, mount(8) was invoked instead of mcount, with an invalid argument. --- bin/steps/pip-uninstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/steps/pip-uninstall b/bin/steps/pip-uninstall index 682b2c9..2e1ad8d 100755 --- a/bin/steps/pip-uninstall +++ b/bin/steps/pip-uninstall @@ -13,7 +13,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then if ! pip-diff --stale requirements-declared.txt requirements.txt --exclude setuptools pip wheel > .heroku/python/requirements-stale.txt; then - mount "failure.bad-requirements" + mcount "failure.bad-requirements" fi rm -fr requirements-declared.txt From 6e4b43fa1dde25ec9187701cd218ebaee89d965c Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Fri, 27 Sep 2019 14:09:30 -0700 Subject: [PATCH 2/6] add changelog update to retrigger tests --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76e6fd3..c620740 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ # Master +Typo fixes + -------------------------------------------------------------------------------- # 156 (2019-09-12) From 15ecb76950d7fe60ddaefaf942630fc5e523917a Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Mon, 30 Sep 2019 11:00:27 -0700 Subject: [PATCH 3/6] revert pin bionic packages for heroku-18 --- builds/heroku-18.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builds/heroku-18.Dockerfile b/builds/heroku-18.Dockerfile index 6428fa6..6288ac0 100644 --- a/builds/heroku-18.Dockerfile +++ b/builds/heroku-18.Dockerfile @@ -7,7 +7,7 @@ ENV WORKSPACE_DIR="/app/builds" \ DEBIAN_FRONTEND=noninteractive \ STACK="heroku-18" -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/* +RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/* COPY requirements.txt /app/ RUN pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt From b2b12d0355ec86160c008802f4f882d506018746 Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Mon, 30 Sep 2019 11:01:49 -0700 Subject: [PATCH 4/6] add changelog update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76e6fd3..b26961e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ # Master +- Unpin Heroku-18 binary build deps + -------------------------------------------------------------------------------- # 156 (2019-09-12) From 98df315cfa2d4c6961ca707c72b8c57be05011cf Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Tue, 1 Oct 2019 06:37:03 -0700 Subject: [PATCH 5/6] pin docker build env --- builds/heroku-18.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builds/heroku-18.Dockerfile b/builds/heroku-18.Dockerfile index 6288ac0..7f0f942 100644 --- a/builds/heroku-18.Dockerfile +++ b/builds/heroku-18.Dockerfile @@ -1,4 +1,4 @@ -FROM heroku/heroku:18-build +FROM heroku/heroku:18-build.v16 WORKDIR /app ENV WORKSPACE_DIR="/app/builds" \ @@ -7,7 +7,7 @@ ENV WORKSPACE_DIR="/app/builds" \ DEBIAN_FRONTEND=noninteractive \ STACK="heroku-18" -RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/* +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/* COPY requirements.txt /app/ RUN pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt From 7a313c53a5b1afe8653d68e198f487093a2477ac Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Tue, 1 Oct 2019 06:43:37 -0700 Subject: [PATCH 6/6] update changelog --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 508191b..b406ae3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,6 @@ # Master -- Unpin Heroku-18 binary build deps - Typo fixes --------------------------------------------------------------------------------