Compare commits

...

2 Commits

Author SHA1 Message Date
kennethreitz c8c8995d70 Next version (#405)
* python 3.5.3

* v108

* new setuptools version

* removed unneeded variable
2017-06-03 17:51:44 -04:00
kennethreitz 4ee3baaded Revert "Don't install packages that could mess packaging up" (#404)
* Revert "Fix pyyaml (#402)"

This reverts commit ff94908505.

* Revert "Don't install packages that could mess packaging up (#397)"

This reverts commit 5496c02f9f.
2017-06-03 17:36:19 -04:00
6 changed files with 36 additions and 76 deletions
+14 -6
View File
@@ -1,16 +1,24 @@
# Python Buildpack Changelog
# 108
Updated setuptools.
# 107
Bugfix for C dependency installation.
# 106
Don't install packages that could mess up packaging.
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.
- 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
# 105
Improvements to output messaging.
Improvements to output messaging.
# 104
+4 -9
View File
@@ -36,7 +36,6 @@ DEFAULT_PYTHON_VERSION="python-2.7.13"
DEFAULT_PYTHON_STACK="cedar-14"
PYTHON_EXE="/app/.heroku/python/bin/python"
PIP_VERSION="9.0.1"
SETUPTOOLS_VERSION="32.1.0"
# Common Problem Warnings
export WARNINGS_LOG=$(mktemp)
@@ -171,19 +170,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)
-11
View File
@@ -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
+18
View File
@@ -0,0 +1,18 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/python/
# Build Deps: libraries/sqlite
OUT_PREFIX=$1
echo "Building Python..."
SOURCE_TARBALL='https://python.org/ftp/python/3.5.3/Python-3.5.3.tgz'
curl -L $SOURCE_TARBALL | tar xz
mv Python-3.5.3 src
cd src
./configure --prefix=$OUT_PREFIX --with-ensurepip=no
make
make install
# ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python
-33
View File
@@ -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()
-17
View File
@@ -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