Skip to content

Commit 068873b

Browse files
committed
fix(tests): add Django 1.2 and 1.3 to tox.ini
This fix simply adds the testing configuration for Django 1.2 and 1.3 and removes the tox configuration for python2.5 as that is no longer supported since v3.1. The extra command for Django 1.2 simply cleans up the temporary database created by the testsuite in Django 1.2.
1 parent b6eeb89 commit 068873b

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

requirements/test.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ coverage>=3.0
33
nose
44
nose-cover3
55
mock
6-
django
76
django-nose
87
python-memcached

tox.ini

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py25,py26,py27,py27-1.4.X
2+
envlist = py26,py27,py27-1.4.X,py27-1.3.X,py27-1.2.X
33

44
[testenv]
55
distribute = True
@@ -9,30 +9,43 @@ sitepackages = False
99
basepython = python2.7
1010
deps = -r{toxinidir}/requirements/default.txt
1111
-r{toxinidir}/requirements/test.txt
12+
django
1213
commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
1314
env TOXINIDIR="{toxinidir}" python setup.py citest
1415

1516
[testenv:py26]
1617
basepython = python2.6
1718
deps = -r{toxinidir}/requirements/default.txt
1819
-r{toxinidir}/requirements/test.txt
20+
django
1921
commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
2022
env TOXINIDIR="{toxinidir}" python setup.py citest
2123

22-
[testenv:py25]
23-
basepython = python2.5
24+
[testenv:py27-1.4.X]
25+
basepython = python2.7
2426
deps = -r{toxinidir}/requirements/default.txt
2527
-r{toxinidir}/requirements/test.txt
28+
https://github.com/celery/kombu/zipball/master
29+
https://github.com/celery/celery/zipball/master
30+
django>=1.4,<1.5
2631
commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
2732
env TOXINIDIR="{toxinidir}" python setup.py citest
2833

34+
[testenv:py27-1.3.X]
35+
basepython = python2.7
36+
deps = -r{toxinidir}/requirements/default.txt
37+
-r{toxinidir}/requirements/test.txt
38+
https://github.com/celery/kombu/zipball/master
39+
django>=1.3,<1.4
40+
commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
41+
env TOXINIDIR="{toxinidir}" python setup.py citest
2942

30-
[testenv:py27-1.4.X]
43+
[testenv:py27-1.2.X]
3144
basepython = python2.7
3245
deps = -r{toxinidir}/requirements/default.txt
3346
-r{toxinidir}/requirements/test.txt
3447
https://github.com/celery/kombu/zipball/master
35-
https://github.com/celery/celery/zipball/master
36-
https://github.com/django/django/zipball/master
48+
django>=1.2,<1.3
3749
commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
3850
env TOXINIDIR="{toxinidir}" python setup.py citest
51+
rm {toxinidir}/tests/test_djcelery-test-db

0 commit comments

Comments
 (0)