Skip to content

Commit 59a8cb7

Browse files
committed
Update build matrix
1 parent b05a671 commit 59a8cb7

File tree

2 files changed

+26
-13
lines changed

2 files changed

+26
-13
lines changed

.travis.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
language: python
2-
32
python:
3+
- "2.6"
44
- "2.7"
55
- "3.2"
66
- "3.3"
77
- "3.4"
8-
98
env:
109
- DJANGO=1.6
1110
- DJANGO=1.7
1211
- DJANGO=master
13-
12+
matrix:
13+
exclude:
14+
- python: "2.6"
15+
env: DJANGO=1.7
16+
- python: "2.6"
17+
env: DJANGO=master
18+
- python: "3.4"
19+
env: DJANGO=1.6
1420
install:
1521
- pip install tox coveralls
1622
script:

tox.ini

+17-10
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ max-complexity = 10
55

66
[tox]
77
envlist =
8+
py26-1.6,
89
py27-1.6, py27-1.7, py27-master,
910
py32-1.6, py32-1.7, py32-master,
1011
py33-1.6, py33-1.7, py33-master,
11-
py34-1.6, py34-1.7, py34-master,
12+
py34-1.7, py34-master
1213

1314
[testenv]
1415
deps =
@@ -24,17 +25,23 @@ commands =
2425
coverage report -m
2526
flake8 payments
2627

28+
[testenv:py26-1.6]
29+
basepython = python2.6
30+
deps =
31+
{[testenv]deps}
32+
Django>1.6,<1.7
33+
2734
[testenv:py27-1.7]
2835
basepython = python2.7
2936
deps =
3037
{[testenv]deps}
31-
Django == 1.7
38+
Django>1.7,<1.8
3239

3340
[testenv:py27-1.6]
3441
basepython = python2.7
3542
deps =
3643
{[testenv]deps}
37-
Django == 1.6.7
44+
Django>1.6,<1.7
3845

3946
[testenv:py27-master]
4047
basepython = python2.7
@@ -46,13 +53,13 @@ deps =
4653
basepython = python3.2
4754
deps =
4855
{[testenv]deps}
49-
Django == 1.7
56+
Django>1.7,<1.8
5057

5158
[testenv:py32-1.6]
5259
basepython = python3.2
5360
deps =
5461
{[testenv]deps}
55-
Django == 1.6.7
62+
Django>1.6,<1.7
5663

5764
[testenv:py32-master]
5865
basepython = python3.2
@@ -64,13 +71,13 @@ deps =
6471
basepython = python3.3
6572
deps =
6673
{[testenv]deps}
67-
Django == 1.7
74+
Django>1.7,<1.8
6875

6976
[testenv:py33-1.6]
7077
basepython = python3.3
7178
deps =
7279
{[testenv]deps}
73-
Django == 1.6.7
80+
Django>1.6,<1.7
7481

7582
[testenv:py33-master]
7683
basepython = python3.3
@@ -82,16 +89,16 @@ deps =
8289
basepython = python3.4
8390
deps =
8491
{[testenv]deps}
85-
Django == 1.7
92+
Django>1.7,<1.8
8693

8794
[testenv:py34-1.6]
8895
basepython = python3.4
8996
deps =
9097
{[testenv]deps}
91-
Django == 1.6.7
98+
Django>1.6,<1.7
9299

93100
[testenv:py34-master]
94101
basepython = python3.4
95102
deps =
96103
{[testenv]deps}
97-
https://github.com/django/django/tarball/master
104+
https://github.com/django/django/tarball/master

0 commit comments

Comments
 (0)