From b706cd13f7253d823a8e7453c9e55bac86256ead Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Mon, 29 Feb 2016 18:00:46 +0000 Subject: [PATCH 1/3] Fix README and script comment typos --- Readme.md | 3 +-- bin/compile | 8 ++++---- bin/steps/collectstatic | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Readme.md b/Readme.md index b245f51..37b3f7d 100644 --- a/Readme.md +++ b/Readme.md @@ -32,12 +32,11 @@ Deploying a Python application couldn't be easier: A `requirements.txt` file must be present at the root of your application's repository. -You can also specify the latest production relase of this buildpack for upcoming builds of an existing application: +You can also specify the latest production release of this buildpack for upcoming builds of an existing application: $ heroku buildpacks:set heroku/python - Specify a Python Runtime ------------------------ diff --git a/bin/compile b/bin/compile index 45e9617..1d2d653 100755 --- a/bin/compile +++ b/bin/compile @@ -1,10 +1,10 @@ #!/usr/bin/env bash -# The Heroku Python Buildpack. This script accepts paramaters for a build +# The Heroku Python Buildpack. This script accepts parameters for a build # directory, a cache directory, and a directory for app environment variables. -# Warning: there are a few hacks in this script to accomidate excellent builds -# on Heroku. No gaurentee for external compatibility is made. However, +# Warning: there are a few hacks in this script to accommodate excellent builds +# on Heroku. No guarantee for external compatibility is made. However, # everything should work fine outside of the Heroku environment, if the # environment is setup correctly. @@ -73,7 +73,7 @@ source $BIN_DIR/utils # Import collection of warnings. source $BIN_DIR/warnings -# Directory Hacks for path consistiency. +# Directory Hacks for path consistency. APP_DIR='/app' TMP_APP_DIR=$CACHE_DIR/tmp_app_dir diff --git a/bin/steps/collectstatic b/bin/steps/collectstatic index 12f05db..56dc7a7 100755 --- a/bin/steps/collectstatic +++ b/bin/steps/collectstatic @@ -19,7 +19,7 @@ MANAGE_FILE=${MANAGE_FILE:-fakepath} # Legacy file-based support for $DISABLE_COLLECTSTATIC [ -f .heroku/collectstatic_disabled ] && DISABLE_COLLECTSTATIC=1 -# Ensure that Django is explicitily specified in requirments.txt +# Ensure that Django is explicitly specified in requirements.txt pip-grep -s requirements.txt django Django && DJANGO_INSTALLED=1 bpwatch start collectstatic # metrics collection From 69b8b25322c9303414b3605408ada044d5b5fad1 Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Mon, 29 Feb 2016 18:28:23 +0000 Subject: [PATCH 2/3] Use the canonical (and HTTPS) URLs for devcenter and pip To save the 301s. --- Readme.md | 2 +- bin/detect | 2 +- bin/steps/collectstatic | 2 +- bin/steps/cryptography | 2 +- bin/steps/gdal | 2 +- bin/steps/pylibmc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Readme.md b/Readme.md index 37b3f7d..e0e10e2 100644 --- a/Readme.md +++ b/Readme.md @@ -1,7 +1,7 @@ # Heroku Buildpack: Python ![buildpack_python](https://cloud.githubusercontent.com/assets/51578/13116296/5f4058f0-d569-11e5-8129-bffd7be091e6.jpg) -This is the official [Heroku buildpack](http://devcenter.heroku.com/articles/buildpacks) for Python apps, powered by [pip](http://www.pip-installer.org/) 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. 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. diff --git a/bin/detect b/bin/detect index 818ed74..e114d71 100755 --- a/bin/detect +++ b/bin/detect @@ -4,7 +4,7 @@ # [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python) # detector. # -# A [buildpack](http://devcenter.heroku.com/articles/buildpacks) is an +# A [buildpack](https://devcenter.heroku.com/articles/buildpacks) is an # adapter between a Python application and Heroku's runtime. # ## Usage diff --git a/bin/steps/collectstatic b/bin/steps/collectstatic index 56dc7a7..f8f63f5 100755 --- a/bin/steps/collectstatic +++ b/bin/steps/collectstatic @@ -47,7 +47,7 @@ if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ] && [ "$DJANGO_INSTALL echo echo " $ heroku config:set DISABLE_COLLECTSTATIC=1" echo - echo " http://devcenter.heroku.com/articles/django-assets" + echo " https://devcenter.heroku.com/articles/django-assets" # Additionally, dump out the environment, if debug mode is on. if [ "$DEBUG_COLLECTSTATIC" ]; then diff --git a/bin/steps/cryptography b/bin/steps/cryptography index 5fcb119..56ef778 100755 --- a/bin/steps/cryptography +++ b/bin/steps/cryptography @@ -4,7 +4,7 @@ # [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python) # compiler. # -# A [buildpack](http://devcenter.heroku.com/articles/buildpacks) is an +# 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`](/). diff --git a/bin/steps/gdal b/bin/steps/gdal index 31a23fd..032a345 100755 --- a/bin/steps/gdal +++ b/bin/steps/gdal @@ -4,7 +4,7 @@ # [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python) # compiler. # -# A [buildpack](http://devcenter.heroku.com/articles/buildpacks) is an +# 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`](/). diff --git a/bin/steps/pylibmc b/bin/steps/pylibmc index b4bde75..f3f13c6 100755 --- a/bin/steps/pylibmc +++ b/bin/steps/pylibmc @@ -4,7 +4,7 @@ # [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python) # compiler. # -# A [buildpack](http://devcenter.heroku.com/articles/buildpacks) is an +# 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`](/). From 6ef93693c5d70e192c33db1385a8a59ddd8899e5 Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Mon, 29 Feb 2016 18:30:47 +0000 Subject: [PATCH 3/3] Use the shorthand buildpack notation in the README example https://devcenter.heroku.com/articles/buildpacks#officially-supported-buildpacks --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index e0e10e2..b40c86b 100644 --- a/Readme.md +++ b/Readme.md @@ -15,7 +15,7 @@ Deploying a Python application couldn't be easier: $ ls Procfile requirements.txt web.py - $ heroku create --buildpack git://github.com/heroku/heroku-buildpack-python.git + $ heroku create --buildpack heroku/python $ git push heroku master ...