From 4ee3baaded221c35c8e48310bcf77bc9ffc6f260 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz <me@kennethreitz.org> Date: Sat, 3 Jun 2017 17:36:19 -0400 Subject: [PATCH] Revert "Don't install packages that could mess packaging up" (#404) * Revert "Fix pyyaml (#402)" This reverts commit ff94908505fa5466b2547d3d7af3d34cb232bfec. * Revert "Don't install packages that could mess packaging up (#397)" This reverts commit 5496c02f9f6c06af34987c6b1e9d33243c75bdc4. --- CHANGELOG.md | 12 ------------ bin/compile | 12 ++++-------- bin/steps/setuptools | 11 ----------- vendor/pip-pop/pip-clean | 33 --------------------------------- vendor/pip-pop/requirements.txt | 17 ----------------- 5 files changed, 4 insertions(+), 81 deletions(-) delete mode 100755 bin/steps/setuptools delete mode 100755 vendor/pip-pop/pip-clean delete mode 100644 vendor/pip-pop/requirements.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 80d88287..c6b13c56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,5 @@ # Python Buildpack Changelog -# 106 - -Don't install packages that could mess up packaging. - -- The Python buildpack will automatically remove `six`, `pyparsing`, `appdirs`, - `setuptools`, and `distribute` from a `requirements.txt` file now, as these - packages are provided by the Python buildpack. - -# 105 - -Improvements to output messaging. - # 104 General improvements. diff --git a/bin/compile b/bin/compile index 78b63bcd..ab60dbe7 100755 --- a/bin/compile +++ b/bin/compile @@ -171,19 +171,15 @@ sub-env $BIN_DIR/steps/geo-libs # GDAL support. source $BIN_DIR/steps/gdal -# Uninstall removed dependencies with Pip. -let start=$(nowms) -source $BIN_DIR/steps/pip-uninstall -mtime "pip.uninstall.time" "${start}" - -# Cleanup requirements.txt -source $BIN_DIR/steps/setuptools - # Install dependencies with Pip (where the magic happens). let start=$(nowms) source $BIN_DIR/steps/pip-install mtime "pip.install.time" "${start}" +# Uninstall removed dependencies with Pip. +let start=$(nowms) +source $BIN_DIR/steps/pip-uninstall +mtime "pip.uninstall.time" "${start}" # Support for NLTK corpora. let start=$(nowms) diff --git a/bin/steps/setuptools b/bin/steps/setuptools deleted file mode 100755 index 3bfc8ed3..00000000 --- a/bin/steps/setuptools +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Syntax sugar. -source $BIN_DIR/utils - -puts-step "Removing packaging utilities from requirements.txt." - -if [[ -f requirements.txt ]]; then - pip-clean requirements.txt -fi - diff --git a/vendor/pip-pop/pip-clean b/vendor/pip-pop/pip-clean deleted file mode 100755 index b17e4619..00000000 --- a/vendor/pip-pop/pip-clean +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -"""Usage: - pip-clean <req-file> - -Options: - -h --help Show this screen. -""" -from docopt import docopt - -BAD_PACKAGES = ['appdirs', 'packaging', 'pyparsing', 'six', 'setuptools', 'distribute'] - - -def good_package(line): - package_name = line.split('=')[0].split('<')[0].split('>')[0].split(' ')[0].split('#')[0].split('\n')[0] - return package_name not in BAD_PACKAGES - -def main(): - args = docopt(__doc__, version='pip-clean') - req_file = args['<req-file>'] - - with open(req_file, 'r') as f: - # Iterate over every line in the requirements file. - lines = [line for line in f if good_package(line)] - - # Write the requirements file to disk. - with open(req_file, 'w') as f: - f.write(''.join(lines)) - - -if __name__ == '__main__': - main() diff --git a/vendor/pip-pop/requirements.txt b/vendor/pip-pop/requirements.txt deleted file mode 100644 index e2541fa2..00000000 --- a/vendor/pip-pop/requirements.txt +++ /dev/null @@ -1,17 +0,0 @@ -certifi==2017.4.17 -chardet==3.0.3 -dateparser -humanize==0.5.1 -idna==2.5 -maya==0.3.2 -pendulum==1.2.1 -python-dateutil==2.6.0 -pytz==2017.2 -pytzdata==2017.2 -regex==2017.5.26 -requests==2.17.3 -ruamel.ordereddict==0.4.9 -ruamel.yaml==0.14.12 -tzlocal==1.4 -urllib3==1.21.1 - -- GitLab