Merge pull request #18 from pjdelport/django-1.4

Django 1.4 updates
This commit is contained in:
Joost Cassee 2012-08-13 05:39:04 -07:00
commit 5a906c3cfc
2 changed files with 14 additions and 4 deletions

View file

@ -12,3 +12,5 @@ DATABASES = {
INSTALLED_APPS = [
'analytical',
]
SECRET_KEY = 'testing'

16
tox.ini
View file

@ -1,7 +1,7 @@
[tox]
envlist =
py2.6-django1.2,py2.6-django1.3,
py2.7-django1.2,py2.7-django1.3
py2.6-django1.2,py2.6-django1.3,py2.6-django1.4,
py2.7-django1.2,py2.7-django1.3,py2.7-django1.4,
[testenv]
commands = python -Wall setup.py test
@ -12,7 +12,11 @@ deps = Django>=1.2,<1.3
[testenv:py2.6-django1.3]
basepython = python2.6
deps = Django>=1.3
deps = Django>=1.3,<1.4
[testenv:py2.6-django1.4]
basepython = python2.6
deps = Django>=1.4,<1.5
[testenv:py2.7-django1.2]
basepython = python2.7
@ -20,4 +24,8 @@ deps = Django>=1.2,<1.3
[testenv:py2.7-django1.3]
basepython = python2.7
deps = Django>=1.3
deps = Django>=1.3,<1.4
[testenv:py2.7-django1.4]
basepython = python2.7
deps = Django>=1.4,<1.5