Skip to content

Commit

Permalink
first draft version
Browse files Browse the repository at this point in the history
  • Loading branch information
marcofucci committed Aug 20, 2013
1 parent eec5f21 commit acc7ec3
Show file tree
Hide file tree
Showing 59 changed files with 291 additions and 1,391 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*.log
*.pot
*.pyc
local_settings.py
repo_name
repo_name
{{cookiecutter.repo_name}}/settings/local.py
3 changes: 2 additions & 1 deletion CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Daniel Greenfeld
a7p
a7p
Marco Fucci
38 changes: 6 additions & 32 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,12 @@ A cookiecutter_ template for Django.

.. _cookiecutter: https://github.com/audreyr/cookiecutter

Features
---------

* Cutting edge: For Django 1.6 and other bleeding edge stuff
* Twitter Bootstrap 3
* AngularJS
* Registration via django-allauth
* User avatars via django-avatar
* Procfile for deploying to Heroku
* Heroku optimized requirements
* Basic caching setup

Constraints
Description
-----------

* Only maintained 3rd party libraries are used.
* PostgreSQL everywhere
* Environment variables for configuration (This won't work with Apache/mod_wsgi)
Lighter version of the Daniel Greenfeld's cookiecutter-django.

Caution: Bleeding Edge Requirements
------------------------------------

The cookiecutter-django project is bleeding edge in that it uses unreleased versions of several packages like Django,
South, django-crispy-forms, django-avatar, and more.

Consider yourself warned.
It uses the latest stable versions and it only defines a skeleton which can be extended as needed.

Usage
------
Expand All @@ -44,7 +24,7 @@ First, get cookiecutter. Trust me, it's awesome::

Now run it against this repo::

$ cookiecutter https://github.com/pydanny/cookiecutter-dj-project.git
$ cookiecutter https://github.com/marcofucci/cookiecutter-django.git

You'll be prompted for some questions, answer them, then it will create a Django project for you.

Expand Down Expand Up @@ -83,12 +63,6 @@ Create a GitHub repo and push it there::
Now take a look at your repo. Awesome, right?

It's time to write the code!!!


"Your Stuff"
-------------

Scattered throughout the Python and HTML of this project are places marked with "your stuff". This is where third-party libraries are to be integrated with your project.


Not Exactly What You Want?
Expand All @@ -105,7 +79,7 @@ It's up to you whether or not to rename your fork.

If you do rename your fork, I encourage you to submit it to the following places:

* cookiecutter_ so it gets listed in the README as a template.
* cookiecutter_ so it gets listed in the README as a template.
* The cookiecutter grid_ on Django Packages.

.. _cookiecutter: https://github.com/audreyr/cookiecutter
Expand All @@ -115,4 +89,4 @@ Or Submit a Pull Request
~~~~~~~~~~~~~~~~~~~~~~~~~

I also accept pull requests on this, if they're small, atomic, and if they make my own project development
experience better.
experience better.
3 changes: 2 additions & 1 deletion {{cookiecutter.repo_name}}/CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Daniel Greenfeld
Daniel Greenfeld
Marco Fucci
1 change: 0 additions & 1 deletion {{cookiecutter.repo_name}}/Procfile

This file was deleted.

33 changes: 0 additions & 33 deletions {{cookiecutter.repo_name}}/README.rst

This file was deleted.

1 change: 0 additions & 1 deletion {{cookiecutter.repo_name}}/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# 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
35 changes: 3 additions & 32 deletions {{cookiecutter.repo_name}}/requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,37 +1,8 @@
# Bleeding edge Django
https://github.com/django/django/archive/1.6b1.tar.gz
django<1.6

# Views, models, forms, and images fundamentals
django-braces==1.2.2
django-model-utils==1.4.0
django-floppyforms==1.1
Pillow==2.1.0
dj-database-url==0.2.2
django-secure==1.0

# For user registration, either via email or social
# Well-built with regular release cycles!
django-allauth==0.12.0

# For the databse
psycopg2==2.5
South==0.7.6

# Unicode slugification
unicode-slugify==0.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 Bootstrap 3
git+git://github.com/maraujop/django-crispy-forms@42c84a9b02d885de249c1d003c2e7ad031283c26


# Your custom requirements go here
Pillow==2.1.0
11 changes: 2 additions & 9 deletions {{cookiecutter.repo_name}}/requirements/local.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
# Local development dependencies go here
-r base.txt
coverage==3.6
django-discover-runner==0.4
Sphinx


# django-debug-toolbar that works with Django 1.5+
git+git://github.com/django-debug-toolbar/django-debug-toolbar@7e4ecfd04cfe61b51e1fd6fdf0ce1c800a3ebb3b
-r testing.txt

Sphinx
5 changes: 0 additions & 5 deletions {{cookiecutter.repo_name}}/requirements/production.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
# Pro-tip: Try not to put anything here. There should be no dependency in
# production that isn't in development.
-r base.txt

gunicorn==0.17.4
django-storages==1.1.4
gevent==0.13.8
boto==2.9.5
4 changes: 0 additions & 4 deletions {{cookiecutter.repo_name}}/requirements/test.txt

This file was deleted.

4 changes: 4 additions & 0 deletions {{cookiecutter.repo_name}}/requirements/testing.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-r base.txt

mock==1.0.1
model-mommy==1.0
Binary file not shown.
Loading

0 comments on commit acc7ec3

Please sign in to comment.