Darren/dpaste
1
0
Fork 0
mirror of https://github.com/DarrenOfficial/dpaste.git synced 2024-11-15 08:02:54 +11:00
Code Issues Projects Releases Packages Wiki Activity

Added tox settings for upcoming Django 1.7.

Browse source
This commit is contained in:
Martin Mahner 2014-03-13 16:04:31 +01:00
parent bbd68ee2c9
commit 51398bdb49
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
runtests.py
View file

@ -23,6 +23,10 @@ if not settings.configured:
def runtests(*test_args): def runtests(*test_args):
from django.test.simple import DjangoTestSuiteRunner from django.test.simple import DjangoTestSuiteRunner
from django import VERSION
if VERSION[0] >= 1 and VERSION[1] >= 7:
from django import setup
setup() # New Django 1.7 app registry
test_runner = DjangoTestSuiteRunner(verbosity=1) test_runner = DjangoTestSuiteRunner(verbosity=1)
failures = test_runner.run_tests(['dpaste', ]) failures = test_runner.run_tests(['dpaste', ])
if failures: if failures:

8
tox.ini
View file

@ -4,6 +4,7 @@ envlist=
py27-django-1.4, py27-django-1.4,
py27-django-1.5, py27-django-1.5,
py27-django-1.6, py27-django-1.6,
py27-django-1.7a,
py33-django-1.6, py33-django-1.6,
[testenv] [testenv]
@ -17,7 +18,10 @@ deps=django==1.4.10
deps=django==1.5.5 deps=django==1.5.5
[testenv:py27-django-1.6] [testenv:py27-django-1.6]
deps=django==1.6.1 deps=django==1.6.2
[testenv:py33-django-1.6] [testenv:py33-django-1.6]
deps=django==1.6.1 deps=django==1.6.2
[testenv:py27-django-1.7a]
deps=https://www.djangoproject.com/download/1.7a2/tarball/