Upgrade to Django 1.5

diff --git a/CHANGES.txt b/CHANGES.txt
index f32039e..edb23f0 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,6 @@
+v0.1.6  2013-03-20
+    - Update to Django 1.5
+

 v0.1.5  2013-02-22
     - Make prevnext respect current GET parameters.
     - Add a management command for localizing contrib apps.
 v0.1.5  2013-02-22
     - Make prevnext respect current GET parameters.
     - Add a management command for localizing contrib apps.

diff --git a/bin/fnpdjango_bootstrap.sh b/bin/fnpdjango_bootstrap.sh
index 5e7babe..0f56953 100755 (executable)
--- a/bin/fnpdjango_bootstrap.sh
+++ b/bin/fnpdjango_bootstrap.sh
@@ -5,7 +5,7 @@ PROJECT="$1"
 # Make it a function, so that it works with `source`
 start_project() {
 
 # Make it a function, so that it works with `source`
 start_project() {
 

-DJANGO_REQ='Django>=1.4,<1.5'
+DJANGO_REQ='Django>=1.5,<1.6'

 VIRTUALENVWRAPPER_PATHS="
     /etc/bash_completion.d/virtualenvwrapper
     /usr/bin/virtualenvwrapper.sh
 VIRTUALENVWRAPPER_PATHS="
     /etc/bash_completion.d/virtualenvwrapper
     /usr/bin/virtualenvwrapper.sh

diff --git a/fnpdjango/deploy/templates/localsettings.py.template b/fnpdjango/deploy/templates/localsettings.py.template
index 9e087fe..9a3d04d 100644 (file)
--- a/fnpdjango/deploy/templates/localsettings.py.template
+++ b/fnpdjango/deploy/templates/localsettings.py.template
@@ -17,6 +17,10 @@ DATABASES = {
 }
 
 SECRET_KEY = '%(secret_key)s'
 }
 
 SECRET_KEY = '%(secret_key)s'

+ALLOWED_HOSTS = (
+    '%(project_name).nowoczesnapolska.org.pl',
+)
+

 PIWIK_URL = 'http://piwik.nowoczesnapolska.org.pl/'
 PIWIK_TOKEN = ''
 
 PIWIK_URL = 'http://piwik.nowoczesnapolska.org.pl/'
 PIWIK_TOKEN = ''
 

diff --git a/setup.py b/setup.py
index 174c6c0..f2ca0dc 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ def whole_trees(package_dir, paths):
 
 setup(
     name='fnpdjango',
 
 setup(
     name='fnpdjango',

-    version='0.1.5',
+    version='0.1.6',

     author='Radek Czajka',
     author_email='radoslaw.czajka@nowoczesnapolska.org.pl',
     url = '',
     author='Radek Czajka',
     author_email='radoslaw.czajka@nowoczesnapolska.org.pl',
     url = '',


@@ -37,7 +37,7 @@ setup(
         'bin/fnpdjango_bootstrap.sh',
     ],
     install_requires=[
         'bin/fnpdjango_bootstrap.sh',
     ],
     install_requires=[

-        'django>=1.4,<1.5',
+        'django>=1.4,<1.6',

         'textile',
     ],
     license='LICENSE',
         'textile',
     ],
     license='LICENSE',