From 98dc586a99386446babd5cdb5744839b7eb4ac59 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.org>
Date: Tue, 30 May 2017 11:36:10 -0400
Subject: [PATCH] Setuptools (#396)
* updated changelog
* remove setuptools sanity check
---
CHANGELOG.md | 3 ++-
bin/compile | 5 -----
bin/steps/setuptools | 11 -----------
3 files changed, 2 insertions(+), 17 deletions(-)
delete mode 100755 bin/steps/setuptools
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a701a73..c6b13c56 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 468cf727..ab60dbe7 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 66a86173..00000000
--- 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
--
GitLab