Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

adds separate settings for django 1.2 and 1.3

  • Loading branch information...
commit b4f240cf04d4d2585d1ae4e725d4b1e1c2112ac6 1 parent efc1b2a
@stefanfoulis stefanfoulis authored
View
6 .travis.yml
@@ -5,7 +5,7 @@ python:
install:
- ./.travis_setup
env:
- - DJANGO_VERSION=1.2.7
- - DJANGO_VERSION=1.3.1
- - DJANGO_VERSION=1.4
+ - DJANGO_VERSION=1.2.7 DJANGO_SETTINGS_MODULE="test_settings_django_12"
+ - DJANGO_VERSION=1.3.1 DJANGO_SETTINGS_MODULE="test_settings_django_13"
+ - DJANGO_VERSION=1.4 DJANGO_SETTINGS_MODULE="test_settings_django_13"
script: python setup.py test
View
3  test_settings.py
@@ -18,8 +18,7 @@
'django.contrib.admin',
'django.contrib.sessions',
)
-if True:
- INSTALLED_APPS += ('django.contrib.staticfiles',)
+
ROOT_URLCONF = 'test_urls'
MEDIA_ROOT = os.path.abspath( os.path.join(TMP_ROOT, 'media') )
View
3  test_settings_django_12.py
@@ -0,0 +1,3 @@
+#-*- coding: utf-8 -*-
+from test_settings import *
+INSTALLED_APPS += ('staticfiles',)
View
3  test_settings_django_13.py
@@ -0,0 +1,3 @@
+#-*- coding: utf-8 -*-
+from test_settings import *
+INSTALLED_APPS += ('django.contrib.staticfiles',)
Please sign in to comment.
Something went wrong with that request. Please try again.