From 04a58d5b2146b76c20f9dcbe9b1a4f2bb4dff1e3 Mon Sep 17 00:00:00 2001
From: Daniel Roy Greenfeld <pydanny@gmail.com>
Date: Fri, 7 Oct 2016 13:55:15 -0700
Subject: [PATCH] Removed Heroku instant deploy button

---
 CHANGELOG.md                             |  7 +++++
 hooks/post_gen_project.py                |  4 +--
 {{cookiecutter.project_slug}}/README.rst |  3 --
 {{cookiecutter.project_slug}}/app.json   | 40 ------------------------
 4 files changed, 9 insertions(+), 45 deletions(-)
 delete mode 100644 {{cookiecutter.project_slug}}/app.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e434884..948d613c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 All enhancements and patches to Cookiecutter Django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2015-10-07]
+### Added
+- Finished first pass at Elastic Beanstalk docs (@pydanny & @audreyr)
+### Deleted
+- Removed Heroku instant deploy button (@pydanny)
+
+
 ##[2016-09-29]
 ### Added
 - Added default `AUTH_PASSWORD_VALIDATORS` configuration, generated by django 1.10 startproject. See [Password Validation docs](https://docs.djangoproject.com/en/1.10/topics/auth/passwords/#module-django.contrib.auth.password_validation") (@luzfcb)
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 0736c375..068d7483 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -115,10 +115,10 @@ def remove_heroku_files():
     """
     Removes files needed for heroku if it isn't going to be used
     """
-    filenames = ["app.json", "Procfile", "runtime.txt"]
+    filenames = ["Procfile", "runtime.txt"]
     if '{{ cookiecutter.use_elasticbeanstalk_experimental }}'.lower() != 'y':
         filenames.append("requirements.txt")
-    for filename in ["app.json", "Procfile", "runtime.txt"]:
+    for filename in ["Procfile", "runtime.txt"]:
         file_name = os.path.join(PROJECT_DIRECTORY, filename)
         remove_file(file_name)
 
diff --git a/{{cookiecutter.project_slug}}/README.rst b/{{cookiecutter.project_slug}}/README.rst
index e06a85ba..4640f265 100644
--- a/{{cookiecutter.project_slug}}/README.rst
+++ b/{{cookiecutter.project_slug}}/README.rst
@@ -122,9 +122,6 @@ The following details how to deploy this application.
 Heroku
 ^^^^^^
 
-.. image:: https://www.herokucdn.com/deploy/button.png
-    :target: https://heroku.com/deploy
-
 See detailed `cookiecutter-django Heroku documentation`_.
 
 .. _`cookiecutter-django Heroku documentation`: http://cookiecutter-django.readthedocs.io/en/latest/deployment-on-heroku.html
diff --git a/{{cookiecutter.project_slug}}/app.json b/{{cookiecutter.project_slug}}/app.json
deleted file mode 100644
index 10d2c926..00000000
--- a/{{cookiecutter.project_slug}}/app.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "name": "{{cookiecutter.project_slug}}",
-  "description": "{{cookiecutter.description}}",
-  "env": {
-    "BUILDPACK_URL": "https://github.com/heroku/heroku-buildpack-python",
-    "DJANGO_SETTINGS_MODULE": "config.settings.production",
-    "DJANGO_SECRET_KEY": {
-      "description": "A secret key for verifying the integrity of signed cookies.",
-      "generator": "secret"
-    },
-    "DJANGO_ALLOWED_HOSTS": {
-      "description": "Comma-separated list of hosts",
-      "value": ".herokuapp.com"
-    },
-    "DJANGO_ADMIN_URL": {
-      "description": "A secret URL for the Django admin",
-      "generator": "secret"
-    },
-    "DJANGO_AWS_ACCESS_KEY_ID": "",
-    "DJANGO_AWS_SECRET_ACCESS_KEY": "",
-    "DJANGO_AWS_STORAGE_BUCKET_NAME": "",
-    "DJANGO_MAILGUN_SERVER_NAME": "",
-    "DJANGO_MAILGUN_API_KEY": ""
-    "MAILGUN_SENDER_DOMAIN": ""{% if cookiecutter.use_sentry_for_error_reporting == "y" -%},
-    "DJANGO_SENTRY_DSN": ""{%- endif %}
-  },
-  "scripts": {
-    "postdeploy": "python manage.py migrate"
-  },
-  "addons": [
-    {
-      "plan": "heroku-postgresql:hobby-dev",
-      "options": {
-         "version": "{{ cookiecutter.postgresql_version }}"
-      }
-    },
-    "heroku-redis:hobby-dev",
-    "mailgun"
-  ]
-}