From e197fd33b1e14bc5a336f71e8567e8fb14d69375 Mon Sep 17 00:00:00 2001 From: Ashley Camba Date: Tue, 17 Dec 2013 16:27:18 +0100 Subject: [PATCH 1/8] refactoring project to a also be a python package --- {{cookiecutter.repo_name}}/setup.py | 30 +++++++++++++++++++ .../config/__init__.py | 0 .../config/settings.py | 0 .../config/urls.py | 0 .../config/wsgi.py | 0 .../manage.py | 0 .../static/css/project.css | 0 .../static/js/project.js | 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 .../account/password_delete_done.html | 0 .../templates/account/password_reset.html | 0 .../account/password_reset_done.html | 0 .../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 .../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 .../users/__init__.py | 0 .../users/admin.py | 0 .../users/forms.py | 0 .../users/migrations/0001_initial.py | 0 .../0002_set_site_domain_and_name.py | 0 .../users/migrations/__init__.py | 0 .../users/models.py | 0 .../users/urls.py | 0 .../users/views.py | 0 48 files changed, 30 insertions(+) create mode 100644 {{cookiecutter.repo_name}}/setup.py rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/config/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/config/settings.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/config/urls.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/config/wsgi.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/manage.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/static/css/project.css (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/static/js/project.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/404.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/500.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/base.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/email.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/email_confirm.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/email_confirmed.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/login.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/logout.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/password_change.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/password_delete.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/password_delete_done.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/password_reset.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/password_reset_done.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/password_reset_from_key.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/password_reset_from_key_done.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/password_set.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/signup.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/signup_closed.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/verification_sent.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/account/verified_email_required.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/avatar/add.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/avatar/avatar_tag.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/avatar/base.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/avatar/change.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/avatar/confirm_delete.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/base.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/pages/about.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/pages/home.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/users/user_detail.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/users/user_form.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/templates/users/user_list.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/users/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/users/admin.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/users/forms.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/users/migrations/0001_initial.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/users/migrations/0002_set_site_domain_and_name.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/users/migrations/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/users/models.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/users/urls.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.repo_name}} => {{cookiecutter.project_name}}}/users/views.py (100%) diff --git a/{{cookiecutter.repo_name}}/setup.py b/{{cookiecutter.repo_name}}/setup.py new file mode 100644 index 00000000..746b6006 --- /dev/null +++ b/{{cookiecutter.repo_name}}/setup.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +#!/usr/bin/env python + +import os +import sys + +import {{ cookiecutter.repo_name }} + +try: + from setuptools import setup +except ImportError: + from distutils.core import setup + +version = {{ cookiecutter.repo_name }}.__version__ + +readme = open('README.rst').read() + +setup( + name='{{ cookiecutter.project_name }}', + version=version, + author='{{ cookiecutter.full_name }}', + author_email='{{ cookiecutter.email }}', + packages=[ + '{{ cookiecutter.repo_name }}', + ], + include_package_data=True, + install_requires=[ + ], + zip_safe=False, +) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/settings.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/settings.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/settings.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/settings.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/urls.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/urls.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/urls.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/urls.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/wsgi.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/wsgi.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/wsgi.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/wsgi.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/manage.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/manage.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/manage.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/manage.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/css/project.css b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_name}}/static/css/project.css diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/js/project.js b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_name}}/static/js/project.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/404.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/404.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/404.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/404.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/500.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/500.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/500.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/500.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/base.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_name}}/templates/account/base.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_name}}/templates/account/email.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirm.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_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.project_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.project_name}}/templates/account/email_confirmed.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/login.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_name}}/templates/account/login.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/logout.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_name}}/templates/account/logout.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_change.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_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.project_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.project_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.project_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.project_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.project_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.project_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.project_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.project_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.project_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.project_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.project_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.project_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.project_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.project_name}}/templates/account/password_set.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_name}}/templates/account/signup.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup_closed.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_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.project_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.project_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.project_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.project_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.project_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.project_name}}/templates/avatar/add.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/avatar_tag.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_name}}/templates/avatar/avatar_tag.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/base.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_name}}/templates/avatar/base.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/change.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_name}}/templates/avatar/change.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/confirm_delete.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_name}}/templates/avatar/confirm_delete.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/base.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/base.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/pages/about.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_name}}/templates/pages/about.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/pages/home.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_name}}/templates/pages/home.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_detail.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_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.project_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.project_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.project_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.project_name}}/templates/users/user_list.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/admin.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/admin.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/forms.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/forms.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/forms.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/forms.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/0001_initial.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_name}}/users/migrations/0001_initial.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/0002_set_site_domain_and_name.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/migrations/0002_set_site_domain_and_name.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/0002_set_site_domain_and_name.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/migrations/0002_set_site_domain_and_name.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_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.project_name}}/users/migrations/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/models.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/models.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/models.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/models.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/urls.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/urls.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/urls.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/urls.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/views.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/views.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/views.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/views.py From a1a1fc994f7ef96ee75fa92d57105c8ac9cc4080 Mon Sep 17 00:00:00 2001 From: Ashley Camba Date: Tue, 17 Dec 2013 16:33:49 +0100 Subject: [PATCH 2/8] adding version and __init__.py file --- cookiecutter.json | 3 ++- .../{{cookiecutter.project_name}}/__init__.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/__init__.py diff --git a/cookiecutter.json b/cookiecutter.json index 0e9021aa..bbc09299 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -5,5 +5,6 @@ "email": "Your email", "description": "A short description of the project.", "year": "2013", - "domain_name": "example.com" + "domain_name": "example.com", + "version": "0.1.0" } diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/__init__.py new file mode 100644 index 00000000..704b5032 --- /dev/null +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/__init__.py @@ -0,0 +1 @@ +__version__ = '{{ cookiecutter.version }}' From 969cc4d5a859fc3fa4edf24ca76de815b8d7e945 Mon Sep 17 00:00:00 2001 From: Ashley Camba Date: Tue, 17 Dec 2013 16:39:16 +0100 Subject: [PATCH 3/8] making the setup.py as simple as posible --- {{cookiecutter.repo_name}}/setup.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.repo_name}}/setup.py b/{{cookiecutter.repo_name}}/setup.py index 746b6006..66e03086 100644 --- a/{{cookiecutter.repo_name}}/setup.py +++ b/{{cookiecutter.repo_name}}/setup.py @@ -4,7 +4,7 @@ import os import sys -import {{ cookiecutter.repo_name }} +import {{ cookiecutter.project_name }} try: from setuptools import setup @@ -13,15 +13,13 @@ except ImportError: version = {{ cookiecutter.repo_name }}.__version__ -readme = open('README.rst').read() - setup( name='{{ cookiecutter.project_name }}', version=version, author='{{ cookiecutter.full_name }}', author_email='{{ cookiecutter.email }}', packages=[ - '{{ cookiecutter.repo_name }}', + '{{ cookiecutter.project_name }}', ], include_package_data=True, install_requires=[ From 0102b8a0eec2eed952b51135ec70e58abf47933b Mon Sep 17 00:00:00 2001 From: Ashley Camba Date: Tue, 17 Dec 2013 16:44:20 +0100 Subject: [PATCH 4/8] adding manage.py to scripts --- {{cookiecutter.repo_name}}/setup.py | 2 +- .../{{cookiecutter.project_name}}/manage.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.repo_name}}/setup.py b/{{cookiecutter.repo_name}}/setup.py index 66e03086..ce05cdae 100644 --- a/{{cookiecutter.repo_name}}/setup.py +++ b/{{cookiecutter.repo_name}}/setup.py @@ -4,7 +4,6 @@ import os import sys -import {{ cookiecutter.project_name }} try: from setuptools import setup @@ -25,4 +24,5 @@ setup( install_requires=[ ], zip_safe=False, + scripts=['manage.py'], ) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/manage.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/manage.py index 384bd508..9f5bdbf0 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/manage.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/manage.py @@ -3,7 +3,7 @@ import os import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{cookiecutter.project_name}}.config.settings") os.environ.setdefault("DJANGO_CONFIGURATION", "Local") from configurations.management import execute_from_command_line From 4a606d084a39b6e23ecd8ea33f5d27e9830b4094 Mon Sep 17 00:00:00 2001 From: Ashley Camba Date: Tue, 17 Dec 2013 16:50:15 +0100 Subject: [PATCH 5/8] re-adding import to setup.py --- {{cookiecutter.repo_name}}/setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/setup.py b/{{cookiecutter.repo_name}}/setup.py index ce05cdae..8809973c 100644 --- a/{{cookiecutter.repo_name}}/setup.py +++ b/{{cookiecutter.repo_name}}/setup.py @@ -10,6 +10,7 @@ try: except ImportError: from distutils.core import setup +import {{ cookiecutter.project_name }} version = {{ cookiecutter.repo_name }}.__version__ setup( @@ -24,5 +25,5 @@ setup( install_requires=[ ], zip_safe=False, - scripts=['manage.py'], + scripts=['{{ cookiecutter.project_name }}/manage.py'], ) From c2c575084bb2e0d69f0d93efc4d1c64f7ead53a5 Mon Sep 17 00:00:00 2001 From: Ashley Camba Date: Tue, 17 Dec 2013 16:53:56 +0100 Subject: [PATCH 6/8] adding django 1.6.1 to project requirements --- {{cookiecutter.repo_name}}/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.repo_name}}/setup.py b/{{cookiecutter.repo_name}}/setup.py index 8809973c..fe79e6f8 100644 --- a/{{cookiecutter.repo_name}}/setup.py +++ b/{{cookiecutter.repo_name}}/setup.py @@ -23,6 +23,7 @@ setup( ], include_package_data=True, install_requires=[ + 'Django=>1.6.1' ], zip_safe=False, scripts=['{{ cookiecutter.project_name }}/manage.py'], From 3a036b3b141351f327b73cd9bd525b41e2d27298 Mon Sep 17 00:00:00 2001 From: Ashley Camba Date: Tue, 17 Dec 2013 16:56:20 +0100 Subject: [PATCH 7/8] fixing typo in django version --- {{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 fe79e6f8..cf4df1b8 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.1' + 'Django=>1.6.1', ], zip_safe=False, scripts=['{{ cookiecutter.project_name }}/manage.py'], From 77b176ec51ed45e2b83ac5701d0474d7986e2bd2 Mon Sep 17 00:00:00 2001 From: Ashley Camba Date: Tue, 17 Dec 2013 16:58:49 +0100 Subject: [PATCH 8/8] fixing typo in django version --- {{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 cf4df1b8..0e507bb8 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.1', + 'Django>=1.6.1', ], zip_safe=False, scripts=['{{ cookiecutter.project_name }}/manage.py'],