Skip to content

Commit de9de79

Browse files
author
Martin Pauly
committed
Drop tests for Django < 1.11
1 parent 2ce34db commit de9de79

File tree

2 files changed

+26
-173
lines changed

2 files changed

+26
-173
lines changed

‎.travis.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ python:
55
- 2.7
66
- 3.4
77
- 3.5
8+
- 3.6
89
- pypy
910

1011
cache:
@@ -58,12 +59,8 @@ script:
5859

5960
env:
6061
matrix:
61-
- DJANGO_VERSION=">=1.8,<1.9" VERSION_ES=">=1.0.0,<2.0.0"
62-
- DJANGO_VERSION=">=1.9,<1.10" VERSION_ES=">=1.0.0,<2.0.0"
63-
- DJANGO_VERSION=">=1.10,<1.11" VERSION_ES=">=1.0.0,<2.0.0"
64-
- DJANGO_VERSION=">=1.8,<1.9" VERSION_ES=">=2.0.0,<3.0.0"
65-
- DJANGO_VERSION=">=1.9,<1.10" VERSION_ES=">=2.0.0,<3.0.0"
66-
- DJANGO_VERSION=">=1.10,<1.11" VERSION_ES=">=2.0.0,<3.0.0"
62+
- DJANGO_VERSION=">=1.11,<1.12" VERSION_ES=">=1.0.0,<2.0.0"
63+
- DJANGO_VERSION=">=2.0,<2.1" VERSION_ES=">=1.0.0,<2.0.0"
6764
- DJANGO_VERSION=">=1.11,<1.12" VERSION_ES=">=2.0.0,<3.0.0"
6865
- DJANGO_VERSION=">=2.0,<2.1" VERSION_ES=">=2.0.0,<3.0.0"
6966

‎tox.ini

Lines changed: 23 additions & 167 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,20 @@
11
[tox]
22
envlist = docs,
3-
py27-django1.8-es1.x,
4-
py27-django1.9-es1.x,
5-
py27-django1.10-es1.x,
63
py27-django1.11-es1.x,
7-
py34-django1.8-es1.x,
8-
py34-django1.9-es1.x,
9-
py34-django1.10-es1.x,
104
py34-django1.11-es1.x,
115
py34-django2.0-es1.x,
12-
py35-django1.8-es1.x,
13-
py35-django1.9-es1.x,
14-
py35-django1.10-es1.x,
156
py35-django1.11-es1.x,
167
py35-django2.0-es1.x,
17-
pypy-django1.10-es1.x,
8+
pypy-django1.11-es1.x,
189
pypy-django2.0-es1.x,
19-
py27-django1.8-es2.x,
20-
py27-django1.9-es2.x,
21-
py27-django1.10-es2.x,
22-
py34-django1.8-es2.x,
23-
py34-django1.9-es2.x,
24-
py34-django1.10-es2.x,
10+
py27-django1.11-es2.x,
11+
py34-django1.11-es2.x,
2512
py34-django2.0-es2.x,
26-
py35-django1.8-es2.x,
27-
py35-django1.9-es2.x,
28-
py35-django1.10-es2.x,
13+
py35-django1.11-es2.x,
2914
py35-django2.0-es2.x,
3015
py36-django1.11-es2.x,
3116
py36-django2.0-es2.x,
32-
pypy-django1.10-es2.x,
17+
pypy-django1.11-es2.x,
3318
pypy-django2.0-es2.x,
3419

3520
[base]
@@ -43,18 +28,6 @@ deps =
4328
deps =
4429
Django>=1.11,<1.12
4530

46-
[django1.10]
47-
deps =
48-
Django>=1.10,<1.11
49-
50-
[django1.9]
51-
deps =
52-
Django>=1.9,<1.10
53-
54-
[django1.8]
55-
deps =
56-
Django>=1.8,<1.9
57-
5831
[es2.x]
5932
deps =
6033
elasticsearch>=2.0.0,<3.0.0
@@ -68,72 +41,33 @@ commands =
6841
python test_haystack/solr_tests/server/wait-for-solr
6942
python {toxinidir}/setup.py test
7043

