From 811c1a333669b27f6cfd94af0404186dd60f291f Mon Sep 17 00:00:00 2001 From: Felipe Arruda Pontes Date: Thu, 13 Nov 2014 00:31:17 -0200 Subject: [PATCH 01/48] bumping version of Django in setup.py to correspond to requirements/base.txt --- {{cookiecutter.repo_name}}/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/setup.py b/{{cookiecutter.repo_name}}/setup.py index cf0b01b29..8a7a51b54 100644 --- a/{{cookiecutter.repo_name}}/setup.py +++ b/{{cookiecutter.repo_name}}/setup.py @@ -23,7 +23,7 @@ setup( ], include_package_data=True, install_requires=[ - 'Django>=1.6.5', + 'Django>=1.7.1', ], zip_safe=False, scripts=['{{ cookiecutter.repo_name }}/manage.py'], From 3624aae69238e23b07c6bba715a6ba6056c35283 Mon Sep 17 00:00:00 2001 From: Felipe Arruda Pontes Date: Thu, 13 Nov 2014 00:35:54 -0200 Subject: [PATCH 02/48] adding myself to contributors --- CONTRIBUTORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 7a43403f1..249f93d0f 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -31,6 +31,7 @@ Alberto Sanchez / @alb3rto Eyad Al Sibai / @eyadsibai Chris Franklin Benjamin Abel +Felipe Arruda / @arruda * Possesses commit rights From e29879d81357913c4b754263b10697cdbecb76e2 Mon Sep 17 00:00:00 2001 From: Matt Warren Date: Sun, 5 Oct 2014 21:58:32 -0600 Subject: [PATCH 03/48] addresses issue mentioned here: https://code.djangoproject.com/ticket/19353 adding users in admin resulted in reference to auth.User --- .../{{cookiecutter.repo_name}}/users/admin.py | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py index 80e8e792f..e03919590 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py @@ -6,9 +6,27 @@ from django.contrib.auth.admin import UserAdmin as AuthUserAdmin from .models import User +class MyUserChangeForm(UserChangeForm): + class Meta(UserChangeForm.Meta): + model = User + + +class MyUserCreationForm(UserCreationForm): + class Meta(UserCreationForm.Meta): + model = User + + def clean_username(self): + username = self.cleaned_data["username"] + try: + User.objects.get(username=username) + except User.DoesNotExist: + return username + raise forms.ValidationError(self.error_messages['duplicate_username']) + + class UserAdmin(AuthUserAdmin): - create_form_class = UserCreationForm - update_form_class = UserChangeForm + form = MyUserChangeForm + add_form = MyUserCreationForm admin.site.register(User, UserAdmin) From d87d332ef2fa33f0382303d8ae670a3d5cdce8f9 Mon Sep 17 00:00:00 2001 From: Matt Warren Date: Sun, 5 Oct 2014 22:03:15 -0600 Subject: [PATCH 04/48] add myself to contributors.rst --- CONTRIBUTORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 249f93d0f..60628bda4 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -32,6 +32,7 @@ Eyad Al Sibai / @eyadsibai Chris Franklin Benjamin Abel Felipe Arruda / @arruda +Matt Warren / @mfwarren * Possesses commit rights From 48a1ddd48c21cfa068e2d4e9b8d9ea7c12d3d5e9 Mon Sep 17 00:00:00 2001 From: Martin Blech Date: Mon, 1 Dec 2014 20:54:48 -0300 Subject: [PATCH 05/48] Added default Vagrant gateway to INTERNAL_IPS Makes Django Debug Toolbar show up too when running inside the Vagrant VM. --- .../{{cookiecutter.repo_name}}/config/local.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py index c3b6788fb..534a16a59 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py @@ -31,7 +31,7 @@ class Local(Common): MIDDLEWARE_CLASSES = Common.MIDDLEWARE_CLASSES + ('debug_toolbar.middleware.DebugToolbarMiddleware',) INSTALLED_APPS += ('debug_toolbar',) - INTERNAL_IPS = ('127.0.0.1',) + INTERNAL_IPS = ('127.0.0.1', '10.0.2.2',) DEBUG_TOOLBAR_CONFIG = { 'DISABLE_PANELS': [ From f1c53656bc3fabcea341d0ef71363edc2ad34511 Mon Sep 17 00:00:00 2001 From: Martin Blech Date: Mon, 1 Dec 2014 21:09:28 -0300 Subject: [PATCH 06/48] Replaced `yourapp` with `repo_name` template var. No need to ask the user to replace it by hand, cookiecutter can do it for them. --- {{cookiecutter.repo_name}}/README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.repo_name}}/README.rst b/{{cookiecutter.repo_name}}/README.rst index e10c9b752..1bb9b00ef 100644 --- a/{{cookiecutter.repo_name}}/README.rst +++ b/{{cookiecutter.repo_name}}/README.rst @@ -50,9 +50,9 @@ First make sure to create and activate a virtualenv_, then open a terminal at th .. _virtualenv: http://docs.python-guide.org/en/latest/dev/virtualenvs/ -You can now run the usual Django ``runserver`` command (replace ``yourapp`` with the name of the directory containing the Django project):: +You can now run the usual Django ``runserver`` command:: - $ python yourapp/manage.py runserver + $ python {{cookiecutter.repo_name}}/manage.py runserver The base app will run but you'll need to carry out a few steps to make the sign-up and login forms work. These are currently detailed in `issue #39`_. From 3fb367b477605e99b2d1a8a382fcfdf5085e624c Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Mon, 1 Dec 2014 17:05:15 -0800 Subject: [PATCH 07/48] Add @martinblech to contributors --- CONTRIBUTORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 60628bda4..56122478c 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -33,6 +33,7 @@ Chris Franklin Benjamin Abel Felipe Arruda / @arruda Matt Warren / @mfwarren +Martin Blech * Possesses commit rights From 96d053c866000c8adda86926e7a821332c83f1a0 Mon Sep 17 00:00:00 2001 From: Martin Blech Date: Tue, 2 Dec 2014 17:30:46 -0300 Subject: [PATCH 08/48] Added ATOMIC_REQUESTS=True to default DB setup Quoting Two Scoops of Django: > Use `ATOMIC_REQUESTS` as long as the performance overhead is bearable. That > means "forever" on most sites. --- .../{{cookiecutter.repo_name}}/config/common.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py index deeff460c..4f441d03f 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py @@ -264,4 +264,8 @@ class Common(Configuration): } # END LOGGING CONFIGURATION + @classmethod + def post_setup(cls): + cls.DATABASES['default']['ATOMIC_REQUESTS'] = True + # Your common stuff: Below this line define 3rd party library settings From 7e048c89425b3ae8d46284687d38679234aa9465 Mon Sep 17 00:00:00 2001 From: Chris Franklin Date: Wed, 3 Dec 2014 15:02:52 +0000 Subject: [PATCH 09/48] Fix spelling mistakes in production config --- .../{{cookiecutter.repo_name}}/config/production.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/production.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/production.py index bc5ae8def..78908f208 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/production.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/production.py @@ -4,7 +4,7 @@ Production Configurations - Use djangosecure - Use Amazon's S3 for storing static files and uploaded media -- Use sendgird to sendemails +- Use sendgrid to send emails - Use MEMCACHIER on Heroku ''' from configurations import values @@ -74,13 +74,13 @@ class Production(Common): # see: https://github.com/antonagestam/collectfast AWS_PRELOAD_METADATA = True - INSTALLED_APPS += ("collectfast", ) + INSTALLED_APPS += ('collectfast', ) # AWS cache settings, don't change unless you know what you're doing: - AWS_EXPIREY = 60 * 60 * 24 * 7 + AWS_EXPIRY = 60 * 60 * 24 * 7 AWS_HEADERS = { 'Cache-Control': 'max-age=%d, s-maxage=%d, must-revalidate' % ( - AWS_EXPIREY, AWS_EXPIREY) + AWS_EXPIRY, AWS_EXPIRY) } # See: https://docs.djangoproject.com/en/dev/ref/settings/#static-url From 9ee47dab781f3a9d87cad557c60a8b088618dbdf Mon Sep 17 00:00:00 2001 From: Chris Franklin Date: Wed, 3 Dec 2014 15:04:52 +0000 Subject: [PATCH 10/48] Fix quote marks --- .../{{cookiecutter.repo_name}}/config/local.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py index 534a16a59..bf989dad6 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py @@ -22,7 +22,7 @@ class Local(Common): # END INSTALLED_APPS # Mail settings - EMAIL_HOST = "localhost" + EMAIL_HOST = 'localhost' EMAIL_PORT = 1025 EMAIL_BACKEND = values.Value('django.core.mail.backends.console.EmailBackend') # End mail settings From e0cf4337d2727b75c6752bddf431fabeaa7d9979 Mon Sep 17 00:00:00 2001 From: Chris Franklin Date: Wed, 3 Dec 2014 15:07:22 +0000 Subject: [PATCH 11/48] Fix quote marks in common config to be consistent. --- .../config/common.py | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py index deeff460c..84b92c5d2 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py @@ -85,7 +85,7 @@ class Common(Configuration): # See: https://docs.djangoproject.com/en/dev/ref/settings/#secret-key # Note: This key only used for development and testing. # In production, this is changed to a values.SecretValue() setting - SECRET_KEY = "CHANGEME!!!" + SECRET_KEY = 'CHANGEME!!!' # END SECRET CONFIGURATION # FIXTURE CONFIGURATION @@ -149,8 +149,8 @@ class Common(Configuration): # See: https://docs.djangoproject.com/en/dev/ref/settings/#template-context-processors TEMPLATE_CONTEXT_PROCESSORS = ( 'django.contrib.auth.context_processors.auth', - "allauth.account.context_processors.account", - "allauth.socialaccount.context_processors.socialaccount", + 'allauth.account.context_processors.account', + 'allauth.socialaccount.context_processors.socialaccount', 'django.core.context_processors.debug', 'django.core.context_processors.i18n', 'django.core.context_processors.media', @@ -211,25 +211,25 @@ class Common(Configuration): # AUTHENTICATION CONFIGURATION AUTHENTICATION_BACKENDS = ( - "django.contrib.auth.backends.ModelBackend", - "allauth.account.auth_backends.AuthenticationBackend", + 'django.contrib.auth.backends.ModelBackend', + 'allauth.account.auth_backends.AuthenticationBackend', ) # Some really nice defaults - ACCOUNT_AUTHENTICATION_METHOD = "username" + ACCOUNT_AUTHENTICATION_METHOD = 'username' ACCOUNT_EMAIL_REQUIRED = True - ACCOUNT_EMAIL_VERIFICATION = "mandatory" + ACCOUNT_EMAIL_VERIFICATION = 'mandatory' # END AUTHENTICATION CONFIGURATION # Custom user app defaults # Select the correct user model - AUTH_USER_MODEL = "users.User" - LOGIN_REDIRECT_URL = "users:redirect" - LOGIN_URL = "account_login" + AUTH_USER_MODEL = 'users.User' + LOGIN_REDIRECT_URL = 'users:redirect' + LOGIN_URL = 'account_login' # END Custom user app defaults # SLUGLIFIER - AUTOSLUG_SLUGIFY_FUNCTION = "slugify.slugify" + AUTOSLUG_SLUGIFY_FUNCTION = 'slugify.slugify' # END SLUGLIFIER # LOGGING CONFIGURATION From 0a73f6990b64ee53077aaa13d41734366c87643e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Wed, 3 Dec 2014 12:35:34 -0300 Subject: [PATCH 12/48] fix travis badget on README.rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index bb95f9cc5..b75705b19 100644 --- a/README.rst +++ b/README.rst @@ -6,7 +6,7 @@ cookiecutter-django :alt: Requirements Status .. image:: https://travis-ci.org/pydanny/cookiecutter-django.svg?branch=master - :target: https://travis-ci.org/pydanny/cookiecutter-django.svg?branch=master + :target: https://travis-ci.org/pydanny/cookiecutter-django?branch=master :alt: Build Status A cookiecutter_ template for Django. From c35b810aa48fdafa10680e5e129348a22832ed99 Mon Sep 17 00:00:00 2001 From: "Fabio C. Barrioneuvo da Luz" Date: Thu, 18 Dec 2014 12:19:56 -0300 Subject: [PATCH 13/48] update requirements --- {{cookiecutter.repo_name}}/requirements.txt | 4 ++-- {{cookiecutter.repo_name}}/requirements/base.txt | 8 ++++---- {{cookiecutter.repo_name}}/requirements/production.txt | 2 +- {{cookiecutter.repo_name}}/requirements/test.txt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/{{cookiecutter.repo_name}}/requirements.txt b/{{cookiecutter.repo_name}}/requirements.txt index 23bae8682..621c57667 100644 --- a/{{cookiecutter.repo_name}}/requirements.txt +++ b/{{cookiecutter.repo_name}}/requirements.txt @@ -1,5 +1,5 @@ # This file is here because many Platforms as a Service look for # requirements.txt in the root directory of a project. -pylibmc==1.2.3 -django-heroku-memcacheify==0.7 +pylibmc==1.4.1 +django-heroku-memcacheify==0.8 -r requirements/production.txt diff --git a/{{cookiecutter.repo_name}}/requirements/base.txt b/{{cookiecutter.repo_name}}/requirements/base.txt index 940de6be4..0b874a374 100644 --- a/{{cookiecutter.repo_name}}/requirements/base.txt +++ b/{{cookiecutter.repo_name}}/requirements/base.txt @@ -3,20 +3,20 @@ django==1.7.1 # Configuration django-configurations==0.8 -django-secure==1.0 +django-secure==1.0.1 django-cache-url==0.8.0 dj-database-url==0.3.0 # Forms django-braces==1.4.0 django-crispy-forms==1.4.0 -django-floppyforms==1.2.0 +django-floppyforms==1.3.0 # Models django-model-utils==2.2 # images -Pillow==2.6.0 +Pillow==2.6.1 # For user registration, either via email or social # Well-built with regular release cycles! @@ -33,6 +33,6 @@ django-autoslug==1.7.2 django-avatar==2.0 # Time zones support -pytz==2014.7 +pytz==2014.10 # Your custom requirements go here diff --git a/{{cookiecutter.repo_name}}/requirements/production.txt b/{{cookiecutter.repo_name}}/requirements/production.txt index 293c46f94..2bdf9363d 100644 --- a/{{cookiecutter.repo_name}}/requirements/production.txt +++ b/{{cookiecutter.repo_name}}/requirements/production.txt @@ -6,4 +6,4 @@ gunicorn==19.1.1 django-storages==1.1.8 Collectfast==0.2.1 gevent==1.0.1 -boto==2.32.1 +boto==2.34.1 diff --git a/{{cookiecutter.repo_name}}/requirements/test.txt b/{{cookiecutter.repo_name}}/requirements/test.txt index 3e9f87280..4c0e1bda8 100644 --- a/{{cookiecutter.repo_name}}/requirements/test.txt +++ b/{{cookiecutter.repo_name}}/requirements/test.txt @@ -1,4 +1,4 @@ # Test dependencies go here. -r base.txt coverage==3.7.1 -flake8==2.2.3 +flake8==2.2.5 From ce76e5a871ee024db38af3de613f7cc19ee3eac5 Mon Sep 17 00:00:00 2001 From: "Fabio C. Barrioneuvo da Luz" Date: Thu, 18 Dec 2014 12:32:41 -0300 Subject: [PATCH 14/48] force travis-ci not send email with "build status" to github repo owner --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4ec176e18..dd79a56bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,3 +5,8 @@ before_install: script: - pep8 --ignore E201,E202 --max-line-length=120 --exclude='migrations' . + +notifications: + email: + on_success: never + on_failure: never From 10beba8a618e05a85a251c9da19ece71ec691961 Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Thu, 18 Dec 2014 08:39:27 -0800 Subject: [PATCH 15/48] Tiny whitespace fix to force travis to fire --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index b75705b19..0ac34f1e3 100644 --- a/README.rst +++ b/README.rst @@ -114,7 +114,7 @@ First make sure to create and activate a virtualenv_, then open a terminal at th Then, create a PostgreSQL database and add the database configuration using the ``dj-database-url`` app pattern: ``postgres://db_owner:password@dbserver_ip:port/db_name`` either: * in the ``config.common.py`` setting file, -* or in the env variable ``DATABASE_URL`` +* or in the env variable ``DATABASE_URL`` From a362c4041a6e39b22662d9bc2284673e7232a3e4 Mon Sep 17 00:00:00 2001 From: Martin Blech Date: Mon, 1 Dec 2014 21:04:49 -0300 Subject: [PATCH 16/48] Added django-extensions to local configuration It's one of the recommended apps in Two Scoops of Django. `runserver_plus` and `shell_plus` are real time-savers! --- {{cookiecutter.repo_name}}/README.rst | 4 ++-- {{cookiecutter.repo_name}}/requirements/local.txt | 2 ++ .../{{cookiecutter.repo_name}}/config/local.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.repo_name}}/README.rst b/{{cookiecutter.repo_name}}/README.rst index 1bb9b00ef..828cf3294 100644 --- a/{{cookiecutter.repo_name}}/README.rst +++ b/{{cookiecutter.repo_name}}/README.rst @@ -50,9 +50,9 @@ First make sure to create and activate a virtualenv_, then open a terminal at th .. _virtualenv: http://docs.python-guide.org/en/latest/dev/virtualenvs/ -You can now run the usual Django ``runserver`` command:: +You can now run the ``runserver_plus`` command:: - $ python {{cookiecutter.repo_name}}/manage.py runserver + $ python {{cookiecutter.repo_name}}/manage.py runserver_plus The base app will run but you'll need to carry out a few steps to make the sign-up and login forms work. These are currently detailed in `issue #39`_. diff --git a/{{cookiecutter.repo_name}}/requirements/local.txt b/{{cookiecutter.repo_name}}/requirements/local.txt index 28c0bc35d..6dcae1745 100644 --- a/{{cookiecutter.repo_name}}/requirements/local.txt +++ b/{{cookiecutter.repo_name}}/requirements/local.txt @@ -2,6 +2,8 @@ -r base.txt coverage==3.7.1 Sphinx +django-extensions==1.4.8 +Werkzeug==0.9.6 # django-debug-toolbar that works with Django 1.5+ django-debug-toolbar==1.2.1 diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py index bf989dad6..e212ec3cb 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py @@ -29,7 +29,7 @@ class Local(Common): # django-debug-toolbar MIDDLEWARE_CLASSES = Common.MIDDLEWARE_CLASSES + ('debug_toolbar.middleware.DebugToolbarMiddleware',) - INSTALLED_APPS += ('debug_toolbar',) + INSTALLED_APPS += ('debug_toolbar', 'django_extensions',) INTERNAL_IPS = ('127.0.0.1', '10.0.2.2',) From a4568173f682962a2b2d234bc1ee5c4fa9ca410f Mon Sep 17 00:00:00 2001 From: Saurabh Kumar Date: Fri, 19 Dec 2014 14:41:23 +0530 Subject: [PATCH 17/48] fix boto==2.34.1 not available, update dep to latest --- {{cookiecutter.repo_name}}/requirements/local.txt | 4 ++-- {{cookiecutter.repo_name}}/requirements/production.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.repo_name}}/requirements/local.txt b/{{cookiecutter.repo_name}}/requirements/local.txt index 6dcae1745..6af110f6b 100644 --- a/{{cookiecutter.repo_name}}/requirements/local.txt +++ b/{{cookiecutter.repo_name}}/requirements/local.txt @@ -2,8 +2,8 @@ -r base.txt coverage==3.7.1 Sphinx -django-extensions==1.4.8 +django-extensions==1.4.9 Werkzeug==0.9.6 # django-debug-toolbar that works with Django 1.5+ -django-debug-toolbar==1.2.1 +django-debug-toolbar==1.2.2 diff --git a/{{cookiecutter.repo_name}}/requirements/production.txt b/{{cookiecutter.repo_name}}/requirements/production.txt index 2bdf9363d..7f7b06d5a 100644 --- a/{{cookiecutter.repo_name}}/requirements/production.txt +++ b/{{cookiecutter.repo_name}}/requirements/production.txt @@ -6,4 +6,4 @@ gunicorn==19.1.1 django-storages==1.1.8 Collectfast==0.2.1 gevent==1.0.1 -boto==2.34.1 +boto==2.34.0 From 69fb5677874615248325a971d6f1fcea5b8f9c33 Mon Sep 17 00:00:00 2001 From: Andy Date: Wed, 24 Dec 2014 00:13:23 -0600 Subject: [PATCH 18/48] Fixed typo --- {{cookiecutter.repo_name}}/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/.gitignore b/{{cookiecutter.repo_name}}/.gitignore index 655dcb480..64d5924d1 100644 --- a/{{cookiecutter.repo_name}}/.gitignore +++ b/{{cookiecutter.repo_name}}/.gitignore @@ -28,5 +28,5 @@ nosetests.xml # npm node_modules/ -# Campass +# Compass .sass-cache From f712016bf777725e7721966debd51cf65ffd0b92 Mon Sep 17 00:00:00 2001 From: Andy Date: Wed, 31 Dec 2014 11:27:37 -0600 Subject: [PATCH 19/48] Fixed typo and case change --- {{cookiecutter.repo_name}}/requirements/base.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.repo_name}}/requirements/base.txt b/{{cookiecutter.repo_name}}/requirements/base.txt index 0b874a374..d9eb145eb 100644 --- a/{{cookiecutter.repo_name}}/requirements/base.txt +++ b/{{cookiecutter.repo_name}}/requirements/base.txt @@ -15,14 +15,14 @@ django-floppyforms==1.3.0 # Models django-model-utils==2.2 -# images +# Images Pillow==2.6.1 # For user registration, either via email or social # Well-built with regular release cycles! django-allauth==0.18.0 -# For the persistance stores +# For the persistence stores psycopg2==2.5.4 # Unicode slugification From 23fb0572c3ce65907950a261227a66b38b09be19 Mon Sep 17 00:00:00 2001 From: Andy Date: Wed, 31 Dec 2014 12:24:00 -0600 Subject: [PATCH 20/48] Update CONTRIBUTORS.txt --- CONTRIBUTORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 56122478c..bf4f43e34 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -34,6 +34,7 @@ Benjamin Abel Felipe Arruda / @arruda Matt Warren / @mfwarren Martin Blech +Andy Rose * Possesses commit rights From 93b0f57a16ec7699d18af19ab1dad17ac8b36bb0 Mon Sep 17 00:00:00 2001 From: Chris Hepner Date: Thu, 1 Jan 2015 12:27:26 -0800 Subject: [PATCH 21/48] Update default year to 2015. --- cookiecutter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookiecutter.json b/cookiecutter.json index 4b4858fc4..a7f54a826 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -4,7 +4,7 @@ "author_name": "Your Name", "email": "Your email", "description": "A short description of the project.", - "year": "2014", + "year": "2015", "domain_name": "example.com", "version": "0.1.0", "now": "2014/06/15" From 920dfc2ebb0ca82222f3ebc2df0c17f4b83c1648 Mon Sep 17 00:00:00 2001 From: Saurabh Kumar Date: Fri, 2 Jan 2015 16:27:34 +0530 Subject: [PATCH 22/48] chore(requirements): update pillow 2.6.1 -> 2.7.0 see: http://pillow.readthedocs.org/releasenotes/2.7.0.html --- {{cookiecutter.repo_name}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/requirements/base.txt b/{{cookiecutter.repo_name}}/requirements/base.txt index d9eb145eb..a2b3a88ee 100644 --- a/{{cookiecutter.repo_name}}/requirements/base.txt +++ b/{{cookiecutter.repo_name}}/requirements/base.txt @@ -16,7 +16,7 @@ django-floppyforms==1.3.0 django-model-utils==2.2 # Images -Pillow==2.6.1 +Pillow==2.7.0 # For user registration, either via email or social # Well-built with regular release cycles! From 16f55a389ddef879266c0831b3b10b47ead2203f Mon Sep 17 00:00:00 2001 From: Saurabh Kumar Date: Sat, 3 Jan 2015 11:45:06 +0530 Subject: [PATCH 23/48] upgrade to django 1.7.2 --- {{cookiecutter.repo_name}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/requirements/base.txt b/{{cookiecutter.repo_name}}/requirements/base.txt index a2b3a88ee..ddc6007c8 100644 --- a/{{cookiecutter.repo_name}}/requirements/base.txt +++ b/{{cookiecutter.repo_name}}/requirements/base.txt @@ -1,5 +1,5 @@ # Bleeding edge Django -django==1.7.1 +django==1.7.2 # Configuration django-configurations==0.8 From a81ffdc87de63a0a71ef98ed3551532c9f26a4b1 Mon Sep 17 00:00:00 2001 From: Andy Date: Sat, 3 Jan 2015 16:54:35 -0600 Subject: [PATCH 24/48] Fixed typo --- .../{{cookiecutter.repo_name}}/config/local.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py index e212ec3cb..daf9899b3 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py @@ -41,4 +41,4 @@ class Local(Common): } # end django-debug-toolbar - # Your local stuff: Below this line define 3rd party libary settings + # Your local stuff: Below this line define 3rd party library settings From bdb21475904cba2931f5a360f196ea10989df1fe Mon Sep 17 00:00:00 2001 From: Andy Date: Sat, 3 Jan 2015 16:56:01 -0600 Subject: [PATCH 25/48] Fixed typo --- .../{{cookiecutter.repo_name}}/config/production.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/production.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/production.py index 78908f208..fa5073e9f 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/production.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/production.py @@ -119,4 +119,4 @@ class Production(Common): CACHES = values.CacheURLValue(default="memcached://127.0.0.1:11211") # END CACHING - # Your production stuff: Below this line define 3rd party libary settings + # Your production stuff: Below this line define 3rd party library settings From a3ceb4c9f555527e50614f81e52e29e2609d620f Mon Sep 17 00:00:00 2001 From: zcho Date: Sun, 4 Jan 2015 13:59:38 +0300 Subject: [PATCH 26/48] Fix lost import Return lost import for raise forms.ValidationError(self.error_messages['duplicate_username']) --- .../{{cookiecutter.repo_name}}/users/admin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py index e03919590..a6b7592d6 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from django import forms from django.contrib import admin from django.contrib.auth.forms import UserCreationForm, UserChangeForm from django.contrib.auth.admin import UserAdmin as AuthUserAdmin From 3c6cbd53b90bb5abceb82def5a276edbbc5b5004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Sun, 4 Jan 2015 10:46:09 -0300 Subject: [PATCH 27/48] Update CONTRIBUTORS.txt --- CONTRIBUTORS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index bf4f43e34..9a7ad800c 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -13,7 +13,7 @@ Tom Offermann Lyla Fischer Taylor Baldwin Chris Curvey (@ccurvey) -Fábio C. Barrionuevo da Luz (@luzfcb) +Fábio C. Barrionuevo da Luz (@luzfcb)* Saurabh Kumar (gh: theskumar / @_theskumar)* Ashley Camba Yaroslav Halchenko From 12aa741b3103d3257202e3fee16a5b1814d35728 Mon Sep 17 00:00:00 2001 From: zcho Date: Sun, 4 Jan 2015 17:07:27 +0300 Subject: [PATCH 28/48] Update CONTRIBUTORS.txt --- CONTRIBUTORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index bf4f43e34..3492884e2 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -35,6 +35,7 @@ Felipe Arruda / @arruda Matt Warren / @mfwarren Martin Blech Andy Rose +Andrew Mikhnevich / @zcho * Possesses commit rights From 4412abd588b4e824a46440b496651240ccbd8d56 Mon Sep 17 00:00:00 2001 From: Chris Franklin Date: Sun, 4 Jan 2015 23:26:34 +0000 Subject: [PATCH 29/48] Update django-allauth 0.18.0 --> 0.19.0 --- {{cookiecutter.repo_name}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/requirements/base.txt b/{{cookiecutter.repo_name}}/requirements/base.txt index ddc6007c8..1e5b45d82 100644 --- a/{{cookiecutter.repo_name}}/requirements/base.txt +++ b/{{cookiecutter.repo_name}}/requirements/base.txt @@ -20,7 +20,7 @@ Pillow==2.7.0 # For user registration, either via email or social # Well-built with regular release cycles! -django-allauth==0.18.0 +django-allauth==0.19.0 # For the persistence stores psycopg2==2.5.4 From b54309c48ffeb75b9d2c331f75629b9d81946050 Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Tue, 13 Jan 2015 08:37:28 -0800 Subject: [PATCH 30/48] Switched to using cookiecutter 0.9.0 Jinjafied cookiecutter.json --- cookiecutter.json | 7 ++++--- .../__init__.py | 0 .../config/__init__.py | 0 .../config/common.py | 0 .../config/local.py | 0 .../config/production.py | 0 .../contrib/__init__.py | 0 .../contrib/sites/__init__.py | 0 .../contrib/sites/migrations/0001_initial.py | 0 .../migrations/0002_set_site_domain_and_name.py | 0 .../contrib/sites/migrations/__init__.py | 0 .../manage.py | 0 .../static/css/project.css | 0 .../static/fonts/.gitkeep | 0 .../static/images/.gitkeep | 0 .../static/images/favicon.ico | Bin .../static/js/project.js | 0 .../static/sass/project.scss | 0 .../templates/404.html | 0 .../templates/500.html | 0 .../templates/account/base.html | 0 .../templates/account/email.html | 0 .../templates/account/email_confirm.html | 0 .../templates/account/email_confirmed.html | 0 .../templates/account/login.html | 0 .../templates/account/logout.html | 0 .../templates/account/password_change.html | 0 .../templates/account/password_delete.html | 0 .../templates/account/password_delete_done.html | 0 .../templates/account/password_reset.html | 0 .../templates/account/password_reset_done.html | 0 .../templates/account/password_reset_from_key.html | 0 .../account/password_reset_from_key_done.html | 0 .../templates/account/password_set.html | 0 .../templates/account/signup.html | 0 .../templates/account/signup_closed.html | 0 .../templates/account/verification_sent.html | 0 .../templates/account/verified_email_required.html | 0 .../templates/avatar/add.html | 0 .../templates/avatar/avatar_tag.html | 0 .../templates/avatar/base.html | 0 .../templates/avatar/change.html | 0 .../templates/avatar/confirm_delete.html | 0 .../templates/base.html | 0 .../templates/pages/about.html | 0 .../templates/pages/home.html | 0 .../templates/users/user_detail.html | 0 .../templates/users/user_form.html | 0 .../templates/users/user_list.html | 0 .../urls.py | 0 .../users/__init__.py | 0 .../users/admin.py | 0 .../users/forms.py | 0 .../users/migrations/0001_initial.py | 0 .../users/migrations/__init__.py | 0 .../users/models.py | 0 .../users/urls.py | 0 .../users/views.py | 0 .../wsgi.py | 0 59 files changed, 4 insertions(+), 3 deletions(-) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/config/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/config/common.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/config/local.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/config/production.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/contrib/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/contrib/sites/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/contrib/sites/migrations/0001_initial.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/contrib/sites/migrations/0002_set_site_domain_and_name.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/contrib/sites/migrations/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/manage.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/static/css/project.css (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/static/fonts/.gitkeep (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/static/images/.gitkeep (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/static/images/favicon.ico (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/static/js/project.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/static/sass/project.scss (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/404.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/500.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/base.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/email.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/email_confirm.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/email_confirmed.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/login.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/logout.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/password_change.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/password_delete.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/password_delete_done.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/password_reset.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/password_reset_done.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/password_reset_from_key.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/password_reset_from_key_done.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/password_set.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/signup.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/signup_closed.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/verification_sent.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/account/verified_email_required.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/avatar/add.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/avatar/avatar_tag.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/avatar/base.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/avatar/change.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/avatar/confirm_delete.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/base.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/pages/about.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/pages/home.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/users/user_detail.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/users/user_form.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/templates/users/user_list.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/urls.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/users/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/users/admin.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/users/forms.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/users/migrations/0001_initial.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/users/migrations/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/users/models.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/users/urls.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/users/views.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.package_name}}}/wsgi.py (100%) diff --git a/cookiecutter.json b/cookiecutter.json index a7f54a826..34ed8d054 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -1,11 +1,12 @@ { "project_name": "project_name is the title of the project.", - "repo_name":"repo_name is used for describing the directory structure.", + "repo_name": "{{ cookiecutter.project_name|lower|replace(' ', '-') }}", + "package_name": "{{ cookiecutter.repo_name|replace('-', '') }}", "author_name": "Your Name", "email": "Your email", "description": "A short description of the project.", - "year": "2015", "domain_name": "example.com", "version": "0.1.0", - "now": "2014/06/15" + "now": "2015/01/13", + "year": "{{ cookiecutter.now[:4] }}" } diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/config/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/config/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/config/common.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/config/common.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/config/local.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/config/local.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/production.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/config/production.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/production.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/config/production.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/sites/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/sites/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/sites/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/sites/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/sites/migrations/0001_initial.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/sites/migrations/0001_initial.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/sites/migrations/0001_initial.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/sites/migrations/0001_initial.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/sites/migrations/0002_set_site_domain_and_name.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/sites/migrations/0002_set_site_domain_and_name.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/sites/migrations/0002_set_site_domain_and_name.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/sites/migrations/0002_set_site_domain_and_name.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/sites/migrations/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/sites/migrations/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/sites/migrations/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/sites/migrations/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/manage.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/manage.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/manage.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/manage.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/css/project.css b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/css/project.css similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/css/project.css rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/css/project.css diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/fonts/.gitkeep b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/fonts/.gitkeep similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/fonts/.gitkeep rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/fonts/.gitkeep diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/images/.gitkeep b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/images/.gitkeep similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/images/.gitkeep rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/images/.gitkeep diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/images/favicon.ico b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/images/favicon.ico similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/images/favicon.ico rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/images/favicon.ico diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/js/project.js b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/js/project.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/js/project.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/js/project.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/sass/project.scss b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/sass/project.scss similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/sass/project.scss rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/sass/project.scss diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/404.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/404.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/404.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/404.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/500.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/500.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/500.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/500.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/base.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/base.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/base.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/base.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/email.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/email.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirm.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/email_confirm.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirm.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/email_confirm.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirmed.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/email_confirmed.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirmed.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/email_confirmed.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/login.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/login.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/login.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/login.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/logout.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/logout.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/logout.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/logout.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_change.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_change.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_change.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_change.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_delete.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_delete.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_delete.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_delete.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_delete_done.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_delete_done.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_delete_done.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_delete_done.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_reset.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_reset.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_done.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_reset_done.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_done.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_reset_done.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_reset_from_key.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_reset_from_key.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key_done.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_reset_from_key_done.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key_done.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_reset_from_key_done.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_set.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_set.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_set.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_set.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/signup.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/signup.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup_closed.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/signup_closed.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup_closed.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/signup_closed.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/verification_sent.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/verification_sent.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/verification_sent.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/verification_sent.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/verified_email_required.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/verified_email_required.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/verified_email_required.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/verified_email_required.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/add.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/add.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/add.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/add.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/avatar_tag.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/avatar_tag.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/avatar_tag.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/avatar_tag.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/base.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/base.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/base.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/base.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/change.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/change.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/change.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/change.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/confirm_delete.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/confirm_delete.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/confirm_delete.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/confirm_delete.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/base.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/base.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/pages/about.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/pages/about.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/pages/about.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/pages/about.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/pages/home.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/pages/home.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/pages/home.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/pages/home.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_detail.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/users/user_detail.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_detail.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/users/user_detail.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_form.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/users/user_form.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_form.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/users/user_form.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_list.html b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/users/user_list.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_list.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/users/user_list.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/urls.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/urls.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/urls.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/urls.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/admin.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/admin.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/forms.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/forms.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/forms.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/forms.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/0001_initial.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/migrations/0001_initial.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/0001_initial.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/migrations/0001_initial.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/migrations/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/migrations/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/models.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/models.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/models.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/models.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/urls.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/urls.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/urls.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/urls.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/views.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/views.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/views.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/views.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/wsgi.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/wsgi.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/wsgi.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/wsgi.py From 32bee30d6abea899715add1207f89cf9c6809292 Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Tue, 13 Jan 2015 08:39:10 -0800 Subject: [PATCH 31/48] Corrected 'repo_name' so it's not on my personal branch --- cookiecutter.json | 3 +-- .../__init__.py | 0 .../config/__init__.py | 0 .../config/common.py | 0 .../config/local.py | 0 .../config/production.py | 0 .../contrib/__init__.py | 0 .../contrib/sites/__init__.py | 0 .../contrib/sites/migrations/0001_initial.py | 0 .../migrations/0002_set_site_domain_and_name.py | 0 .../contrib/sites/migrations/__init__.py | 0 .../manage.py | 0 .../static/css/project.css | 0 .../static/fonts/.gitkeep | 0 .../static/images/.gitkeep | 0 .../static/images/favicon.ico | Bin .../static/js/project.js | 0 .../static/sass/project.scss | 0 .../templates/404.html | 0 .../templates/500.html | 0 .../templates/account/base.html | 0 .../templates/account/email.html | 0 .../templates/account/email_confirm.html | 0 .../templates/account/email_confirmed.html | 0 .../templates/account/login.html | 0 .../templates/account/logout.html | 0 .../templates/account/password_change.html | 0 .../templates/account/password_delete.html | 0 .../templates/account/password_delete_done.html | 0 .../templates/account/password_reset.html | 0 .../templates/account/password_reset_done.html | 0 .../templates/account/password_reset_from_key.html | 0 .../account/password_reset_from_key_done.html | 0 .../templates/account/password_set.html | 0 .../templates/account/signup.html | 0 .../templates/account/signup_closed.html | 0 .../templates/account/verification_sent.html | 0 .../templates/account/verified_email_required.html | 0 .../templates/avatar/add.html | 0 .../templates/avatar/avatar_tag.html | 0 .../templates/avatar/base.html | 0 .../templates/avatar/change.html | 0 .../templates/avatar/confirm_delete.html | 0 .../templates/base.html | 0 .../templates/pages/about.html | 0 .../templates/pages/home.html | 0 .../templates/users/user_detail.html | 0 .../templates/users/user_form.html | 0 .../templates/users/user_list.html | 0 .../urls.py | 0 .../users/__init__.py | 0 .../users/admin.py | 0 .../users/forms.py | 0 .../users/migrations/0001_initial.py | 0 .../users/migrations/__init__.py | 0 .../users/models.py | 0 .../users/urls.py | 0 .../users/views.py | 0 .../wsgi.py | 0 59 files changed, 1 insertion(+), 2 deletions(-) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/config/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/config/common.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/config/local.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/config/production.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/contrib/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/contrib/sites/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/contrib/sites/migrations/0001_initial.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/contrib/sites/migrations/0002_set_site_domain_and_name.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/contrib/sites/migrations/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/manage.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/static/css/project.css (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/static/fonts/.gitkeep (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/static/images/.gitkeep (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/static/images/favicon.ico (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/static/js/project.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/static/sass/project.scss (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/404.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/500.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/base.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/email.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/email_confirm.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/email_confirmed.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/login.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/logout.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/password_change.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/password_delete.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/password_delete_done.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/password_reset.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/password_reset_done.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/password_reset_from_key.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/password_reset_from_key_done.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/password_set.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/signup.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/signup_closed.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/verification_sent.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/account/verified_email_required.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/avatar/add.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/avatar/avatar_tag.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/avatar/base.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/avatar/change.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/avatar/confirm_delete.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/base.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/pages/about.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/pages/home.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/users/user_detail.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/users/user_form.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/templates/users/user_list.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/urls.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/users/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/users/admin.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/users/forms.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/users/migrations/0001_initial.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/users/migrations/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/users/models.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/users/urls.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/users/views.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.package_name}} => {{cookiecutter.repo_name}}}/wsgi.py (100%) diff --git a/cookiecutter.json b/cookiecutter.json index 34ed8d054..91821e720 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -1,7 +1,6 @@ { "project_name": "project_name is the title of the project.", - "repo_name": "{{ cookiecutter.project_name|lower|replace(' ', '-') }}", - "package_name": "{{ cookiecutter.repo_name|replace('-', '') }}", + "repo_name": "{{ cookiecutter.repo_name|replace(' ', '_') }}", "author_name": "Your Name", "email": "Your email", "description": "A short description of the project.", diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/config/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/config/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/config/common.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/config/common.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/config/local.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/config/local.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/local.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/config/production.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/production.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/config/production.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/production.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/sites/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/sites/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/sites/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/sites/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/sites/migrations/0001_initial.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/sites/migrations/0001_initial.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/sites/migrations/0001_initial.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/sites/migrations/0001_initial.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/sites/migrations/0002_set_site_domain_and_name.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/sites/migrations/0002_set_site_domain_and_name.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/sites/migrations/0002_set_site_domain_and_name.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/sites/migrations/0002_set_site_domain_and_name.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/sites/migrations/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/sites/migrations/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/contrib/sites/migrations/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/contrib/sites/migrations/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/manage.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/manage.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/manage.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/manage.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/css/project.css b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/css/project.css similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/css/project.css rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/css/project.css diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/fonts/.gitkeep b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/fonts/.gitkeep similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/fonts/.gitkeep rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/fonts/.gitkeep diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/images/.gitkeep b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/images/.gitkeep similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/images/.gitkeep rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/images/.gitkeep diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/images/favicon.ico b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/images/favicon.ico similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/images/favicon.ico rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/images/favicon.ico diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/js/project.js b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/js/project.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/js/project.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/js/project.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/sass/project.scss b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/sass/project.scss similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/static/sass/project.scss rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/sass/project.scss diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/404.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/404.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/404.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/404.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/500.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/500.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/500.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/500.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/base.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/base.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/base.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/base.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/email.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/email.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/email_confirm.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirm.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/email_confirm.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirm.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/email_confirmed.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirmed.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/email_confirmed.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirmed.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/login.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/login.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/login.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/login.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/logout.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/logout.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/logout.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/logout.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_change.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_change.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_change.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_change.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_delete.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_delete.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_delete.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_delete.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_delete_done.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_delete_done.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_delete_done.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_delete_done.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_reset.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_reset.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_reset_done.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_done.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_reset_done.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_done.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_reset_from_key.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_reset_from_key.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_reset_from_key_done.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key_done.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_reset_from_key_done.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key_done.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_set.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_set.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/password_set.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_set.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/signup.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/signup.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/signup_closed.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup_closed.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/signup_closed.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup_closed.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/verification_sent.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/verification_sent.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/verification_sent.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/verification_sent.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/verified_email_required.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/verified_email_required.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/account/verified_email_required.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/verified_email_required.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/add.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/add.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/add.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/add.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/avatar_tag.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/avatar_tag.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/avatar_tag.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/avatar_tag.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/base.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/base.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/base.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/base.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/change.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/change.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/change.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/change.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/confirm_delete.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/confirm_delete.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/avatar/confirm_delete.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/confirm_delete.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/base.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/base.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/pages/about.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/pages/about.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/pages/about.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/pages/about.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/pages/home.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/pages/home.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/pages/home.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/pages/home.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/users/user_detail.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_detail.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/users/user_detail.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_detail.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/users/user_form.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_form.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/users/user_form.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_form.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/users/user_list.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_list.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/templates/users/user_list.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_list.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/urls.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/urls.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/urls.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/urls.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/admin.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/admin.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/forms.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/forms.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/forms.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/forms.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/migrations/0001_initial.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/0001_initial.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/migrations/0001_initial.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/0001_initial.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/migrations/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/migrations/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/models.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/models.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/models.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/models.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/urls.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/urls.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/urls.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/urls.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/views.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/views.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/views.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/views.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/wsgi.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/wsgi.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/wsgi.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/wsgi.py From d8b7e785f5047c338182630b37a5a328591fb01e Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Tue, 13 Jan 2015 08:41:08 -0800 Subject: [PATCH 32/48] Added cookiecutter version warning --- README.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.rst b/README.rst index 0ac34f1e3..86d3534ff 100644 --- a/README.rst +++ b/README.rst @@ -13,6 +13,11 @@ A cookiecutter_ template for Django. .. _cookiecutter: https://github.com/audreyr/cookiecutter +Please update your version of cookiecutter! +-------------------------------------------- + +This cookiecutter template uses features that exists only in cookiecutter 0.9.0 or higher. + Features --------- From 17b52c7135bcb033cc37cbcad28f693a032c0865 Mon Sep 17 00:00:00 2001 From: Saurabh Kumar Date: Fri, 16 Jan 2015 23:11:19 +0530 Subject: [PATCH 33/48] chore(cookiecutter): fix 'repo_name' variable default - update docs with latest questionaire --- README.rst | 10 ++++++---- cookiecutter.json | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 86d3534ff..6946a1b43 100644 --- a/README.rst +++ b/README.rst @@ -77,13 +77,15 @@ It prompts you for questions. Answer them:: remote: Total 550 (delta 283), reused 479 (delta 222) Receiving objects: 100% (550/550), 127.66 KiB | 58 KiB/s, done. Resolving deltas: 100% (283/283), done. - project_name (default is "project_name")? Reddit Clone - repo_name (default is "repo_name")? redditclone + project_name (default is "project_name is the title of the project.")? Reddit Clone + repo_name (default is "reddit_clone")? reddit author_name (default is "Your Name")? Daniel Greenfeld email (default is "Your email")? pydanny@gmail.com description (default is "A short description of the project.")? A reddit clone. - year (default is "Current year")? 2014 - domain_name (default is "Domain name")? + domain_name (default is "example.com")? myreddit.com + version (default is "0.1.0")? 0.0.1 + now (default is "2015/01/13")? 2015/01/16 + year (default is "2015")? Enter the project and take a look around:: diff --git a/cookiecutter.json b/cookiecutter.json index 91821e720..21c395f8c 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -1,6 +1,6 @@ { "project_name": "project_name is the title of the project.", - "repo_name": "{{ cookiecutter.repo_name|replace(' ', '_') }}", + "repo_name": "{{ cookiecutter.project_name|replace(' ', '_') }}", "author_name": "Your Name", "email": "Your email", "description": "A short description of the project.", From 53baa67b2bdb88c1b0c48f2df54716da86189de0 Mon Sep 17 00:00:00 2001 From: Saurabh Kumar Date: Fri, 16 Jan 2015 23:13:34 +0530 Subject: [PATCH 34/48] update django 1.7.2 -> 1.7.3 (security update) https://www.djangoproject.com/weblog/2015/jan/13/security/ --- {{cookiecutter.repo_name}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/requirements/base.txt b/{{cookiecutter.repo_name}}/requirements/base.txt index 1e5b45d82..228140c5d 100644 --- a/{{cookiecutter.repo_name}}/requirements/base.txt +++ b/{{cookiecutter.repo_name}}/requirements/base.txt @@ -1,5 +1,5 @@ # Bleeding edge Django -django==1.7.2 +django==1.7.3 # Configuration django-configurations==0.8 From 9c995f0cbbaffb62717af3fdfcf865c151ef0d29 Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Wed, 28 Jan 2015 10:39:21 -0800 Subject: [PATCH 35/48] Update requirements --- {{cookiecutter.repo_name}}/requirements/base.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.repo_name}}/requirements/base.txt b/{{cookiecutter.repo_name}}/requirements/base.txt index 228140c5d..a5430675d 100644 --- a/{{cookiecutter.repo_name}}/requirements/base.txt +++ b/{{cookiecutter.repo_name}}/requirements/base.txt @@ -1,5 +1,5 @@ # Bleeding edge Django -django==1.7.3 +django==1.7.4 # Configuration django-configurations==0.8 @@ -26,7 +26,7 @@ django-allauth==0.19.0 psycopg2==2.5.4 # Unicode slugification -unicode-slugify==0.1.1 +unicode-slugify==0.1.3 django-autoslug==1.7.2 # Useful things From 5595ebcc64dce7048575ef0ea35abba6fd625f89 Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Wed, 28 Jan 2015 10:39:44 -0800 Subject: [PATCH 36/48] Update requirements --- {{cookiecutter.repo_name}}/requirements/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/requirements/test.txt b/{{cookiecutter.repo_name}}/requirements/test.txt index 4c0e1bda8..4a05300b7 100644 --- a/{{cookiecutter.repo_name}}/requirements/test.txt +++ b/{{cookiecutter.repo_name}}/requirements/test.txt @@ -1,4 +1,4 @@ # Test dependencies go here. -r base.txt coverage==3.7.1 -flake8==2.2.5 +flake8==2.3.0 From e18b4271b663cd415551fe96e53878c13a7c5b44 Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Wed, 28 Jan 2015 10:40:34 -0800 Subject: [PATCH 37/48] Update production.txt --- {{cookiecutter.repo_name}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/requirements/production.txt b/{{cookiecutter.repo_name}}/requirements/production.txt index 7f7b06d5a..539228eff 100644 --- a/{{cookiecutter.repo_name}}/requirements/production.txt +++ b/{{cookiecutter.repo_name}}/requirements/production.txt @@ -6,4 +6,4 @@ gunicorn==19.1.1 django-storages==1.1.8 Collectfast==0.2.1 gevent==1.0.1 -boto==2.34.0 +boto==2.36.0 From 3649a2939e678a0969c9130c37cacc4514509bd0 Mon Sep 17 00:00:00 2001 From: Kevin Ndung'u Date: Mon, 9 Feb 2015 13:32:31 +0300 Subject: [PATCH 38/48] Use double quotes for author name fields This is meant to handle errors caused when the author name contains punctuation i.e apostrophes --- {{cookiecutter.repo_name}}/docs/conf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.repo_name}}/docs/conf.py b/{{cookiecutter.repo_name}}/docs/conf.py index d821d2f59..15a4b325f 100644 --- a/{{cookiecutter.repo_name}}/docs/conf.py +++ b/{{cookiecutter.repo_name}}/docs/conf.py @@ -42,7 +42,7 @@ master_doc = 'index' # General information about the project. project = u'{{ cookiecutter.project_name }}' -copyright = u'{{ cookiecutter.year }}, {{ cookiecutter.author_name }}' +copyright = u"{{ cookiecutter.year }}, {{ cookiecutter.author_name }}" # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -187,7 +187,7 @@ latex_documents = [ ('index', '{{ cookiecutter.repo_name }}.tex', u'{{ cookiecutter.project_name }} Documentation', - u'{{ cookiecutter.author_name }}', 'manual'), + u"{{ cookiecutter.author_name }}", 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -217,7 +217,7 @@ latex_documents = [ # (source start file, name, description, authors, manual section). man_pages = [ ('index', '{{ cookiecutter.repo_name }}', u'{{ cookiecutter.project_name }} Documentation', - [u'{{ cookiecutter.author_name }}'], 1) + [u"{{ cookiecutter.author_name }}"], 1) ] # If true, show URL addresses after external links. @@ -231,7 +231,7 @@ man_pages = [ # dir menu entry, description, category) texinfo_documents = [ ('index', '{{ cookiecutter.repo_name }}', u'{{ cookiecutter.project_name }} Documentation', - u'{{ cookiecutter.author_name }}', '{{ cookiecutter.project_name }}', + u"{{ cookiecutter.author_name }}", '{{ cookiecutter.project_name }}', '{{ cookiecutter.description }}', 'Miscellaneous'), ] From 0162d07e1c979140e87f58c163eef4ad8c2916bf Mon Sep 17 00:00:00 2001 From: Kevin Ndung'u Date: Mon, 9 Feb 2015 14:00:26 +0300 Subject: [PATCH 39/48] Use double quotes on author field in setup.py --- {{cookiecutter.repo_name}}/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/setup.py b/{{cookiecutter.repo_name}}/setup.py index 8a7a51b54..a8e0da6a0 100644 --- a/{{cookiecutter.repo_name}}/setup.py +++ b/{{cookiecutter.repo_name}}/setup.py @@ -16,7 +16,7 @@ version = {{ cookiecutter.repo_name }}.__version__ setup( name='{{ cookiecutter.project_name }}', version=version, - author='{{ cookiecutter.full_name }}', + author="{{ cookiecutter.full_name }}", author_email='{{ cookiecutter.email }}', packages=[ '{{ cookiecutter.repo_name }}', From b59257a3a8023cc274664f57049523ddc2b53adb Mon Sep 17 00:00:00 2001 From: Kevin Ndung'u Date: Mon, 9 Feb 2015 15:47:42 +0300 Subject: [PATCH 40/48] Set a more pleasant default project_name Related to issue #167 --- cookiecutter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookiecutter.json b/cookiecutter.json index 21c395f8c..a91e22aa0 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -1,5 +1,5 @@ { - "project_name": "project_name is the title of the project.", + "project_name": "project_name", "repo_name": "{{ cookiecutter.project_name|replace(' ', '_') }}", "author_name": "Your Name", "email": "Your email", From 34afcbb4535e71cbf20c9a2b093b2209e811a8b6 Mon Sep 17 00:00:00 2001 From: "Fabio C. Barrionuevo da Luz" Date: Tue, 10 Feb 2015 12:55:33 -0300 Subject: [PATCH 41/48] ignore pep8 on django-configurations import in wsgi.py file --- {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/wsgi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/wsgi.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/wsgi.py index eeab6956c..4241f1e98 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/wsgi.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/wsgi.py @@ -25,7 +25,7 @@ os.environ.setdefault("DJANGO_CONFIGURATION", "Production") # This application object is used by any WSGI server configured to use this # file. This includes Django's development server, if the WSGI_APPLICATION # setting points here. -from configurations.wsgi import get_wsgi_application +from configurations.wsgi import get_wsgi_application # noqa application = get_wsgi_application() # Apply WSGI middleware here. From be8b3f174301ad522adf10ba1a199d68b70eeb0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Tue, 10 Feb 2015 13:37:47 -0300 Subject: [PATCH 42/48] add Kevin Ndung'u to CONTRIBUTORS --- CONTRIBUTORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 4f04c54fb..0d99b2d63 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -36,6 +36,7 @@ Matt Warren / @mfwarren Martin Blech Andy Rose Andrew Mikhnevich / @zcho +Kevin Ndung'u / @kevgathuku * Possesses commit rights From b2938581d901bb80222747292bf4f426334e3a4a Mon Sep 17 00:00:00 2001 From: "Fabio C. Barrionuevo da Luz" Date: Tue, 10 Feb 2015 14:06:54 -0300 Subject: [PATCH 43/48] fix issue #178 --- {{cookiecutter.repo_name}}/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/setup.py b/{{cookiecutter.repo_name}}/setup.py index a8e0da6a0..085fc9cfc 100644 --- a/{{cookiecutter.repo_name}}/setup.py +++ b/{{cookiecutter.repo_name}}/setup.py @@ -16,7 +16,7 @@ version = {{ cookiecutter.repo_name }}.__version__ setup( name='{{ cookiecutter.project_name }}', version=version, - author="{{ cookiecutter.full_name }}", + author="{{ cookiecutter.author_name }}", author_email='{{ cookiecutter.email }}', packages=[ '{{ cookiecutter.repo_name }}', From b1f24e694041dd3bfeb370f16126e06a047307b9 Mon Sep 17 00:00:00 2001 From: "Fabio C. Barrionuevo da Luz" Date: Tue, 10 Feb 2015 14:16:00 -0300 Subject: [PATCH 44/48] Update requirements --- {{cookiecutter.repo_name}}/requirements/base.txt | 4 ++-- {{cookiecutter.repo_name}}/requirements/local.txt | 4 ++-- {{cookiecutter.repo_name}}/requirements/production.txt | 2 +- {{cookiecutter.repo_name}}/setup.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/{{cookiecutter.repo_name}}/requirements/base.txt b/{{cookiecutter.repo_name}}/requirements/base.txt index a5430675d..f93fcdbf9 100644 --- a/{{cookiecutter.repo_name}}/requirements/base.txt +++ b/{{cookiecutter.repo_name}}/requirements/base.txt @@ -20,10 +20,10 @@ Pillow==2.7.0 # For user registration, either via email or social # Well-built with regular release cycles! -django-allauth==0.19.0 +django-allauth==0.19.1 # For the persistence stores -psycopg2==2.5.4 +psycopg2==2.6 # Unicode slugification unicode-slugify==0.1.3 diff --git a/{{cookiecutter.repo_name}}/requirements/local.txt b/{{cookiecutter.repo_name}}/requirements/local.txt index 6af110f6b..5c163e036 100644 --- a/{{cookiecutter.repo_name}}/requirements/local.txt +++ b/{{cookiecutter.repo_name}}/requirements/local.txt @@ -2,8 +2,8 @@ -r base.txt coverage==3.7.1 Sphinx -django-extensions==1.4.9 -Werkzeug==0.9.6 +django-extensions==1.5.0 +Werkzeug==0.10.1 # django-debug-toolbar that works with Django 1.5+ django-debug-toolbar==1.2.2 diff --git a/{{cookiecutter.repo_name}}/requirements/production.txt b/{{cookiecutter.repo_name}}/requirements/production.txt index 539228eff..db4cb02ae 100644 --- a/{{cookiecutter.repo_name}}/requirements/production.txt +++ b/{{cookiecutter.repo_name}}/requirements/production.txt @@ -2,7 +2,7 @@ # production that isn't in development. -r base.txt -gunicorn==19.1.1 +gunicorn==19.2.1 django-storages==1.1.8 Collectfast==0.2.1 gevent==1.0.1 diff --git a/{{cookiecutter.repo_name}}/setup.py b/{{cookiecutter.repo_name}}/setup.py index 085fc9cfc..b0720d76d 100644 --- a/{{cookiecutter.repo_name}}/setup.py +++ b/{{cookiecutter.repo_name}}/setup.py @@ -23,7 +23,7 @@ setup( ], include_package_data=True, install_requires=[ - 'Django>=1.7.1', + 'Django>=1.7.4', ], zip_safe=False, scripts=['{{ cookiecutter.repo_name }}/manage.py'], From 59487ba542e29b9af053550f751482e8e87c7712 Mon Sep 17 00:00:00 2001 From: Kevin Ndung'u Date: Thu, 12 Feb 2015 12:49:33 +0300 Subject: [PATCH 45/48] Fix small typo in wsgi.py Add missing `cookiecutter` reference in wsgi.py --- {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/wsgi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/wsgi.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/wsgi.py index 4241f1e98..f0fbcd974 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/wsgi.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for {{ project_name }} project. +WSGI config for {{ cookiecutter.project_name }} project. This module contains the WSGI application used by Django's development server and any production WSGI deployments. It should expose a module-level variable From a9a729e500dc3863adf75419b5f9fd4368bd571f Mon Sep 17 00:00:00 2001 From: Saurabh Kumar Date: Tue, 24 Feb 2015 19:06:31 +0530 Subject: [PATCH 46/48] feat(templating): make TIMEZONE default to UTC and configurable Thanks @burhan for reportings this. closes #109 --- cookiecutter.json | 1 + .../{{cookiecutter.repo_name}}/config/common.py | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cookiecutter.json b/cookiecutter.json index a91e22aa0..d1a9775e3 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -6,6 +6,7 @@ "description": "A short description of the project.", "domain_name": "example.com", "version": "0.1.0", + "timezone": "UTC", "now": "2015/01/13", "year": "{{ cookiecutter.now[:4] }}" } diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py index 8e0d0f6bb..2af88bf97 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py @@ -126,8 +126,12 @@ class Common(Configuration): # END CACHING # GENERAL CONFIGURATION - # See: https://docs.djangoproject.com/en/dev/ref/settings/#time-zone - TIME_ZONE = 'America/Los_Angeles' + + # Local time zone for this installation. Choices can be found here: + # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name + # although not all choices may be available on all operating systems. + # In a Windows environment this must be set to your system time zone. + TIME_ZONE = '{{ cookiecutter.timezone }}' # See: https://docs.djangoproject.com/en/dev/ref/settings/#language-code LANGUAGE_CODE = 'en-us' From 2580dad42d62100dd98475013fb88579fcb84797 Mon Sep 17 00:00:00 2001 From: Philippe Luickx Date: Thu, 26 Feb 2015 17:15:47 +0200 Subject: [PATCH 47/48] Middleware security placed in production configuration --- .../{{cookiecutter.repo_name}}/config/common.py | 1 - .../{{cookiecutter.repo_name}}/config/production.py | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py index 2af88bf97..9ed587c32 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py @@ -57,7 +57,6 @@ class Common(Configuration): # MIDDLEWARE CONFIGURATION MIDDLEWARE_CLASSES = ( # Make sure djangosecure.middleware.SecurityMiddleware is listed first - 'djangosecure.middleware.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/production.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/production.py index fa5073e9f..5a30893bb 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/production.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/production.py @@ -37,6 +37,15 @@ class Production(Common): # django-secure INSTALLED_APPS += ("djangosecure", ) + # MIDDLEWARE CONFIGURATION + MIDDLEWARE_CLASSES = ( + # Make sure djangosecure.middleware.SecurityMiddleware is listed first + 'djangosecure.middleware.SecurityMiddleware', + ) + + MIDDLEWARE_CLASSES += Common.MIDDLEWARE_CLASSES + # END MIDDLEWARE CONFIGURATION + # set this to 60 seconds and then to 518400 when you can prove it works SECURE_HSTS_SECONDS = 60 SECURE_HSTS_INCLUDE_SUBDOMAINS = values.BooleanValue(True) From 10f563abf01a63dab15b060fd355093327174a19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Thu, 26 Feb 2015 13:35:26 -0300 Subject: [PATCH 48/48] updated django version to 1.7.5 --- {{cookiecutter.repo_name}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/requirements/base.txt b/{{cookiecutter.repo_name}}/requirements/base.txt index f93fcdbf9..3365dae3e 100644 --- a/{{cookiecutter.repo_name}}/requirements/base.txt +++ b/{{cookiecutter.repo_name}}/requirements/base.txt @@ -1,5 +1,5 @@ # Bleeding edge Django -django==1.7.4 +django==1.7.5 # Configuration django-configurations==0.8