Skip to content

Commit 1dc51ad

Browse files
committed
Add Django 1.11 and Python 3.6 to tox config
1 parent 45cc8c2 commit 1dc51ad

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

tox.ini

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ envlist = docs,
33
py27-django1.8-es1.x,
44
py27-django1.9-es1.x,
55
py27-django1.10-es1.x,
6+
py27-django1.11-es1.x,
67
py34-django1.8-es1.x,
78
py34-django1.9-es1.x,
89
py34-django1.10-es1.x,
10+
py34-django1.11-es1.x,
911
py35-django1.8-es1.x,
1012
py35-django1.9-es1.x,
1113
py35-django1.10-es1.x,
12-
pypy-django1.8-es1.x,
13-
pypy-django1.9-es1.x,
14+
py35-django1.11-es1.x,
1415
pypy-django1.10-es1.x,
1516
py27-django1.8-es2.x,
1617
py27-django1.9-es2.x,
@@ -21,13 +22,16 @@ envlist = docs,
2122
py35-django1.8-es2.x,
2223
py35-django1.9-es2.x,
2324
py35-django1.10-es2.x,
24-
pypy-django1.8-es2.x,
25-
pypy-django1.9-es2.x,
25+
py36-django1.11-es2.x,
2626
pypy-django1.10-es2.x,
2727

2828
[base]
2929
deps = requests
3030

31+
[django1.11]
32+
deps =
33+
Django>=1.11,<1.12
34+
3135
[django1.10]
3236
deps =
3337
Django>=1.10,<1.11
@@ -238,6 +242,14 @@ deps =
238242
{[django1.10]deps}
239243
{[base]deps}
240244

245+
[testenv:py36-django1.11-es2.x]
246+
basepython = python3.6
247+
setenv = VERSION_ES=>=2.0.0,<3.0.0
248+
deps =
249+
{[es2.x]deps}
250+
{[django1.11]deps}
251+
{[base]deps}
252+
241253
[testenv:docs]
242254
changedir = docs
243255
deps =

0 commit comments

Comments
 (0)