Skip to content

Commit c4655d3

Browse files
committed
update Tox and Travis to supported versions of Python and Django
1 parent 6b34d39 commit c4655d3

File tree

2 files changed

+10
-17
lines changed

2 files changed

+10
-17
lines changed

.travis.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,19 @@ python:
44
- 3.4
55
- 3.5
66
- 3.6
7+
- 3.7
78
env:
8-
- DJANGO=1.8
9-
- DJANGO=1.9
10-
- DJANGO=1.10
119
- DJANGO=1.11
1210
- DJANGO=2.0
11+
- DJANGO=2.1
1312
matrix:
1413
exclude:
1514
# Python/Django combinations that aren't officially supported
16-
- { python: 3.6, env: DJANGO=1.8 }
17-
- { python: 3.6, env: DJANGO=1.9 }
18-
- { python: 3.6, env: DJANGO=1.10 }
1915
- { python: 2.7, env: DJANGO=2.0 }
16+
- { python: 2.7, env: DJANGO=2.1 }
2017
include:
21-
- { python: 3.6, env: TOXENV=flake8 }
22-
- { python: 3.6, env: TOXENV=docs }
18+
- { python: 3.7, env: TOXENV=flake8 }
19+
- { python: 3.7, env: TOXENV=docs }
2320

2421
install:
2522
- pip install tox-travis

tox.ini

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@
66
[tox]
77
envlist =
88
flake8
9-
py{27,34,35}-django18
10-
py{27,34,35}-django110
11-
py{27,34,35,36}-django111
12-
py{34,35,36}-django20
9+
py{27,34,35,36,37}-django111
10+
py{34,35,36,37}-django20
11+
py{34,35,36,37}-django21
1312
docs
1413

1514
[testenv]
1615
deps =
17-
django18: Django>=1.8,<1.9
18-
django110: Django>=1.10,<1.11
1916
django111: Django>=1.11,<2.0
2017
django20: Django>=2.0,<2.1
18+
django21: Django>=2.1,<2.2
2119
py27: mock
2220
commands =
2321
python runtests.py
@@ -37,11 +35,9 @@ commands = flake8
3735

3836
[travis:env]
3937
DJANGO =
40-
1.8: django18
41-
1.9: django19
42-
1.10: django110
4338
1.11: django111
4439
2.0: django20
40+
2.1: django21
4541

4642
[flake8]
4743
exclude =

0 commit comments

Comments
 (0)