Compare commits

...

33 Commits

Author SHA1 Message Date
kennethreitz f9e54dc3f6 don't skip Pipenv installation if there are git deps (#656) 2018-03-13 22:02:29 -04:00
kennethreitz 7d975e74a9 default to user python path for collectstatic runs (#655)
* default to user python path for collectstatic runs

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* bugfixes

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* fix

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-13 20:59:11 -04:00
kennethreitz 5f8360cba8 Metrics (#657)
* metrics

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* using pipenv anyway

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* instrument bad failures

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* if not

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-13 20:56:40 -04:00
kennethreitz 091656088d bugfixes
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-07 11:14:46 -05:00
kennethreitz 05e3d8ccce fix mercurial step
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-07 11:08:13 -05:00
kennethreitz 2f18118cd3 no longer check cryptogrpahy step
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-07 11:00:37 -05:00
kennethreitz 920fefce57 source pipenv step
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-07 10:58:38 -05:00
kennethreitz fd53d4e1b0 also skip pip install
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-07 10:57:31 -05:00
kennethreitz 329cd6eb7b don't print extra information
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-07 10:56:49 -05:00
kennethreitz b6f042b118 fix the problem
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-07 10:54:58 -05:00
kennethreitz 7cbca2f5c5 always use pipenv if it's there
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-07 10:54:09 -05:00
kennethreitz fe302d8724 don't expect there to be a requirements.txt
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-07 10:51:48 -05:00
kennethreitz 0f0ddd52ea don't suppress error messages
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-07 10:50:03 -05:00
kennethreitz a334672a1a reorder things
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-07 10:48:22 -05:00
kennethreitz 7b26f0df44 set -e
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-07 10:38:56 -05:00
kennethreitz 96df073bdf cleanup
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-06 16:06:12 -05:00
kennethreitz cbf074a856 Merge branch 'master' of github.com:heroku/heroku-buildpack-python 2018-03-06 16:05:34 -05:00
kennethreitz c373e80c12 remove cryptogrpahy step, as they ship wheels now
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-06 16:05:19 -05:00
kennethreitz 714826eea2 Update CHANGELOG.md 2018-03-06 15:55:03 -05:00
kennethreitz 41b342e03b Update CHANGELOG.md 2018-03-06 15:54:41 -05:00
kennethreitz 45ceb2f451 Update CHANGELOG.md 2018-03-06 15:54:06 -05:00
kennethreitz 3511cae1bb Update CHANGELOG.md 2018-03-06 15:53:41 -05:00
kennethreitz ce5ff2384f fix changelog
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-06 15:52:19 -05:00
kennethreitz 97ac451a80 Pipenv uninstall, and other improvements (#650) 2018-03-06 15:44:50 -05:00
kennethreitz 06fa6d23ba Update README.md (#649) 2018-03-02 18:56:06 -05:00
kennethreitz df083fd3b8 Update pipenv-python-version to latest python 3.6 (#644)
* Update pipenv-python-version

* use latest versions in pipenv script

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* Update pipenv-python-version

* 3.6.4

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
2018-03-02 18:38:21 -05:00
jxltom 2e1638a1b0 Fix PYTHONPATH is not set when running collectstatic (#637)
* Fix PYTHONPATH is not set when running collectstatic

* update changelog

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

* Update CHANGELOG.md
2018-03-02 09:04:00 -05:00
Jose Diaz-Gonzalez e15f68944a feat: allow stack url overrides using BUILDPACK_VENDOR_URL env var (#643)
This is useful if you'd like to customize python binaries without forking the entire buildpack.

Similar functionality was implemented in https://github.com/heroku/heroku-buildpack-ruby/pull/238
2018-03-02 07:15:23 -05:00
Eugene Pakhomov 9468ec2630 Add support for PIP_EXTRA_INDEX_URL (#639)
* Add support for PIP_EXTRA_INDEX_URL

* Add support for PIP_EXTRA_INDEX_URL for Pipenv
2018-02-17 05:58:40 -06:00
Swen Kooij c4ec6d3370 Account for the root not being /app (#638) 2018-02-16 09:30:22 -06:00
kennethreitz 1ed0a96b09 Update README.md (#642) 2018-02-15 18:03:28 -06:00
kennethreitz 500daaf6fc Pipenv development dependencies (ci) (#633)
* initial stab at pipenv --dev support

* test installation output

* locale fix

* refactor

* fix typo

* fix typo

* ellipsis

* polish
2018-01-16 13:36:01 -05:00
kennethreitz 4a1fcafecc Changelog Updates (#630)
* changelog notice

* v123

* v123
2018-01-15 12:09:38 -05:00
19 changed files with 212 additions and 114 deletions
+26 -1
View File
@@ -1,12 +1,37 @@
# Python Buildpack Changelog
# 126
Bugfixes.
# 125
Bugfixes.
# 124
Update buildpack to automatically install `[dev-packages]` during Heroku CI Pipenv builds.
- Skip installs if Pipfile.lock hasn't changed, and uninstall stale dependencies with Pipenv.
- Set `PYTHONPATH` during collectstatic runs.
- No longer warn if there is no `Procfile`.
- Update Pipenv's "3.6" runtime specifier to point to "3.6.4".
# 123
Update gunicorn `init.d` script to allow overrides.
# 122
Update default Python to v3.6.4.
# 121
Update default Python to v3.6.3.
# 120
Use Pipenv --deploy.
Use `$ pipenv --deploy`.
# 119
+1 -1
View File
@@ -5,7 +5,7 @@ test: test-heroku-16
check:
@shellcheck -x bin/compile bin/detect bin/release bin/test-compile bin/utils bin/warnings
@shellcheck -x bin/steps/collectstatic bin/steps/cryptography 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/pylibmc 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/mercurial bin/steps/nltk bin/steps/pip-install bin/steps/pip-uninstall bin/steps/pipenv bin/steps/pipenv-python-version bin/steps/pylibmc bin/steps/python
@shellcheck -x bin/steps/hooks/*
test-cedar-14:
+11 -13
View File
@@ -4,11 +4,11 @@
[![Build Status](https://travis-ci.org/heroku/heroku-buildpack-python.svg?branch=master)](https://travis-ci.org/heroku/heroku-buildpack-python)
This is the official [Heroku buildpack](https://devcenter.heroku.com/articles/buildpacks) for Python apps, powered by [Pipenv](http://docs.pipenv.org/en/latest/), [pip](https://pip.pypa.io/) and other excellent software.
This is the official [Heroku buildpack](https://devcenter.heroku.com/articles/buildpacks) for Python apps, powered by [Pipenv](http://docs.pipenv.org/), [pip](https://pip.pypa.io/) and other excellent software.
Recommended web frameworks include **Django** and **Flask**. The recommended webserver is **Gunicorn**. There are no restrictions around what software can be used (as long as it's pip-installable). Web processes must bind to `$PORT`, and only the HTTP protocol is permitted for incoming connections.
Some Python packages with obscure C dependencies are [not compatible](https://devcenter.heroku.com/articles/python-c-deps).
Python packages with C dependencies that are not [available on the stack image](https://devcenter.heroku.com/articles/stack-packages) are generally not supported, unless `manylinux` wheels are provided by the package maintainers (common). For recommended solutions, check out [this article](https://devcenter.heroku.com/articles/python-c-deps) for more information.
See it in Action
----------------
@@ -16,14 +16,14 @@ See it in Action
Deploying a Python application couldn't be easier:
$ ls
Pipfile Procfile web.py
Pipfile Pipfile.lock Procfile web.py
$ heroku create --buildpack heroku/python
$ git push heroku master
-----> Python app detected
-----> Installing python-3.6.3
-----> Installing python-3.6.4
-----> Installing pip
-----> Installing requirements with latest pipenv…
...
@@ -41,12 +41,7 @@ You can also specify the latest production release of this buildpack for upcomin
Specify a Python Runtime
------------------------
Specific versions of the Python runtime can be specified with a `runtime.txt` file:
$ cat runtime.txt
python-2.7.14
Or, with a `Pipfile.lock` (generated from the following `Pipfile`):
Specific versions of the Python runtime can be specified in your `Pipfile`:
[requires]
python_version = "2.7"
@@ -56,9 +51,12 @@ Or, more specifically:
[requires]
python_full_version = "2.7.14"
Or, with a `runtime.txt` file:
$ cat runtime.txt
python-2.7.14
Runtime options include:
- `python-3.6.3`
- `python-3.6.4`
- `python-2.7.14`
- `pypy-5.7.1` (unsupported, experimental)
- `pypy3-5.5.1` (unsupported, experimental)
+27 -20
View File
@@ -33,6 +33,12 @@ ENV_DIR=$3
export BUILD_DIR CACHE_DIR ENV_DIR
VENDOR_URL="https://lang-python.s3.amazonaws.com/$STACK"
if [[ -n ${BUILDPACK_VENDOR_URL:-} ]]; then
VENDOR_URL="$BUILDPACK_VENDOR_URL"
fi
export VENDOR_URL
# Python defaults
DEFAULT_PYTHON_VERSION="python-3.6.4"
LATEST_3="python-3.6.4"
@@ -94,12 +100,6 @@ export PKG_CONFIG_PATH=/app/.heroku/vendor/lib/pkg-config:/app/.heroku/python/li
# Switch to the repo's context.
cd "$BUILD_DIR"
# Warn for lack of Procfile.
if [[ ! -f Procfile ]]; then
puts-warn 'Warning: Your application is missing a Procfile. This file tells Heroku how to run your application.'
puts-warn 'Learn more: https://devcenter.heroku.com/articles/procfile'
fi
# Prepare the cache.
mkdir -p "$CACHE_DIR"
@@ -162,6 +162,13 @@ mtime "python.install.time" "${start}"
# shellcheck source=bin/steps/pipenv
source "$BIN_DIR/steps/pipenv"
# Uninstall removed dependencies with Pip.
let start=$(nowms)
# shellcheck source=bin/steps/pip-uninstall
source "$BIN_DIR/steps/pip-uninstall"
mtime "pip.uninstall.time" "${start}"
# If no requirements.txt file given, assume `setup.py develop` is intended.
if [ ! -f requirements.txt ] && [ ! -f Pipfile ]; then
echo "-e ." > requirements.txt
@@ -179,10 +186,6 @@ source "$BIN_DIR/steps/mercurial"
# shellcheck source=bin/steps/pylibmc
source "$BIN_DIR/steps/pylibmc"
# Libffi support.
# shellcheck source=bin/steps/cryptography
source "$BIN_DIR/steps/cryptography"
# Support for Geo libraries.
# shellcheck source=bin/steps/geo-libs
sub_env "$BIN_DIR/steps/geo-libs"
@@ -191,12 +194,6 @@ sub_env "$BIN_DIR/steps/geo-libs"
# shellcheck source=bin/steps/gdal
source "$BIN_DIR/steps/gdal"
# Uninstall removed dependencies with Pip.
let start=$(nowms)
# shellcheck source=bin/steps/pip-uninstall
source "$BIN_DIR/steps/pip-uninstall"
mtime "pip.uninstall.time" "${start}"
# Install dependencies with Pip (where the magic happens).
let start=$(nowms)
# shellcheck source=bin/steps/pip-install
@@ -224,14 +221,24 @@ mtime "collectstatic.time" "${start}"
# Create .profile script for application runtime environment variables.
set_env PATH "\$HOME/.heroku/python/bin:\$PATH"
set_env PYTHONUNBUFFERED true
set_env PYTHONHOME /app/.heroku/python
set_env PYTHONHOME "\$HOME/.heroku/python"
set_env LIBRARY_PATH "/app/.heroku/vendor/lib:/app/.heroku/python/lib:\$LIBRARY_PATH"
set_env LD_LIBRARY_PATH "/app/.heroku/vendor/lib:/app/.heroku/python/lib:\$LD_LIBRARY_PATH"
set_env LIBRARY_PATH "\$HOME/.heroku/vendor/lib:\$HOME/.heroku/python/lib:\$LIBRARY_PATH"
set_env LD_LIBRARY_PATH "\$HOME/.heroku/vendor/lib:\$HOME/.heroku/python/lib:\$LD_LIBRARY_PATH"
set_default_env LANG en_US.UTF-8
set_default_env PYTHONHASHSEED random
set_default_env PYTHONPATH /app/
set_default_env PYTHONPATH "\$HOME"
# python expects to be in /app, if at runtime, it is not, set
# up symlinks... this can occur when the subdir buildpack is used
cat <<EOT >> "$PROFILE_PATH"
if [[ \$HOME != "/app" ]]; then
mkdir -p /app/.heroku
ln -nsf "\$HOME/.heroku/python" /app/.heroku/python
ln -nsf "\$HOME/.heroku/vendor" /app/.heroku/vendor
fi
EOT
# Install sane-default script for $WEB_CONCURRENCY and $FORWARDED_ALLOW_IPS.
cp "$ROOT_DIR/vendor/WEB_CONCURRENCY.sh" "$WEB_CONCURRENCY_PROFILE_PATH"
+4
View File
@@ -30,6 +30,8 @@ if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ] && [ "$DJANGO_INSTALL
puts-step "$ python $MANAGE_FILE collectstatic --noinput"
# Run collectstatic, cleanup some of the noisy output.
PYTHONPATH=${PYTHONPATH:-.}
export PYTHONPATH
python "$MANAGE_FILE" collectstatic --noinput --traceback 2>&1 | sed '/^Post-processed/d;/^Copying/d;/^$/d' | indent
COLLECTSTATIC_STATUS="${PIPESTATUS[0]}"
@@ -38,6 +40,8 @@ if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ] && [ "$DJANGO_INSTALL
# Display a warning if collectstatic failed.
[ "$COLLECTSTATIC_STATUS" -ne 0 ] && {
mcount "failure.collectstatic"
echo
echo " ! Error while running '$ python $MANAGE_FILE collectstatic --noinput'."
echo " See traceback above for details."
-38
View File
@@ -1,38 +0,0 @@
#!/usr/bin/env bash
# This script serves as the cffi build step of the
# [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python)
# compiler.
#
# A [buildpack](https://devcenter.heroku.com/articles/buildpacks) is an
# adapter between a Python application and Heroku's runtime.
#
# This script is invoked by [`bin/compile`](/).
if [[ "$STACK" == "heroku-16" ]]; then
# libffi is pre-installed in the stack image so there is no need to vendor it.
return 0
fi
# The location of the pre-compiled libffi binary.
VENDORED_LIBFFI="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libffi.tar.gz"
PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
# Syntax sugar.
# shellcheck source=bin/utils
source "$BIN_DIR/utils"
# If a package using cffi exists within requirements, use vendored libffi.
if (pip-grep -s requirements.txt argon2-cffi bcrypt cffi cryptography django[argon2] Django[argon2] django[bcrypt] Django[bcrypt] PyNaCl pyOpenSSL PyOpenSSL requests[security] misaka &> /dev/null) then
if [ ! -d ".heroku/vendor/lib/libffi-3.1" ]; then
echo "-----> Noticed cffi. Bootstrapping libffi."
mkdir -p .heroku/vendor
# Download and extract libffi into target vendor directory.
curl "$VENDORED_LIBFFI" -s | tar zxv -C .heroku/vendor &> /dev/null
fi
LIBFFI=$(pwd)/vendor
export LIBFFI
fi
+1 -1
View File
@@ -10,7 +10,7 @@
# This script is invoked by [`bin/compile`](/).
# The location of the pre-compiled cryptography binary.
VENDORED_GDAL="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/gdal.tar.gz"
VENDORED_GDAL="${VENDOR_URL}/libraries/vendor/gdal.tar.gz"
PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
+3 -3
View File
@@ -10,9 +10,9 @@
# This script is invoked by [`bin/compile`](/).
# The location of the pre-compiled cryptography binary.
VENDORED_GDAL="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/gdal.tar.gz"
VENDORED_GEOS="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/geos.tar.gz"
VENDORED_PROJ="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/proj.tar.gz"
VENDORED_GDAL="${VENDOR_URL}/libraries/vendor/gdal.tar.gz"
VENDORED_GEOS="${VENDOR_URL}/libraries/vendor/geos.tar.gz"
VENDORED_PROJ="${VENDOR_URL}/libraries/vendor/proj.tar.gz"
PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
+5 -2
View File
@@ -1,6 +1,9 @@
#!/usr/bin/env bash
# Install Mercurial if it appears to be required.
if (grep -Fiq "hg+" requirements.txt) then
/app/.heroku/python/bin/pip install mercurial | cleanup | indent
if [[ -f "requirements.txt" ]]; then
if (grep -Fiq "hg+" requirements.txt) then
/app/.heroku/python/bin/pip install mercurial | cleanup | indent
fi
fi
+24 -1
View File
@@ -8,11 +8,26 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
# Install dependencies with Pip.
puts-step "Installing requirements with pip"
# Set PIP_EXTRA_INDEX_URL
if [[ -r $ENV_DIR/PIP_EXTRA_INDEX_URL ]]; then
PIP_EXTRA_INDEX_URL="$(cat "$ENV_DIR/PIP_EXTRA_INDEX_URL")"
export PIP_EXTRA_INDEX_URL
fi
set +e
# Measure that we're using pip.
mcount "tool.pip"
# Count expected build failures.
if grep -q 'wsgiref' requirements.txt; then
mcount "failure.wsgiref"
fi
if grep -q '==0.0.0' requirements.txt; then
mcount "failure.none-version"
fi
/app/.heroku/python/bin/pip install -r "$BUILD_DIR/requirements.txt" --exists-action=w --src=/app/.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee "$WARNINGS_LOG" | cleanup | indent
PIP_STATUS="${PIPESTATUS[0]}"
set -e
@@ -29,4 +44,12 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
/app/.heroku/python/bin/pip freeze --disable-pip-version-check > .heroku/python/requirements-installed.txt
echo
# Install test dependencies, for CI.
if [ "$INSTALL_TEST" ]; then
if [[ -f "$1/requirements-test.txt" ]]; then
puts-step "Installing test dependencies…"
/app/.heroku/python/bin/pip install -r "$1/requirements-test.txt" --exists-action=w --src=./.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | cleanup | indent
fi
fi
fi
+16 -8
View File
@@ -2,19 +2,27 @@
set +e
# Install dependencies with Pip.
# shellcheck source=bin/utils
source $BIN_DIR/utils
if [[ -f .heroku/python/requirements-declared.txt ]]; then
if [ ! "$SKIP_PIP_INSTALL" ]; then
cp .heroku/python/requirements-declared.txt requirements-declared.txt
if [[ -f .heroku/python/requirements-declared.txt ]]; then
pip-diff --stale requirements-declared.txt requirements.txt --exclude setuptools pip wheel > .heroku/python/requirements-stale.txt
cp .heroku/python/requirements-declared.txt requirements-declared.txt
rm -fr requirements-declared.txt
if [[ -s .heroku/python/requirements-stale.txt ]]; then
puts-step "Uninstalling stale dependencies"
/app/.heroku/python/bin/pip uninstall -r .heroku/python/requirements-stale.txt -y --exists-action=w | cleanup | indent
if ! pip-diff --stale requirements-declared.txt requirements.txt --exclude setuptools pip wheel > .heroku/python/requirements-stale.txt; then
mount "failure.bad-requirements"
fi
rm -fr requirements-declared.txt
if [[ -s .heroku/python/requirements-stale.txt ]]; then
puts-step "Uninstalling stale dependencies"
/app/.heroku/python/bin/pip uninstall -r .heroku/python/requirements-stale.txt -y --exists-action=w | cleanup | indent
fi
fi
fi
fi
set -e
Regular → Executable
+53 -17
View File
@@ -4,31 +4,67 @@
# export PIPENV_FORCE_COLOR=1
# shellcheck source=bin/utils
source $BIN_DIR/utils
set -e
# Pipenv support (Generate requriements.txt with pipenv).
if [[ -f Pipfile ]]; then
if [[ ! -f requirements.txt ]]; then
puts-step "Installing requirements with latest Pipenv…"
if [[ -f Pipfile.lock ]]; then
if [[ -f .heroku/python/Pipfile.lock.sha256 ]]; then
if [[ $(openssl dgst -sha256 Pipfile.lock) == $(cat .heroku/python/Pipfile.lock.sha256) ]]; then
# Measure that we're using Pipenv.
mcount "tool.pipenv"
# Don't skip installation of there are git deps.
if ! grep -q 'git' Pipfile.lock; then
echo "Skipping installation, as Pipfile.lock hasn't changed since last deploy." | indent
mcount "tool.pipenv"
export SKIP_PIPENV_INSTALL=1
export SKIP_PIP_INSTALL=1
fi
fi
fi
fi
if [ ! "$SKIP_PIPENV_INSTALL" ]; then
# Pipenv support (Generate requriements.txt with pipenv).
if [[ -f Pipfile ]]; then
# Measure that we're using Pipenv.
mcount "tool.pipenv"
# Install pipenv.
/app/.heroku/python/bin/pip install pipenv --upgrade &> /dev/null
if [[ ! -f Pipfile.lock ]]; then
/app/.heroku/python/bin/pipenv install --system --skip-lock 2>&1 | indent
else
/app/.heroku/python/bin/pipenv install --system --deploy 2>&1 | indent
fi
# Install the dependencies.
# Skip pip install, later.
export SKIP_PIP_INSTALL=1
# Pip freeze, for compatibility.
/app/.heroku/python/bin/pip freeze > requirements.txt
# Set PIP_EXTRA_INDEX_URL
if [[ -r $ENV_DIR/PIP_EXTRA_INDEX_URL ]]; then
PIP_EXTRA_INDEX_URL="$(cat "$ENV_DIR/PIP_EXTRA_INDEX_URL")"
export PIP_EXTRA_INDEX_URL
fi
# Install pipenv.
/app/.heroku/python/bin/pip install pipenv --upgrade &> /dev/null
# Install the dependencies.
if [[ ! -f Pipfile.lock ]]; then
puts-step "Installing dependencies with latest Pipenv…"
/app/.heroku/python/bin/pipenv install --system --skip-lock 2>&1 | indent
else
pipenv-to-pip Pipfile.lock > requirements.txt
"$BIN_DIR/steps/pip-uninstall"
cp requirements.txt .heroku/python/requirements-declared.txt
openssl dgst -sha256 Pipfile.lock > .heroku/python/Pipfile.lock.sha256
puts-step "Installing dependencies with latest Pipenv…"
/app/.heroku/python/bin/pipenv install --system --deploy 2>&1 | indent
fi
# Install the test dependencies, for CI.
if [ "$INSTALL_TEST" ]; then
puts-step "Installing test dependencies…"
/app/.heroku/python/bin/pipenv install --dev --system --deploy 2>&1 | cleanup | indent
fi
fi
else
export SKIP_PIP_INSTALL=1
pipenv-to-pip Pipfile.lock > requirements.txt
fi
+2 -2
View File
@@ -19,10 +19,10 @@ if [[ -f $BUILD_DIR/Pipfile ]]; then
if [[ "$PYTHON" == "null" ]]; then
PYTHON=$(jq -r '._meta.requires.python_version' "$BUILD_DIR/Pipfile.lock")
if [ "$PYTHON" = 2.7 ]; then
echo "python-2.7.14" > "$BUILD_DIR/runtime.txt"
echo "$LATEST_2" > "$BUILD_DIR/runtime.txt"
fi
if [ "$PYTHON" = 3.6 ]; then
echo "python-3.6.3" > "$BUILD_DIR/runtime.txt"
echo "$LATEST_3" > "$BUILD_DIR/runtime.txt"
fi
fi
+1 -1
View File
@@ -15,7 +15,7 @@ if [[ "$STACK" == "heroku-16" ]]; then
fi
# The location of the pre-compiled libmemcached binary.
VENDORED_MEMCACHED="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libmemcache.tar.gz"
VENDORED_MEMCACHED="${VENDOR_URL}/libraries/vendor/libmemcache.tar.gz"
# Syntax sugar.
# shellcheck source=bin/utils
+4 -1
View File
@@ -4,6 +4,9 @@ set +e
runtime-fixer runtime.txt
PYTHON_VERSION=$(cat runtime.txt)
# The location of the pre-compiled python binary.
VENDORED_PYTHON="${VENDOR_URL}/runtimes/$PYTHON_VERSION.tar.gz"
if [[ $PYTHON_VERSION =~ ^python-2 ]]; then
if [[ "$PYTHON_VERSION" != "$LATEST_2" ]]; then
puts-warn "The latest version of Python 2 is $LATEST_2 (you are using $PYTHON_VERSION, which is unsupported)."
@@ -41,7 +44,7 @@ if [ ! "$SKIP_INSTALL" ]; then
mcount "version.python.$PYTHON_VERSION"
if ! curl "https://lang-python.s3.amazonaws.com/$STACK/runtimes/$PYTHON_VERSION.tar.gz" -s | tar zxv -C .heroku/python &> /dev/null; then
if ! curl "${VENDORED_PYTHON}" -s | tar zxv -C .heroku/python &> /dev/null; then
puts-warn "Requested runtime ($PYTHON_VERSION) is not available for this stack ($STACK)."
puts-warn "Aborting. More info: https://devcenter.heroku.com/articles/python-support"
exit 1
+4 -4
View File
@@ -6,8 +6,8 @@ BIN_DIR=$(cd "$(dirname "$0")" || return; pwd) # absolute path
# shellcheck source=bin/utils
source "$BIN_DIR/utils"
DISABLE_COLLECTSTATIC=1 "$(dirname "${0:-}")/compile" "$1" "$2" "$3"
# Locale support for Pipenv.
export LC_ALL=C.UTF-8
export LANG=C.UTF-8
if [[ -f "$1/requirements-test.txt" ]]; then
/app/.heroku/python/bin/pip install -r "$1/requirements-test.txt" --exists-action=w --src=./.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | cleanup | indent
fi
DISABLE_COLLECTSTATIC=1 INSTALL_TEST=1 "$(dirname "${0:-}")/compile" "$1" "$2" "$3"
+1
View File
@@ -41,6 +41,7 @@ class Requirements(object):
if not getattr(requirement.req, 'name', None):
# Prior to pip 8.1.2 the attribute `name` did not exist.
requirement.req.name = requirement.req.project_name
requirement.req.name = requirement.req.name.lower()
self.requirements.append(requirement.req)
+6 -1
View File
@@ -8,6 +8,7 @@ Options:
-h --help Show this screen.
"""
import os
import sys
from docopt import docopt
from pip.req import parse_requirements
from pip.index import PackageFinder
@@ -70,4 +71,8 @@ def main():
if __name__ == '__main__':
main()
try:
main()
except Exception:
sys.exit(1)
Vendored Executable
+23
View File
@@ -0,0 +1,23 @@
#!/usr/bin/env python
import json
import sys
def main():
INFILE = sys.argv[1]
with open(INFILE, 'rb') as f:
lockfile = json.load(f)
packages = []
for package in lockfile.get('default', {}):
try:
packages.append('{0}{1}'.format(package, lockfile['default'][package]['version']))
except KeyError:
pass
print('\n'.join(packages))
if __name__ == '__main__':
main()