Skip to content
Snippets Groups Projects
Commit a7976fc1 authored by Kenneth Reitz's avatar Kenneth Reitz
Browse files

Merge remote-tracking branch 'origin/master'

parents 87d03e62 928a6645
No related branches found
No related tags found
No related merge requests found
sudo: false
script: exit 0
-![python](https://cloud.githubusercontent.com/assets/51578/13712821/b68a42ce-e793-11e5-96b0-d8eb978137ba.png)
# Heroku Buildpack: Python # Heroku Buildpack: Python
![python](https://cloud.githubusercontent.com/assets/51578/13712821/b68a42ce-e793-11e5-96b0-d8eb978137ba.png)
This is the official [Heroku buildpack](https://devcenter.heroku.com/articles/buildpacks) for Python apps, powered by [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 [pip](https://pip.pypa.io/) and other excellent software.
......
#!/usr/bin/env bash #!/usr/bin/env bash
# This script serves as the Pylibmc build step of the # This script serves as the Cryptography build step of the
# [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python) # [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python)
# compiler. # compiler.
# #
...@@ -20,7 +20,7 @@ source $BIN_DIR/utils ...@@ -20,7 +20,7 @@ source $BIN_DIR/utils
bpwatch start libffi_install bpwatch start libffi_install
# If a package using cffi exists within requirements, use vendored libffi. # If a package using cffi exists within requirements, use vendored libffi.
if (pip-grep -s requirements.txt bcrypt cffi cryptography django[bcrypt] Django[bcrypt] PyNaCl pyOpenSSL PyOpenSSL requests[security] &> /dev/null) then if (pip-grep -s requirements.txt bcrypt cffi cryptography django[bcrypt] Django[bcrypt] PyNaCl pyOpenSSL PyOpenSSL requests[security] misaka &> /dev/null) then
if [ -d ".heroku/vendor/lib/libffi-3.1.1" ]; then if [ -d ".heroku/vendor/lib/libffi-3.1.1" ]; then
export LIBFFI=$(pwd)/vendor export LIBFFI=$(pwd)/vendor
......
...@@ -62,7 +62,7 @@ def grep(reqfile, packages, silent=False): ...@@ -62,7 +62,7 @@ def grep(reqfile, packages, silent=False):
exit(0) exit(0)
if not silent: if not silent:
print('Not found.'.format(requirement.req.project_name)) print('Not found.')
exit(1) exit(1)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment