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

Commit

Permalink
Remove redundant Mercurial install step (heroku#1111)
Browse files Browse the repository at this point in the history
Mercurial is installed in the stack image for all stacks, so the
pip install of packages from Mercurial VCS URLs works without the
need for the buildpack to install it itself.

See:
heroku/base-images#141
https://github.com/heroku/stack-images/search?q=mercurial

Closes @W-7906950@.
  • Loading branch information
edmorley authored and dryan committed Nov 19, 2020
1 parent b46a719 commit ea3f8f6
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 16 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased

- Remove redundant Mercurial install step (#1111).
- Remove support for the Cedar-14 stack (#1110).

## v184 (2020-10-21)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ STACK_IMAGE_TAG := heroku/$(subst -,:,$(STACK))-build

check:
@shellcheck -x bin/compile bin/detect bin/release bin/test-compile bin/utils bin/warnings bin/default_pythons
@shellcheck -x bin/steps/collectstatic bin/steps/eggpath-fix bin/steps/eggpath-fix2 bin/steps/gdal bin/steps/geo-libs bin/steps/mercurial bin/steps/nltk bin/steps/pip-install bin/steps/pip-uninstall bin/steps/pipenv bin/steps/pipenv-python-version bin/steps/python
@shellcheck -x bin/steps/collectstatic bin/steps/eggpath-fix bin/steps/eggpath-fix2 bin/steps/gdal bin/steps/geo-libs bin/steps/nltk bin/steps/pip-install bin/steps/pip-uninstall bin/steps/pipenv bin/steps/pipenv-python-version bin/steps/python
@shellcheck -x bin/steps/hooks/*

test:
Expand Down
6 changes: 0 additions & 6 deletions bin/compile
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,6 @@ fi
# shellcheck source=bin/steps/eggpath-fix
source "$BIN_DIR/steps/eggpath-fix"

# Mercurial support.
# If a customer appears to be using mercurial for dependency resolution, we install it first.
# Note: this only applies to pip, not pipenv. This can likely be removed, over time. Measure it first.
# shellcheck source=bin/steps/mercurial
source "$BIN_DIR/steps/mercurial"

# Support for Geo libraries. This is deprecated functionality.
# It is undocumented.
# shellcheck source=bin/steps/geo-libs
Expand Down
9 changes: 0 additions & 9 deletions bin/steps/mercurial

This file was deleted.

1 change: 1 addition & 0 deletions test/fixtures/requirements-mercurial/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hg+https://www.mercurial-scm.org/repo/python-hglib/#egg=python-hglib
6 changes: 6 additions & 0 deletions test/run-deps
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ testPylibmc() {
assertCapturedSuccess
}

testMercurial() {
compile "requirements-mercurial"
assertCaptured "Cloning hg"
assertCapturedSuccess
}

pushd $(dirname 0) >/dev/null
popd >/dev/null

Expand Down

0 comments on commit ea3f8f6

Please sign in to comment.