71-
[testenv:pypy-django1.8-es1.x]
72-
setenv = VERSION_ES=>=1.0.0,<2.0.0
73-
deps =
74-
{[es1.x]deps}
75-
{[django1.8]deps}
76-
{[base]deps}
77-
78-
[testenv:pypy-django1.9-es1.x]
79-
setenv = VERSION_ES=>=1.0.0,<2.0.0
80-
deps =
81-
{[es1.x]deps}
82-
{[django1.9]deps}
83-
{[base]deps}
84-
85-
[testenv:pypy-django1.10-es1.x]
44+
[testenv:pypy-django1.11-es1.x]
8645
setenv = VERSION_ES=>=1.0.0,<2.0.0
8746
deps =
8847
{[es1.x]deps}
89-
{[django1.10]deps}
90-
{[base]deps}
91-
92-
[testenv:py27-django1.8-es1.x]
93-
basepython = python2.7
94-
setenv = VERSION_ES=>=1.0.0,<2.0.0
95-
deps =
96-
{[es1.x]deps}
97-
{[django1.8]deps}
48+
{[django1.11]deps}
9849
{[base]deps}
9950

100-
[testenv:py27-django1.9-es1.x]
101-
basepython = python2.7
51+
[testenv:pypy-django2.0-es1.x]
10252
setenv = VERSION_ES=>=1.0.0,<2.0.0
10353
deps =
10454
{[es1.x]deps}
105-
{[django1.9]deps}
55+
{[django2.0]deps}
10656
{[base]deps}
10757

108-
[testenv:py27-django1.10-es1.x]
58+
[testenv:py27-django1.11-es1.x]
10959
basepython = python2.7
11060
setenv = VERSION_ES=>=1.0.0,<2.0.0
11161
deps =
11262
{[es1.x]deps}
113-
{[django1.10]deps}
114-
{[base]deps}
115-
116-
[testenv:py34-django1.8-es1.x]
117-
basepython = python3.4
118-
setenv = VERSION_ES=>=1.0.0,<2.0.0
119-
deps =
120-
{[es1.x]deps}
121-
{[django1.8]deps}
122-
{[base]deps}
123-
124-
[testenv:py34-django1.9-es1.x]
125-
basepython = python3.4
126-
setenv = VERSION_ES=>=1.0.0,<2.0.0
127-
deps =
128-
{[es1.x]deps}
129-
{[django1.9]deps}
63+
{[django1.11]deps}
13064
{[base]deps}
13165

132-
[testenv:py34-django1.10-es1.x]
66+
[testenv:py34-django1.11-es1.x]
13367
basepython = python3.4
13468
setenv = VERSION_ES=>=1.0.0,<2.0.0
13569
deps =
136-
{[django1.10]deps}
70+
{[django1.11]deps}
13771
{[base]deps}
13872

13973
[testenv:py34-django2.0-es1.x]
@@ -143,28 +77,12 @@ deps =
14377
{[django2.0]deps}
14478
{[base]deps}
14579

146-
[testenv:py35-django1.8-es1.x]
147-
basepython = python3.5
148-
setenv = VERSION_ES=>=1.0.0,<2.0.0
149-
deps =
150-
{[es1.x]deps}
151-
{[django1.8]deps}
152-
{[base]deps}
153-
154-
[testenv:py35-django1.9-es1.x]
155-
basepython = python3.5
156-
setenv = VERSION_ES=>=1.0.0,<2.0.0
157-
deps =
158-
{[es1.x]deps}
159-
{[django1.9]deps}
160-
{[base]deps}
161-
162-
[testenv:py35-django1.10-es1.x]
80+
[testenv:py35-django1.11-es1.x]
16381
basepython = python3.5
16482
setenv = VERSION_ES=>=1.0.0,<2.0.0
16583
deps =
16684
{[es1.x]deps}
167-
{[django1.10]deps}
85+
{[django1.11]deps}
16886
{[base]deps}
16987

17088
[testenv:py35-django2.0-es1.x]
@@ -175,25 +93,11 @@ deps =
17593
{[django2.0]deps}
17694
{[base]deps}
17795

