diff --git a/{{cookiecutter.repo_name}}/requirements/base.txt b/{{cookiecutter.repo_name}}/requirements/base.txt index 2ed9f4e7..6e492edc 100644 --- a/{{cookiecutter.repo_name}}/requirements/base.txt +++ b/{{cookiecutter.repo_name}}/requirements/base.txt @@ -13,7 +13,6 @@ django-crispy-forms==1.4.0 django-floppyforms==1.2.0 # Models -South==1.0 django-model-utils==2.2 # images diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py index 832ac53e..b7ce2469 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py @@ -37,9 +37,11 @@ class Common(Configuration): 'django.contrib.admin', ) THIRD_PARTY_APPS = ( - 'south', # Database migration helpers: 'crispy_forms', # Form layouts 'avatar', # for user avatars + 'allauth', # registration + 'allauth.account', # registration + 'allauth.socialaccount', # registration ) # Apps specific for this project go here. @@ -50,14 +52,6 @@ class Common(Configuration): # See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS - - INSTALLED_APPS += ( - # Needs to come last for now because of a weird edge case between - # South and allauth - 'allauth', # registration - 'allauth.account', # registration - 'allauth.socialaccount', # registration - ) # END APP CONFIGURATION # MIDDLEWARE CONFIGURATION diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/manage.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/manage.py old mode 100644 new mode 100755