internlm/SWE-Fixer-Train-110K huggingface dataset:
Repository: agconti/cookiecutter-django-rest

Issue:
add fab dev and qa tasks back in



Discussion:

Resolving patch:
diff --git a/{{cookiecutter.github_repository_name}}/fabfile.py b/{{cookiecutter.github_repository_name}}/fabfile.py
--- a/{{cookiecutter.github_repository_name}}/fabfile.py
+++ b/{{cookiecutter.github_repository_name}}/fabfile.py
@@ -8,6 +8,7 @@
 
 current_dir = os.getcwd()
 env.project_name = '{{cookiecutter.app_name}}'
+env.branch = 'master'
 env.environments = ['dev',
                     'qa',
                     'prod']
@@ -107,9 +108,12 @@ def deploy_docs():
     local('mkdocs gh-deploy')
 
 def push():
+    require('environment')
+    require('branch')
+
     print cyan('Pushing to Heroku...')
     require('environment')
-    local('git push {} master:master'.format(env.environment))
+    local('git push {} {}:master'.format(env.environment, env.branch))
 
 
 def migrate():
@@ -141,6 +145,10 @@ def set_aws_keys():
     """
     Configures S3 Keys
     """
+    require('aws_access')
+    require('aws_secret')
+    require('project_name')
+
     local('heroku config:set DJANGO_AWS_ACCESS_KEY_ID={} --remote {}'
           .format(env.aws_access, env.environment))
     local('heroku config:set DJANGO_AWS_SECRET_ACCESS_KEY={} --remote {}'
@@ -154,3 +162,21 @@ def create_secret_key():
     Creates a random string of letters and numbers
     """
     return ''.join(random.choice(string.ascii_letters + string.digits) for i in range(30))
+
+
+def dev():
+    """fab dev [command]"""
+    env.environment = 'dev'
+    env.branch = 'master'
+
+
+def qa():
+    """fab staging [command]"""
+    env.environment = 'qa'
+    env.branch = 'qa'
+
+
+def prod():
+    """fab staging [command]"""
+    env.environment = 'prod'
+    env.branch = 'prod'


Test patch:
Repository: agconti/cookiecutter-django-rest

Issue:
Configure nosetests arguments



Discussion:

Resolving patch:
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py
--- a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py
+++ b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py
@@ -12,6 +12,13 @@ class Local(Common):
     INSTALLED_APPS = Common.INSTALLED_APPS
     INSTALLED_APPS += ('django_nose',)
     TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
+    NOSE_ARGS = [
+        '{{cookiecutter.app_name}}',
+        '--logging-clear-handlers',
+        '--with-coverage',
+        '--with-progressive',
+        '--cover-package={{cookiecutter.app_name}}'
+    ]
 
     # Mail
     EMAIL_HOST = 'localhost'


Test patch:
Repository: agconti/cookiecutter-django-rest

Issue:
Update flake8 fab task to target project dir



Discussion:

Resolving patch:
diff --git a/{{cookiecutter.github_repository_name}}/fabfile.py b/{{cookiecutter.github_repository_name}}/fabfile.py
--- a/{{cookiecutter.github_repository_name}}/fabfile.py
+++ b/{{cookiecutter.github_repository_name}}/fabfile.py
@@ -21,11 +21,9 @@ def test():
     """
     Runs nose test suite
     """
-    with lcd(current_dir):
-        local('flake8')
-        print cyan('flake8 passed!', bold=True)
-        local('python {}/manage.py test '
-              '--with-progressive --logging-clear-handlers'.format(env.project_name))
+    local('flake8 {}'.format(env.project_name))
+    print cyan('flake8 passed!', bold=True)
+    local('python {}/manage.py test'.format(env.project_name))
 
 def init():
     """


Test patch:
Repository: agconti/cookiecutter-django-rest

Issue:
add tests for auth tokens



Discussion:

Resolving patch:
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/authentication/models.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/authentication/signals.py
similarity index 100%
rename from {{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/authentication/models.py
rename to {{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/authentication/signals.py


Test patch:
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/authentication/test/__init__.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/authentication/test/__init__.py
new file mode 100644
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/authentication/test/test_signals.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/authentication/test/test_signals.py
new file mode 100644
--- /dev/null
+++ b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/authentication/test/test_signals.py
@@ -0,0 +1,11 @@
+from django.test import TestCase
+from nose.tools import ok_
+from users.test.factories import UserFactory
+
+class AuthTokenTestCase(TestCase):
+
+    def setUp(self):
+        self.user = UserFactory()
+
+    def test_new_users_get_auth_token(self):
+        ok_(self.user.auth_token)
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/users/test/__init__.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/users/test/__init__.py
new file mode 100644
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/users/test/factories.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/users/test/factories.py
new file mode 100644
--- /dev/null
+++ b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/users/test/factories.py
@@ -0,0 +1,19 @@
+import factory
+from faker import Faker
+
+fake = Faker()
+
+
+class UserFactory(factory.django.DjangoModelFactory):
+
+    class Meta:
+        model = 'users.User'
+        django_get_or_create = ('username',)
+
+    username = factory.Sequence(lambda n: 'testuser{}'.format(n))
+    password = fake.password(length=10, special_chars=True, digits=True, upper_case=True, lower_case=True)
+    email = fake.email()
+    first_name = fake.first_name()
+    last_name = fake.last_name()
+    is_active = True
+    is_staff = False
Repository: agconti/cookiecutter-django-rest

Issue:
Update app routing to use a single DefaultRouter



Discussion:

Resolving patch:
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/urls.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/urls.py
--- a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/urls.py
+++ b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/urls.py
@@ -6,11 +6,17 @@
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.views.generic.base import RedirectView
+from rest_framework.routers import DefaultRouter
+
+from users.views import UserViewSet
+
+router = DefaultRouter()
+router.register(r'users', UserViewSet)
 
 urlpatterns = [
     url(r'^admin/', include(admin.site.urls)),
     url(r'^api/v1/', include('authentication.urls')),
-    url(r'^api/v1/', include('users.urls')),
+    url(r'^api/v1/', include(router.urls)),
     url(r'^api/v1/notifications/', include('push_notifications.urls')),
 
     # the 'api-root' from django rest-frameworks default router
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/users/urls.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/users/urls.py
deleted file mode 100644
--- a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/users/urls.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from __future__ import unicode_literals
-
-from django.conf.urls import url, include
-from rest_framework.routers import DefaultRouter
-
-import views
-
-router = DefaultRouter()
-router.register(r'users', views.UserViewSet)
-
-urlpatterns = [
-    url(r'^', include(router.urls)),
-]


Test patch:
Repository: agconti/cookiecutter-django-rest

Issue:
Running ./manage.py test will result in "Coverage.py warning: Module walc was never imported."
This is a new bug that is caused by the coverage package. I'm not sure how we could resolve this issue or if we ever want to do that. It's a personal preference to be in the app folder instead of the repo folder.

Any thoughts @agconti?



Discussion:
@glemmaPaul I just did a fresh pull of the repo and did a fresh pip install and didn't run into any issues: 

![coverage-no-error](https://cloud.githubusercontent.com/assets/3332051/9455367/9891aa2a-4a98-11e5-9f3a-168c8e285f89.gif)

What version of coverage are you using? Also can you share the full stack trace? 

@agconti Try to go into the `piedpiper` folder and type in `python manage.py test` in that folder, that should break the coverage.

@glemmaPaul is `walc` the name of your app?

May be related to #73

@glemmaPaul I need some more time to check this out. I'll get back to you.

@glemmaPaul let me know if you make any progress on it in the meantime :smiley: 


Resolving patch:
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py
--- a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py
+++ b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py
@@ -2,6 +2,8 @@
 from .common import Common
 from configurations import values
 
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
 
 class Local(Common):
 
@@ -13,11 +15,11 @@ class Local(Common):
     INSTALLED_APPS += ('django_nose',)
     TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
     NOSE_ARGS = [
-        '{{cookiecutter.app_name}}',
+        BASE_DIR,
         '--logging-clear-handlers',
         '--with-coverage',
         '--with-progressive',
-        '--cover-package={{cookiecutter.app_name}}'
+        '--cover-package={}'.format(BASE_DIR)
     ]
 
     # Mail


Test patch:
diff --git a/{{cookiecutter.github_repository_name}}/requirements/test.txt b/{{cookiecutter.github_repository_name}}/requirements/test.txt
--- a/{{cookiecutter.github_repository_name}}/requirements/test.txt
+++ b/{{cookiecutter.github_repository_name}}/requirements/test.txt
@@ -9,11 +9,11 @@ factory-boy==2.5.2
 fake-factory==0.5.2
 
 # Test Runner
-django-nose==1.4
+django-nose==1.4.1
 nose-progressive==1.5.1
 
 # Code Coverage
 coverage==3.7.1
 
-# Style Enforcement 
+# Style Enforcement
 flake8==2.4.1
Repository: agconti/cookiecutter-django-rest

Issue:
Tests should have `--nologcapture` added to the NOSE_ARGS
This is just really a proposal to add `--nologcapture` to the standard `python manage.py test` command. This because the logs are mainly queries from Factory boy and requests, which are not really insightful.



Discussion:
@glemmaPaul I agree, I'll replace `--logging-clear-handlers` with it. 


Resolving patch:
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py
--- a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py
+++ b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py
@@ -16,7 +16,7 @@ class Local(Common):
     TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
     NOSE_ARGS = [
         BASE_DIR,
-        '--logging-clear-handlers',
+        '--nologcapture',
         '--with-coverage',
         '--with-progressive',
         '--cover-package={}'.format(BASE_DIR)


Test patch:
Repository: agconti/cookiecutter-django-rest

Issue:
Configure Django template debug settings



Discussion:

Resolving patch:
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/common.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/common.py
--- a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/common.py
+++ b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/common.py
@@ -72,7 +72,8 @@ class Common(Configuration):
     # Set DEBUG to False as a default for safety
     # https://docs.djangoproject.com/en/dev/ref/settings/#debug
     DEBUG = values.BooleanValue(False)
-    TEMPLATE_DEBUG = DEBUG
+    for config in TEMPLATES:
+        config['OPTIONS']['debug'] = DEBUG
 
     # Email
     EMAIL_BACKEND = values.Value('django.core.mail.backends.smtp.EmailBackend')
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py
--- a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py
+++ b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py
@@ -8,7 +8,8 @@
 class Local(Common):
 
     DEBUG = values.BooleanValue(True)
-    TEMPLATE_DEBUG = DEBUG
+    for config in Common.TEMPLATES:
+        config['OPTIONS']['debug'] = DEBUG
 
     # Testing
     INSTALLED_APPS = Common.INSTALLED_APPS


Test patch:
Repository: agconti/cookiecutter-django-rest

Issue:
Update `RedirectView.permanent` to true for `api-root` route 
 Resolves `RemovedInDjango19Warning`

> Default value of 'RedirectView.permanent' will change from True to False in Django 1.9. Set an explicit value to silence this warning.



Discussion:

Resolving patch:
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/urls.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/urls.py
--- a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/urls.py
+++ b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/urls.py
@@ -21,6 +21,6 @@
 
     # the 'api-root' from django rest-frameworks default router
     # http://www.django-rest-framework.org/api-guide/routers/#defaultrouter
-    url(r'^$', RedirectView.as_view(url=reverse_lazy('api-root'))),
+    url(r'^$', RedirectView.as_view(url=reverse_lazy('api-root'), permanent=True)),
 
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)


Test patch:
Repository: agconti/cookiecutter-django-rest

Issue:
RelatedObjectDoesNotExist: User has no auth_token.



Discussion:
@vpatel85 @glemmaPaul have you guys ran into this? 

I think this might not actually be a bug, but a problem with my local machine. 

@agconti Haven't had that problem no!

@glemmaPaul thanks for letting me know!


Resolving patch:
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/authentication/signals.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/authentication/models.py
similarity index 100%
rename from {{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/authentication/signals.py
rename to {{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/authentication/models.py


Test patch:
Repository: agconti/cookiecutter-django-rest

Issue:
Update heroku postgresql addon config
``` bash
heroku addons:create heroku-postgresql
```



Discussion:

Resolving patch:
diff --git a/{{cookiecutter.github_repository_name}}/fabfile.py b/{{cookiecutter.github_repository_name}}/fabfile.py
--- a/{{cookiecutter.github_repository_name}}/fabfile.py
+++ b/{{cookiecutter.github_repository_name}}/fabfile.py
@@ -88,7 +88,7 @@ def configure_sever():
     Configures server with a general configuration
     """
     require('environment')
-    local('heroku addons:create heroku-postgresql:dev --remote {}'.format(env.environment))
+    local('heroku addons:create heroku-postgresql --remote {}'.format(env.environment))
     local('heroku pg:backups schedule DATABASE --at "04:00 UTC" --remote {}'.format(env.environment))
     local('heroku pg:promote DATABASE_URL --remote {}'.format(env.environment))
     local('heroku addons:create redistogo:nano --remote {}'.format(env.environment))


Test patch:
Repository: agconti/cookiecutter-django-rest

Issue:
Upgrade to Django 1.9



Discussion:

Resolving patch:
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/users/migrations/0002_auto_20151214_0053.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/users/migrations/0002_auto_20151214_0053.py
new file mode 100644
--- /dev/null
+++ b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/users/migrations/0002_auto_20151214_0053.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2015-12-14 00:53
+from __future__ import unicode_literals
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='username',
+            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=30, unique=True, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.')], verbose_name='username'),
+        ),
+    ]


Test patch:
Repository: agconti/cookiecutter-django-rest

Issue:
Remove Django-pnm
ZeroPush is shutting down on January 31, 2016. https://zeropush.com/migration



Discussion:

Resolving patch:
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/common.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/common.py
--- a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/common.py
+++ b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/common.py
@@ -21,7 +21,6 @@ class Common(Configuration):
         'rest_framework',            # utilities for rest apis
         'rest_framework.authtoken',  # token authentication
         'django_rq',                 # asynchronous queuing
-        'push_notifications',        # push notifications
         'versatileimagefield',       # image manipulation
 
         # Your apps
@@ -182,13 +181,7 @@ class Common(Configuration):
             'rest_framework.authentication.TokenAuthentication',
         )
     }
-
-    # Push notifications
-    DJANGO_PUSH_NOTIFICATIONS = {
-        'SERVICE': 'push_notifications.services.zeropush.ZeroPushService',
-        'AUTH_TOKEN': values.Value('local-development')
-    }
-
+    
     # Versatile Image Field
     VERSATILEIMAGEFIELD_SETTINGS = {
         # The amount of time, in seconds, that references to created images
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/production.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/production.py
--- a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/production.py
+++ b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/production.py
@@ -88,12 +88,6 @@ class Production(Common):
         }
     }
 
-    # Push notifications
-    DJANGO_PUSH_NOTIFICATIONS = {
-        'SERVICE': 'push_notifications.services.zeropush.ZeroPushService',
-        'AUTH_TOKEN': values.Value(environ_name='ZEROPUSH_AUTH_TOKEN', environ_prefix=None)
-    }
-
     # Django RQ production settings
     RQ_QUEUES = {
         'default': {
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/urls.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/urls.py
--- a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/urls.py
+++ b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/urls.py
@@ -17,7 +17,6 @@
     url(r'^admin/', include(admin.site.urls)),
     url(r'^api/v1/', include('authentication.urls')),
     url(r'^api/v1/', include(router.urls)),
-    url(r'^api/v1/notifications/', include('push_notifications.urls')),
 
     # the 'api-root' from django rest-frameworks default router
     # http://www.django-rest-framework.org/api-guide/routers/#defaultrouter


Test patch:
Repository: agconti/cookiecutter-django-rest

Issue:
Update dependencies 
To update: 
- [x] coverage (Current: 3.7.1 Latest: 4.0.3 [wheel])
- [x] django-model-utils (Current: 2.3.1 Latest: 2.4 [sdist])
- [x] django-nose (Current: 1.4.1 Latest: 1.4.2 [wheel])
- [x] django-rq (Current: 0.8.0 Latest: 0.9.0 [wheel])
- [x] django-versatileimagefield (Current: 1.0.4 Latest: 1.2 [wheel])
- [x] djangorestframework (Current: 3.2.3 Latest: 3.3.2 [wheel])
- [x] Fabric (Current: 1.10.1 Latest: 1.10.2 [wheel])
- [x] factory-boy (Current: 2.5.2 Latest: 2.6.0 [wheel])
- [x] fake-factory (Current: 0.5.2 Latest: 0.5.3 [sdist])
- [x] flake8 (Current: 2.4.1 Latest: 2.5.1 [wheel])
- [x] ipdb (Current: 0.8 Latest: 0.8.1 [sdist])
- [x] ipython (Current: 3.1.0 Latest: 4.0.1 [wheel])
- [x] Markdown (Current: 2.6.2 Latest: 2.6.5 [sdist])
- [x] pep8 (Current: 1.5.7 Latest: 1.6.2 [wheel])
- [x] psycopg2 (Current: 2.6 Latest: 2.6.1 [sdist])
- [x] pyflakes (Current: 0.8.1 Latest: 1.0.0 [wheel])
- [x] pytz (Current: 2015.4 Latest: 2015.7 [wheel])
- [x] requests (Current: 2.8.1 Latest: 2.9.0 [wheel])
- [x] whitenoise (Current: 2.0.3 Latest: 2.0.6 [wheel])



Discussion:

Resolving patch:
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/common.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/common.py
--- a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/common.py
+++ b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/common.py
@@ -181,7 +181,7 @@ class Common(Configuration):
             'rest_framework.authentication.TokenAuthentication',
         )
     }
-    
+
     # Versatile Image Field
     VERSATILEIMAGEFIELD_SETTINGS = {
         # The amount of time, in seconds, that references to created images


Test patch:
Repository: agconti/cookiecutter-django-rest

Issue:
Remove zeropush config from fab init



Discussion:

Resolving patch:
diff --git a/{{cookiecutter.github_repository_name}}/fabfile.py b/{{cookiecutter.github_repository_name}}/fabfile.py
--- a/{{cookiecutter.github_repository_name}}/fabfile.py
+++ b/{{cookiecutter.github_repository_name}}/fabfile.py
@@ -96,8 +96,6 @@ def configure_sever():
     local('heroku pg:backups schedule DATABASE --at "04:00 UTC" --remote {}'.format(env.environment))
     local('heroku pg:promote DATABASE_URL --remote {}'.format(env.environment))
     local('heroku addons:create redistogo:nano --remote {}'.format(env.environment))
-    local('heroku addons:create zeropush:inception --remote {}'.format(env.environment))
-    local('heroku config:set ZEROPUSH_AUTH_TOKEN=`heroku config:get ZEROPUSH_PROD_TOKEN --remote={0}` --remote={0}'.format(env.environment))
     local('heroku addons:create newrelic:wayne --remote {}'.format(env.environment))
     local('heroku config:set NEW_RELIC_APP_NAME="{}" --remote {}'.format(env.project_name, env.environment))
     local('heroku config:set DJANGO_CONFIGURATION=Production --remote {}'.format(env.environment))


Test patch:
Repository: agconti/cookiecutter-django-rest

Issue:
Add @python_2_unicode_compatible to models



Discussion:

Resolving patch:
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/users/models.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/users/models.py
--- a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/users/models.py
+++ b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/users/models.py
@@ -2,10 +2,12 @@
 
 # from django.db import models
 # from django.utils.translation import ugettext_lazy as _
+from django.utils.encoding import python_2_unicode_compatible
 from django.contrib.auth.models import AbstractUser
 
 
+@python_2_unicode_compatible
 class User(AbstractUser):
 
-    def __unicode__(self):
+    def __str__(self):
         return self.username


Test patch: