Skip to content

Commit 9aa81c8

Browse files
authored
Merge pull request byteweaver#31 from dmarcelino/travis
Update travis and tox with newest Django versions
2 parents d4e391e + 924c438 commit 9aa81c8

2 files changed

Lines changed: 55 additions & 0 deletions

File tree

.travis.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,25 @@ install:
55
script:
66
- "tox"
77
env:
8+
- "TOXENV=py34-1.10.X"
9+
- "TOXENV=py27-1.10.X"
10+
- "TOXENV=py34-1.9.X"
11+
- "TOXENV=py27-1.9.X"
812
- "TOXENV=py34-1.8.X"
913
- "TOXENV=py27-1.8.X"
1014
- "TOXENV=py34-1.7.X"
1115
- "TOXENV=py27-1.7.X"
1216
- "TOXENV=py34-1.6.X"
1317
- "TOXENV=py27-1.6.X"
18+
- "TOXENV=py34-2.0.X"
19+
- "TOXENV=py34-1.11.X"
20+
- "TOXENV=py27-1.11.X"
21+
matrix:
22+
allow_failures:
23+
- env: "TOXENV=py34-2.0.X"
24+
- env: "TOXENV=py34-1.11.X"
25+
- env: "TOXENV=py27-1.11.X"
26+
fast_finish: true
1427
cache:
1528
directories:
1629
- $HOME/.cache/pip

tox.ini

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@
55

66
[tox]
77
envlist =
8+
py34-2.0.X,
9+
py34-1.11.X,
10+
py27-1.11.X,
11+
py34-1.10.X,
12+
py27-1.10.X,
13+
py34-1.9.X,
14+
py27-1.9.X,
815
py34-1.8.X,
916
py27-1.8.X,
1017
py34-1.7.X,
@@ -20,6 +27,41 @@ commands =
2027
django-admin.py --version
2128
django-admin.py test coupons
2229

30+
[testenv:py34-2.0.X]
31+
basepython = python3.4
32+
deps =
33+
django>=2.0, <2.1
34+
35+
[testenv:py34-1.11.X]
36+
basepython = python3.4
37+
deps =
38+
django>=1.11, <1.12
39+
40+
[testenv:py27-1.11.X]
41+
basepython = python2.7
42+
deps =
43+
django>=1.11, <1.12
44+
45+
[testenv:py34-1.10.X]
46+
basepython = python3.4
47+
deps =
48+
django>=1.10, <1.11
49+
50+
[testenv:py27-1.10.X]
51+
basepython = python2.7
52+
deps =
53+
django>=1.10, <1.11
54+
55+
[testenv:py34-1.9.X]
56+
basepython = python3.4
57+
deps =
58+
django>=1.9, <1.10
59+
60+
[testenv:py27-1.9.X]
61+
basepython = python2.7
62+
deps =
63+
django>=1.9, <1.10
64+
2365
[testenv:py34-1.8.X]
2466
basepython = python3.4
2567
deps =

0 commit comments

Comments
 (0)