Skip to content

Commit 85f5e79

Browse files
tomchristietomchristie
committed
Merge pull request #2123 from NextHub/master
Remove boilerplate code from tox config
2 parents fd980be + b6de266 commit 85f5e79

File tree

2 files changed

+46
-196
lines changed

2 files changed

+46
-196
lines changed

‎.travis.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
language: python
22

3-
python: 2.7
4-
53
sudo: false
64

75
env:
8-
- TOX_ENV=flake8
9-
- TOX_ENV=py3.4-django1.7
10-
- TOX_ENV=py3.3-django1.7
11-
- TOX_ENV=py3.2-django1.7
12-
- TOX_ENV=py2.7-django1.7
13-
- TOX_ENV=py3.4-django1.6
14-
- TOX_ENV=py3.3-django1.6
15-
- TOX_ENV=py3.2-django1.6
16-
- TOX_ENV=py2.7-django1.6
17-
- TOX_ENV=py2.6-django1.6
18-
- TOX_ENV=py3.4-django1.5
19-
- TOX_ENV=py3.3-django1.5
20-
- TOX_ENV=py3.2-django1.5
21-
- TOX_ENV=py2.7-django1.5
22-
- TOX_ENV=py2.6-django1.5
23-
- TOX_ENV=py2.7-django1.4
24-
- TOX_ENV=py2.6-django1.4
25-
- TOX_ENV=py3.4-djangomaster
26-
- TOX_ENV=py3.3-djangomaster
27-
- TOX_ENV=py2.7-djangomaster
6+
- TOX_ENV=py27-flake8
7+
- TOX_ENV=py34-django1.7
8+
- TOX_ENV=py33-django1.7
9+
- TOX_ENV=py32-django1.7
10+
- TOX_ENV=py27-django1.7
11+
- TOX_ENV=py34-django1.6
12+
- TOX_ENV=py33-django1.6
13+
- TOX_ENV=py32-django1.6
14+
- TOX_ENV=py27-django1.6
15+
- TOX_ENV=py26-django1.6
16+
- TOX_ENV=py34-django1.5
17+
- TOX_ENV=py33-django1.5
18+
- TOX_ENV=py32-django1.5
19+
- TOX_ENV=py27-django1.5
20+
- TOX_ENV=py26-django1.5
21+
- TOX_ENV=py27-django1.4
22+
- TOX_ENV=py26-django1.4
23+
- TOX_ENV=py34-djangomaster
24+
- TOX_ENV=py33-djangomaster
25+
- TOX_ENV=py32-djangomaster
26+
- TOX_ENV=py27-djangomaster
2827

2928
matrix:
3029
fast_finish: true
3130
allow_failures:
32-
- env: TOX_ENV=py3.4-djangomaster
33-
- env: TOX_ENV=py3.3-djangomaster
34-
- env: TOX_ENV=py2.7-djangomaster
31+
- env: TOX_ENV=py34-djangomaster
32+
- env: TOX_ENV=py33-djangomaster
33+
- env: TOX_ENV=py32-djangomaster
34+
- env: TOX_ENV=py27-djangomaster
3535

3636
install:
37-
- "pip install tox --download-cache $HOME/.pip-cache"
37+
- pip install tox
3838

3939
script:
4040
- tox -e $TOX_ENV

‎tox.ini

Lines changed: 20 additions & 170 deletions
Original file line numberDiff line numberDiff line change
@@ -1,181 +1,31 @@
11
[tox]
2-
downloadcache = {toxworkdir}/cache/
32
envlist =
4-
flake8,
5-
py3.4-django1.7,py3.3-django1.7,py3.2-django1.7,py2.7-django1.7,
6-
py3.4-django1.6,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,
7-
py3.4-django1.5,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,
8-
py2.7-django1.4,py2.6-django1.4,
9-
py3.4-djangomaster,py3.3-djangomaster,py2.7-djangomaster
3+
py27-flake8,
4+
{py26,py27}-django1.4,
5+
{py26,py27,py32,py33,py34}-django{1.5,1.6},
6+
{py27,py32,py33,py34}-django{1.7,master}
107

118
[testenv]
129
commands = ./runtests.py --fast
1310
setenv =
1411
PYTHONDONTWRITEBYTECODE=1
15-
16-
[testenv:flake8]
17-
basepython = python2.7
18-
deps = pytest==2.5.2
19-
flake8==2.2.2
20-
commands = ./runtests.py --lintonly
21-
22-
[testenv:py3.4-django1.7]
23-
basepython = python3.4
24-
deps = Django==1.7
25-
django-filter==0.7
26-
defusedxml==0.3
27-
pytest-django==2.6.1
28-
29-
[testenv:py3.3-django1.7]
30-
basepython = python3.3
31-
deps = Django==1.7
32-
django-filter==0.7
33-
defusedxml==0.3
12+
deps =
13+
django1.4: django==1.4.11
14+
django1.5: django==1.5.6
15+
django1.6: Django==1.6.3
16+
django1.7: Django==1.7
17+
djangomaster: https://github.com/django/django/zipball/master
18+
{py26,py27}-django{1.4,1.5,1.6,1.7}: django-guardian==1.2.3
19+
{py26,py27}-django{1.4,1.5,1.6}: oauth2==1.5.211
20+
{py26,py27}-django{1.4,1.5,1.6}: django-oauth-plus==2.2.1
21+
{py26,py27}-django{1.4,1.5}: django-oauth2-provider==0.2.3
22+
{py26,py27}-django1.6: django-oauth2-provider==0.2.4
3423
pytest-django==2.6.1
35-
36-
[testenv:py3.2-django1.7]
37-
basepython = python3.2
38-
deps = Django==1.7
39-
django-filter==0.7
40-
defusedxml==0.3
41-
pytest-django==2.6.1
42-
43-
[testenv:py2.7-django1.7]
44-
basepython = python2.7
45-
deps = Django==1.7
4624
django-filter==0.7
4725
defusedxml==0.3
48-
# django-oauth-plus==2.2.1
49-
# oauth2==1.5.211
50-
# django-oauth2-provider==0.2.4
51-
django-guardian==1.2.3
52-
pytest-django==2.6.1
53-
54-
[testenv:py3.4-django1.6]
55-
basepython = python3.4
56-
deps = Django==1.6.3
57-
django-filter==0.7
58-
defusedxml==0.3
59-
pytest-django==2.6.1
6026

