Skip to content

Commit 554022b

Browse files
committed
simplify tox config
1 parent 5b26548 commit 554022b

1 file changed

Lines changed: 9 additions & 42 deletions

File tree

tox.ini

Lines changed: 9 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,27 @@
11
[tox]
22
envlist=
3-
py34-16
4-
py34-17
5-
py34-18
6-
py27-16
7-
py27-17
8-
py27-18
3+
py{27,34}-django{16,17,18},
94

105
[testenv]
116
setenv =
127
PYTHONPATH = {toxinidir}/example/web_project
138
LC_ALL = en_US.utf-8
9+
basepython =
10+
py27: python2.7
11+
py34: python3.4
1412
deps =
1513
django-crispy-forms==1.4.0
1614
Pillow
15+
django16: Django>=1.6,<1.7
16+
django16: south
17+
django17: Django>=1.7,<1.8
18+
django18: Django>=1.8,<1.9
19+
py27-django18: coverage
1720
-rrequirements_test.txt
1821
commands =
1922
py.test
2023

21-
[testenv:py34-16]
22-
basepython = python3.4
23-
deps =
24-
south
25-
django<1.7
26-
{[testenv]deps}
27-
28-
[testenv:py34-17]
29-
basepython = python3.4
30-
deps =
31-
django<1.8
32-
{[testenv]deps}
33-
34-
[testenv:py34-18]
35-
basepython = python3.4
36-
deps =
37-
django<1.9
38-
{[testenv]deps}
39-
40-
[testenv:py27-16]
41-
basepython = python2.7
42-
deps =
43-
south
44-
django<1.7
45-
{[testenv]deps}
46-
47-
[testenv:py27-17]
48-
basepython = python2.7
49-
deps =
50-
django<1.8
51-
{[testenv]deps}
52-
5324
[testenv:py27-18]
54-
basepython = python2.7
55-
deps =
56-
django<1.9
57-
{[testenv]deps}
5825
commands =
5926
coverage run --source=affiliate --omit=*migrations* -m py.test
6027
coverage report

0 commit comments

Comments
 (0)