178-
[testenv:pypy-django1.8-es2.x]
96+
[testenv:pypy-django1.11-es2.x]
17997
setenv = VERSION_ES=>=2.0.0,<3.0.0
18098
deps =
18199
{[es2.x]deps}
182-
{[django1.8]deps}
183-
{[base]deps}
184-
185-
[testenv:pypy-django1.9-es2.x]
186-
setenv = VERSION_ES=>=2.0.0,<3.0.0
187-
deps =
188-
{[es2.x]deps}
189-
{[django1.9]deps}
190-
{[base]deps}
191-
192-
[testenv:pypy-django1.10-es2.x]
193-
setenv = VERSION_ES=>=2.0.0,<3.0.0
194-
deps =
195-
{[es2.x]deps}
196-
{[django1.10]deps}
100+
{[django1.11]deps}
197101
{[base]deps}
198102

199103
[testenv:pypy-django2.0-es2.x]
@@ -203,52 +107,20 @@ deps =
203107
{[django2.0]deps}
204108
{[base]deps}
205109

206-
[testenv:py27-django1.8-es2.x]
207-
basepython = python2.7
208-
setenv = VERSION_ES=>=2.0.0,<3.0.0
209-
deps =
210-
{[es2.x]deps}
211-
{[django1.8]deps}
212-
{[base]deps}
213-
214-
[testenv:py27-django1.9-es2.x]
110+
[testenv:py27-django1.11-es2.x]
215111
basepython = python2.7
216112
setenv = VERSION_ES=>=2.0.0,<3.0.0
217113
deps =
218114
{[es2.x]deps}
219-
{[django1.9]deps}
220-
{[base]deps}
221-
222-
[testenv:py27-django1.10-es2.x]
223-
basepython = python2.7
224-
setenv = VERSION_ES=>=2.0.0,<3.0.0
225-
deps =
226-
{[es2.x]deps}
227-
{[django1.10]deps}
228-
{[base]deps}
229-
230-
[testenv:py34-django1.8-es2.x]
231-
basepython = python3.4
232-
setenv = VERSION_ES=>=2.0.0,<3.0.0
233-
deps =
234-
{[es2.x]deps}
235-
{[django1.8]deps}
236-
{[base]deps}
237-
238-
[testenv:py34-django1.9-es2.x]
239-
basepython = python3.4
240-
setenv = VERSION_ES=>=2.0.0,<3.0.0
241-
deps =
242-
{[es2.x]deps}
243-
{[django1.9]deps}
115+
{[django1.11]deps}
244116
{[base]deps}
245117

246-
[testenv:py34-django1.10-es2.x]
118+
[testenv:py34-django1.11-es2.x]
247119
basepython = python3.4
248120
setenv = VERSION_ES=>=2.0.0,<3.0.0
249121
deps =
250122
{[es2.x]deps}
251-
{[django1.10]deps}
123+
{[django1.11]deps}
252124
{[base]deps}
253125

254126
[testenv:py34-django2.0-es2.x]
@@ -259,28 +131,12 @@ deps =
259131
{[django2.0]deps}
260132
{[base]deps}
261133

262-
[testenv:py35-django1.8-es2.x]
134+
[testenv:py35-django1.11-es2.x]
263135
basepython = python3.5
264136
setenv = VERSION_ES=>=2.0.0,<3.0.0
265137
deps =
266138
{[es2.x]deps}
267-
{[django1.8]deps}
268-
{[base]deps}
269-
270-
[testenv:py35-django1.9-es2.x]
271-
basepython = python3.5
272-
setenv = VERSION_ES=>=2.0.0,<3.0.0
273-
deps =
274-
{[es2.x]deps}
275-
{[django1.9]deps}
276-
{[base]deps}
277-
278-
[testenv:py35-django1.10-es2.x]
279-
basepython = python3.5
280-
setenv = VERSION_ES=>=2.0.0,<3.0.0
281-
deps =
282-
{[es2.x]deps}
283-
{[django1.10]deps}
139+
{[django1.11]deps}
284140
{[base]deps}
285141

286142
[testenv:py35-django2.0-es2.x]

0 commit comments

Comments
 (0)