Permalink
Browse files

Getting started on updating the template to Django 1.5. The Django 1.…

…4 version has been moved into the django-1.4 branch.
  • Loading branch information...
1 parent 717048f commit 594bd06547b6aaabf66774aa9817767910d88394 @xenith committed Mar 12, 2013
Showing with 16 additions and 22 deletions.
  1. +1 −1 LICENSE
  2. +7 −11 README.md
  3. +6 −6 Vagrantfile
  4. 0 fixtures/.keep
  5. +0 −1 migrations/01-noop.sql
  6. 0 migrations/__init__.py
  7. +2 −3 requirements/prod.txt
View
@@ -1,4 +1,4 @@
-Copyright (c) 2012, Xenith Studios
+Copyright (c) 2012-2013, Xenith Studios
All rights reserved.
Redistribution and use in source and binary forms, with or without
View
@@ -1,17 +1,16 @@
{% if False %}
-# Django 1.4 Base Template #
+# Django 1.5 Base Template #
## About ##
This template is based off of the work of [Mozilla Playdoh][playdoh], as well as
experience with other Django layouts/templates. Playdoh is mainly setup for
-Mozilla's systems, and is currently only designed for Django 1.3. Some of the
-libraries bundled with Playdoh are also no longer necessary in Django 1.4.
+Mozilla's systems, and is currently only designed for Django 1.4.
-This template is designed for Django 1.4's new startproject template option.
+This template is designed for Django 1.4's new startproject template option. This version of the template is designed for Django 1.5.
As much as I could, all the code has been updated to use the new suggested layout
-and functionality in Django 1.4.
+and functionality in Django 1.5.
[playdoh]: https://github.com/mozilla/playdoh
@@ -30,7 +29,6 @@ Templating:
Security:
-- django-session-csrf
- bleach
- python-bcrypt2 - uses bcrypt for password hashing by default
@@ -54,9 +52,7 @@ From Mozilla Playdoh:
Admin:
- Includes django-admin-toolbar for development and production (enabled for superusers)
-- Includes two debug-toolbar panels that are useful, but are disabled until they support Django 1.4
- - django-debug-toolbar-user-panel
- - memcache-debug-panel
+- Includes django-debug-toolbar-user-panel, which is quite useful, but is disabled until it fully supports Django 1.5
Testing:
@@ -68,7 +64,7 @@ Any of these options can added, modified, or removed as you like after creating
## How to use this template to create your project ##
- Create your virtualenv
-- Install Django 1.4
+- Install Django 1.5 ($ pip install Django>=1.5)
- $ django-admin.py startproject --template https://github.com/xenith/django-base-template/zipball/master --extension py,md projectname
- $ cd projectname
- Select your database adapter in requirements/compiled.txt (MySQL, Postgresql, or stick with SQLite)
@@ -87,7 +83,7 @@ Describe your project here.
## Prerequisites ##
-- Python >= 2.5
+- Python >= 2.6
- pip
- virtualenv (virtualenvwrapper is recommended for use during development)
View
@@ -16,8 +16,8 @@ CONF = _config
MOUNT_POINT = '/home/vagrant/project'
Vagrant::Config.run do |config|
- config.vm.box = "lucid32"
- config.vm.box_url = "http://files.vagrantup.com/lucid32.box"
+ config.vm.box = "precise64"
+ config.vm.box_url = "http://files.vagrantup.com/precise64.box"
config.vm.forward_port 8000, 8000
@@ -36,8 +36,8 @@ Vagrant::Config.run do |config|
# Add to /etc/hosts: 33.33.33.24 dev.example.com
config.vm.network :hostonly, "33.33.33.24"
- config.vm.provision :puppet do |puppet|
- puppet.manifests_path = "puppet/manifests"
- puppet.manifest_file = "vagrant.pp"
- end
+ #config.vm.provision :puppet do |puppet|
+ # puppet.manifests_path = "puppet/manifests"
+ # puppet.manifest_file = "vagrant.pp"
+ #end
end
View
No changes.
View
@@ -1 +0,0 @@
--- Example database migration. Remove this, if you like.
View
No changes.
View
@@ -2,7 +2,7 @@
-r compiled.txt
# Django stuff
-Django>=1.4
+Django>=1.5
# Templates
jingo
@@ -11,7 +11,6 @@ Markdown
# Security
bleach
-django-session-csrf
#cef
# Logging
@@ -30,7 +29,7 @@ python-memcached
# Admin
django-debug-toolbar
-# There are useful panels for debug-toolbar, but have not quite been updated yet for 1.4
+# There are useful panels for debug-toolbar, but have not quite been updated yet for 1.5
#-e git://github.com/playfire/django-debug-toolbar-user-panel#egg=django_debug_toolbar_user_panel-dev
#-e git://github.com/ross/memcache-debug-panel#egg=memcache_toolbar-dev

0 comments on commit 594bd06

Please sign in to comment.