diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a701a735b3aa983640918a2025a07657db5d765..c6b13c563c16f07090b5633038df3f0a931c6088 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,9 @@ # 104 -unreleased +General improvements. +- Fix for Heroku CI. - Use `pkg_resources` to check if a distribution is installed instead of parsing `requirements.txt`. ([#395][395]) diff --git a/bin/compile b/bin/compile index 468cf7274ec8ec3032a174d5e3769ada70252af6..ab60dbe7566d4cb6d30d33fc46c93ac4f382ded4 100755 --- a/bin/compile +++ b/bin/compile @@ -145,11 +145,6 @@ let start=$(nowms) source $BIN_DIR/steps/python mtime "python.install.time" "${start}" -# Sanity check for setuptools/distribute. -let start=$(nowms) -source $BIN_DIR/steps/setuptools -mtime "setuptools.install.time" "${start}" - # Pipenv support. source $BIN_DIR/steps/pipenv diff --git a/bin/steps/setuptools b/bin/steps/setuptools deleted file mode 100755 index 66a86173880bc775fbe49b27fc7844a043e005d7..0000000000000000000000000000000000000000 --- a/bin/steps/setuptools +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Syntax sugar. -source $BIN_DIR/utils - -if (pip-grep -s setuptools distribute &> /dev/null) then - - puts-warn 'The package setuptools/distribute is listed in requirements.txt.' - puts-warn 'Please remove to ensure expected behavior. ' - -fi