61-
[testenv:py3.3-django1.6]
62-
basepython = python3.3
63-
deps = Django==1.6.3
64-
django-filter==0.7
65-
defusedxml==0.3
66-
pytest-django==2.6.1
67-
68-
[testenv:py3.2-django1.6]
69-
basepython = python3.2
70-
deps = Django==1.6.3
71-
django-filter==0.7
72-
defusedxml==0.3
73-
pytest-django==2.6.1
74-
75-
[testenv:py2.7-django1.6]
76-
basepython = python2.7
77-
deps = Django==1.6.3
78-
django-filter==0.7
79-
defusedxml==0.3
80-
django-oauth-plus==2.2.1
81-
oauth2==1.5.211
82-
django-oauth2-provider==0.2.4
83-
django-guardian==1.2.3
84-
pytest-django==2.6.1
85-
86-
[testenv:py2.6-django1.6]
87-
basepython = python2.6
88-
deps = Django==1.6.3
89-
django-filter==0.7
90-
defusedxml==0.3
91-
django-oauth-plus==2.2.1
92-
oauth2==1.5.211
93-
django-oauth2-provider==0.2.4
94-
django-guardian==1.2.3
95-
pytest-django==2.6.1
96-
97-
[testenv:py3.4-django1.5]
98-
basepython = python3.4
99-
deps = django==1.5.6
100-
django-filter==0.7
101-
defusedxml==0.3
102-
pytest-django==2.6.1
103-
104-
[testenv:py3.3-django1.5]
105-
basepython = python3.3
106-
deps = django==1.5.6
107-
django-filter==0.7
108-
defusedxml==0.3
109-
pytest-django==2.6.1
110-
111-
[testenv:py3.2-django1.5]
112-
basepython = python3.2
113-
deps = django==1.5.6
114-
django-filter==0.7
115-
defusedxml==0.3
116-
pytest-django==2.6.1
117-
118-
[testenv:py2.7-django1.5]
119-
basepython = python2.7
120-
deps = django==1.5.6
121-
django-filter==0.7
122-
defusedxml==0.3
123-
django-oauth-plus==2.2.1
124-
oauth2==1.5.211
125-
django-oauth2-provider==0.2.3
126-
django-guardian==1.2.3
127-
pytest-django==2.6.1
128-
129-
[testenv:py2.6-django1.5]
130-
basepython = python2.6
131-
deps = django==1.5.6
132-
django-filter==0.7
133-
defusedxml==0.3
134-
django-oauth-plus==2.2.1
135-
oauth2==1.5.211
136-
django-oauth2-provider==0.2.3
137-
django-guardian==1.2.3
138-
pytest-django==2.6.1
139-
140-
[testenv:py2.7-django1.4]
141-
basepython = python2.7
142-
deps = django==1.4.11
143-
django-filter==0.7
144-
defusedxml==0.3
145-
django-oauth-plus==2.2.1
146-
oauth2==1.5.211
147-
django-oauth2-provider==0.2.3
148-
django-guardian==1.2.3
149-
pytest-django==2.6.1
150-
151-
[testenv:py2.6-django1.4]
152-
basepython = python2.6
153-
deps = django==1.4.11
154-
django-filter==0.7
155-
defusedxml==0.3
156-
django-oauth-plus==2.2.1
157-
oauth2==1.5.211
158-
django-oauth2-provider==0.2.3
159-
django-guardian==1.2.3
160-
pytest-django==2.6.1
161-
162-
[testenv:py3.4-djangomaster]
163-
basepython = python3.4
164-
deps = https://github.com/django/django/zipball/master
165-
django-filter==0.7
166-
defusedxml==0.3
167-
pytest-django==2.6.1
168-
169-
[testenv:py3.3-djangomaster]
170-
basepython = python3.3
171-
deps = https://github.com/django/django/zipball/master
172-
django-filter==0.7
173-
defusedxml==0.3
174-
pytest-django==2.6.1
175-
176-
[testenv:py2.7-djangomaster]
177-
basepython = python3.2
178-
deps = https://github.com/django/django/zipball/master
179-
django-filter==0.7
180-
defusedxml==0.3
181-
pytest-django==2.6.1
27+
[testenv:py27-flake8]
28+
deps =
29+
pytest==2.5.2
30+
flake8==2.2.2
31+
commands = ./runtests.py --lintonly

0 commit comments

Comments
 (0)