From e4aa40216bd55197040ba2fa4729c7289f09add0 Mon Sep 17 00:00:00 2001 From: Chad Whitacre Date: Tue, 10 May 2016 07:12:55 -0400 Subject: [PATCH 1/8] remove Pylibmc reference in cryptography comment --- bin/steps/cryptography | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/steps/cryptography b/bin/steps/cryptography index 1aa74b3..23a6f94 100755 --- a/bin/steps/cryptography +++ b/bin/steps/cryptography @@ -1,6 +1,6 @@ #!/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) # compiler. # From a84fc7a24811a13951cbdb538aab561d862e2f77 Mon Sep 17 00:00:00 2001 From: Chad Whitacre Date: Tue, 10 May 2016 07:31:25 -0400 Subject: [PATCH 2/8] clean up pip-pop in the `not silent` case The extraneous `format` call is harmless in itself, but it's possible for `requirement.req` to be `None` here, which results in `AttributeError: 'NoneType' object has no attribute 'project_name'`. --- vendor/pip-pop/pip-grep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/pip-pop/pip-grep b/vendor/pip-pop/pip-grep index acf579a..6d29943 100755 --- a/vendor/pip-pop/pip-grep +++ b/vendor/pip-pop/pip-grep @@ -62,7 +62,7 @@ def grep(reqfile, packages, silent=False): exit(0) if not silent: - print('Not found.'.format(requirement.req.project_name)) + print('Not found.') exit(1) From 366def6c1642f4b191bd80e5da0f498c16012675 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 13 May 2016 13:17:03 -0400 Subject: [PATCH 3/8] Added another package that relies on cffi --- bin/steps/cryptography | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/steps/cryptography b/bin/steps/cryptography index 1aa74b3..393009a 100755 --- a/bin/steps/cryptography +++ b/bin/steps/cryptography @@ -20,7 +20,7 @@ source $BIN_DIR/utils bpwatch start libffi_install # 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 export LIBFFI=$(pwd)/vendor From 6207b3506b0cbe05340a7babf25b88b1da11edd1 Mon Sep 17 00:00:00 2001 From: Troels Thomsen Date: Wed, 25 May 2016 10:37:03 +0200 Subject: [PATCH 4/8] Rename readme file --- Readme.md => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Readme.md => README.md (100%) diff --git a/Readme.md b/README.md similarity index 100% rename from Readme.md rename to README.md From 902672e9346f1201da38516f34033cf8abfc1000 Mon Sep 17 00:00:00 2001 From: Troels Thomsen Date: Wed, 25 May 2016 10:37:25 +0200 Subject: [PATCH 5/8] Add Travis configuration --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..0a3316f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,2 @@ +sudo: false +script: exit 0 From ab3e365ff6086f2fadd94a5c283879912a671645 Mon Sep 17 00:00:00 2001 From: Troels Thomsen Date: Wed, 25 May 2016 10:37:34 +0200 Subject: [PATCH 6/8] Show build status in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2d90fb1..647eee7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Heroku Buildpack: Python +# Heroku Buildpack: Python [![Build Status](https://travis-ci.org/heroku/heroku-buildpack-python.svg?branch=master)](https://travis-ci.org/heroku/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. From 9fb715ef1cf4c430700962f35c66725eb8cd290f Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Wed, 15 Jun 2016 04:33:01 -0400 Subject: [PATCH 7/8] no --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 647eee7..147a8fa 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -# Heroku Buildpack: Python [![Build Status](https://travis-ci.org/heroku/heroku-buildpack-python.svg?branch=master)](https://travis-ci.org/heroku/heroku-buildpack-python) -![python](https://cloud.githubusercontent.com/assets/51578/13712821/b68a42ce-e793-11e5-96b0-d8eb978137ba.png) +# Heroku Buildpack: Python 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. From 928a66454476976e6eabd2bee5aa77af12449fed Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Wed, 15 Jun 2016 04:35:28 -0400 Subject: [PATCH 8/8] yes --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 147a8fa..7a53f1a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +-![python](https://cloud.githubusercontent.com/assets/51578/13712821/b68a42ce-e793-11e5-96b0-d8eb978137ba.png) + # Heroku Buildpack: Python 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.