diff --git a/project_name/project_name/__init__.py b/cookiecutter.json similarity index 100% rename from project_name/project_name/__init__.py rename to cookiecutter.json diff --git a/requirements.txt b/requirements.txt index d1197135..6be74cd2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ # 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 # -r requirements/production.txt diff --git a/requirements/base.txt b/requirements/base.txt index c97004e1..4735f37d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -2,5 +2,23 @@ Django==1.5.2 bpython==0.12 django-braces==1.2.2 django-model-utils==1.4.0 -logutils==0.3.3 -South==0.8.1 +django-allauth==0.12.0 +unicode-slugify==0.1.1 +Pillow==2.1.0 +django-floppyforms==1.1 +django-autoslug==1.7.1 + + + +# There are edge cases for South with Django 1.5+ that haven't been addressed yet. +# South==0.8.1 +https://bitbucket.org/andrewgodwin/south/get/59f6bae8b1a501ca14a5f23f8b11c44c42f33147.zip + + +# Useful things +# django-avatar that work with Django 1.5 +# git+git://github.com/jezdez/django-avatar@6393d25166a6c2d2df0bd28e19f161fac2bb1166 + + +# django-crispy-forms with support for Django 1.5 +git+git://github.com/maraujop/django-crispy-forms@42c84a9b02d885de249c1d003c2e7ad031283c26 \ No newline at end of file diff --git a/requirements/local.txt b/requirements/local.txt index 2610ce6c..716e3473 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -2,5 +2,9 @@ -r base.txt coverage==3.6 django-discover-runner==0.4 -django-debug-toolbar==0.9.4 -Sphinx==1.2b1 +Sphinx + + +# django-debug-toolbar that works with Django 1.5+ +git+git://github.com/django-debug-toolbar/django-debug-toolbar@7e4ecfd04cfe61b51e1fd6fdf0ce1c800a3ebb3b + diff --git a/requirements/production.txt b/requirements/production.txt index 6cb23f00..d5362319 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -3,3 +3,8 @@ -r base.txt gunicorn==0.17.4 +django-storages==1.1.4 +gevent==0.13.8 +gunicorn==0.14.3 +psycopg2==2.5 +boto==2.9.5 \ No newline at end of file diff --git a/{{cookiecutter.repo_name}}/config/__init__.py b/{{cookiecutter.repo_name}}/config/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/project_name/project_name/settings/__init__.py b/{{cookiecutter.repo_name}}/config/settings/__init__.py similarity index 100% rename from project_name/project_name/settings/__init__.py rename to {{cookiecutter.repo_name}}/config/settings/__init__.py diff --git a/project_name/project_name/settings/base.py b/{{cookiecutter.repo_name}}/config/settings/base.py similarity index 100% rename from project_name/project_name/settings/base.py rename to {{cookiecutter.repo_name}}/config/settings/base.py diff --git a/project_name/project_name/settings/local.py b/{{cookiecutter.repo_name}}/config/settings/local.py similarity index 100% rename from project_name/project_name/settings/local.py rename to {{cookiecutter.repo_name}}/config/settings/local.py diff --git a/project_name/project_name/settings/production.py b/{{cookiecutter.repo_name}}/config/settings/production.py similarity index 100% rename from project_name/project_name/settings/production.py rename to {{cookiecutter.repo_name}}/config/settings/production.py diff --git a/project_name/project_name/settings/test.py b/{{cookiecutter.repo_name}}/config/settings/test.py similarity index 100% rename from project_name/project_name/settings/test.py rename to {{cookiecutter.repo_name}}/config/settings/test.py diff --git a/project_name/project_name/urls.py b/{{cookiecutter.repo_name}}/config/urls.py similarity index 100% rename from project_name/project_name/urls.py rename to {{cookiecutter.repo_name}}/config/urls.py diff --git a/project_name/project_name/wsgi.py b/{{cookiecutter.repo_name}}/config/wsgi.py similarity index 100% rename from project_name/project_name/wsgi.py rename to {{cookiecutter.repo_name}}/config/wsgi.py diff --git a/project_name/manage.py b/{{cookiecutter.repo_name}}/manage.py similarity index 90% rename from project_name/manage.py rename to {{cookiecutter.repo_name}}/manage.py index b7a0ea4b..8d298fb2 100644 --- a/project_name/manage.py +++ b/{{cookiecutter.repo_name}}/manage.py @@ -3,7 +3,7 @@ import os import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{ project_name }}.settings.local") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{ project_name }}.config.local") from django.core.management import execute_from_command_line diff --git a/project_name/static/css/bootstrap-responsive.min.css b/{{cookiecutter.repo_name}}/static/css/bootstrap-responsive.min.css similarity index 100% rename from project_name/static/css/bootstrap-responsive.min.css rename to {{cookiecutter.repo_name}}/static/css/bootstrap-responsive.min.css diff --git a/project_name/static/css/bootstrap.min.css b/{{cookiecutter.repo_name}}/static/css/bootstrap.min.css similarity index 100% rename from project_name/static/css/bootstrap.min.css rename to {{cookiecutter.repo_name}}/static/css/bootstrap.min.css diff --git a/project_name/static/css/project.css b/{{cookiecutter.repo_name}}/static/css/project.css similarity index 100% rename from project_name/static/css/project.css rename to {{cookiecutter.repo_name}}/static/css/project.css diff --git a/project_name/static/img/glyphicons-halflings-white.png b/{{cookiecutter.repo_name}}/static/img/glyphicons-halflings-white.png similarity index 100% rename from project_name/static/img/glyphicons-halflings-white.png rename to {{cookiecutter.repo_name}}/static/img/glyphicons-halflings-white.png diff --git a/project_name/static/img/glyphicons-halflings.png b/{{cookiecutter.repo_name}}/static/img/glyphicons-halflings.png similarity index 100% rename from project_name/static/img/glyphicons-halflings.png rename to {{cookiecutter.repo_name}}/static/img/glyphicons-halflings.png diff --git a/project_name/static/js/bootstrap.min.js b/{{cookiecutter.repo_name}}/static/js/bootstrap.min.js similarity index 100% rename from project_name/static/js/bootstrap.min.js rename to {{cookiecutter.repo_name}}/static/js/bootstrap.min.js diff --git a/project_name/static/js/project.js b/{{cookiecutter.repo_name}}/static/js/project.js similarity index 100% rename from project_name/static/js/project.js rename to {{cookiecutter.repo_name}}/static/js/project.js diff --git a/project_name/templates/404.html b/{{cookiecutter.repo_name}}/templates/404.html similarity index 100% rename from project_name/templates/404.html rename to {{cookiecutter.repo_name}}/templates/404.html diff --git a/project_name/templates/500.html b/{{cookiecutter.repo_name}}/templates/500.html similarity index 100% rename from project_name/templates/500.html rename to {{cookiecutter.repo_name}}/templates/500.html diff --git a/project_name/templates/base.html b/{{cookiecutter.repo_name}}/templates/base.html similarity index 100% rename from project_name/templates/base.html rename to {{cookiecutter.repo_name}}/templates/base.html