Skip to content

Commit ade5585

Browse files
PiDelportblag
authored andcommitted
Simplify tox.ini
This uses the generative envlist and factor-conditional setting support available since Tox 1.8: http://tox.readthedocs.io/en/latest/config.html#generating-environments-conditional-settings
1 parent 61aec18 commit ade5585

File tree

1 file changed

+6
-76
lines changed

1 file changed

+6
-76
lines changed

tox.ini

Lines changed: 6 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,16 @@
11
[tox]
2-
envlist = py27-dj1.8, py27-dj1.9, py27-dj1.10, py33-dj1.8, py34-dj1.8, py34-dj1.9, py34-dj1.10, py35-dj1.8, py35-dj1.9, py35-dj1.10, py36-dj1.8, py36-dj1.9, py36-dj1.10
2+
envlist =
3+
py33-dj1.8,
4+
py{27,34,35,36}-dj1.{8,9,10}
35

46
[testenv]
57
commands=python {toxinidir}/test_project/manage.py test test_app --noinput
68
passenv = DJANGO_VERSION POSTGRES_USER POSTGRES_PASSWORD TRAVIS_BRANCH
79
TRAVIS_COMMIT TRAVIS_LOG_LEVEL TRAVIS_PULL_REQUEST_BRANCH
810
TRAVIS_REPO_SLUG
9-
10-
[testenv:py27-dj1.8]
11-
basepython = python2.7
12-
deps =
13-
django==1.8.14
14-
psycopg2==2.6
15-
16-
[testenv:py27-dj1.9]
17-
basepython = python2.7
18-
deps =
19-
django==1.9.9
20-
psycopg2==2.6
21-
22-
[testenv:py27-dj1.10]
23-
basepython = python2.7
24-
deps =
25-
django==1.10
26-
psycopg2==2.6
27-
28-
[testenv:py33-dj1.8]
29-
basepython = python3.3
30-
deps =
31-
django==1.8.14
32-
psycopg2==2.6
33-
34-
[testenv:py34-dj1.8]
35-
basepython = python3.4
36-
deps =
37-
django==1.8.14
38-
psycopg2==2.6
39-
40-
[testenv:py34-dj1.9]
41-
basepython = python3.4
42-
deps =
43-
django==1.9.9
44-
psycopg2==2.6
45-
46-
[testenv:py34-dj1.10]
47-
basepython = python3.4
48-
deps =
49-
django==1.10
50-
psycopg2==2.6
51-
52-
[testenv:py35-dj1.8]
53-
basepython = python3.5
54-
deps =
55-
django==1.8.14
56-
psycopg2==2.6
57-
58-
[testenv:py35-dj1.9]
59-
basepython = python3.5
60-
deps =
61-
django==1.9.9
62-
psycopg2==2.6
63-
64-
[testenv:py35-dj1.10]
65-
basepython = python3.5
6611
deps =
67-
django==1.10
68-
psycopg2==2.6
69-
70-
[testenv:py36-dj1.8]
71-
basepython = python3.6
72-
deps =
73-
django==1.8.14
74-
psycopg2==2.6
12+
dj1.8: Django ~=1.8.0
13+
dj1.9: Django ~=1.9.0
14+
dj1.10: Django ~=1.10.0
7515

76-
[testenv:py36-dj1.9]
77-
basepython = python3.6
78-
deps =
79-
django==1.9.9
80-
psycopg2==2.6
81-
82-
[testenv:py36-dj1.10]
83-
basepython = python3.6
84-
deps =
85-
django==1.10
8616
psycopg2==2.6

0 commit comments

Comments
 (0)