Skip to content

Commit ed130f3

Browse files
committed
Remove 1.3 from matrix, bump versions, add Python 3.4 to the matrix
1 parent 8f601d3 commit ed130f3

File tree

2 files changed

+35
-36
lines changed

2 files changed

+35
-36
lines changed

.travis.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ python:
77
- 3.3
88

99
env:
10-
- DJANGO=Django==1.3.7
11-
- DJANGO=Django==1.4.10
12-
- DJANGO=Django==1.5.5
13-
- DJANGO=Django==1.6.2
10+
- DJANGO=Django==1.4.13
11+
- DJANGO=Django==1.5.8
12+
- DJANGO=Django==1.6.5
1413
- DJANGO=https://github.com/django/django/tarball/stable/1.7.x
1514

1615
install:
@@ -21,16 +20,16 @@ script: coverage run -a setup.py test
2120
matrix:
2221
exclude:
2322
- python: 2.6
24-
env: DJANGO=Django==1.6.2
23+
env: DJANGO=Django==1.6.5
2524
- python: 2.6
2625
env: DJANGO=https://github.com/django/django/tarball/stable/1.7.x
2726
- python: 3.2
28-
env: DJANGO=Django==1.3.7
27+
env: DJANGO=Django==1.4.13
2928
- python: 3.3
30-
env: DJANGO=Django==1.3.7
31-
- python: 3.2
32-
env: DJANGO=Django==1.4.10
33-
- python: 3.3
34-
env: DJANGO=Django==1.4.10
29+
env: DJANGO=Django==1.4.13
30+
31+
include:
32+
- python: 3.4
33+
env: DJANGO=https://github.com/django/django/tarball/stable/1.7.x
3534

3635
after_success: coveralls

tox.ini

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
[tox]
22
envlist =
3-
py26-1.3, py26-1.4, py26-1.5, py26-1.6,
4-
py27-1.3, py27-1.4, py27-1.5, py27-1.6, py27-1.7, py27-trunk,
3+
py26-1.4, py26-1.5, py26-1.6,
4+
py27-1.4, py27-1.5, py27-1.6, py27-1.7, py27-trunk,
55
py32-1.5, py32-1.6, py32-1.7, py32-trunk,
66
py33-1.5, py33-1.6, py33-1.7, py33-trunk,
7+
py34-1.7, py34-trunk,
78
docs, flake8
89

910

@@ -27,28 +28,22 @@ exclude = __init__.py
2728
deps = flake8
2829
commands = flake8 simple_history
2930

30-
[testenv:py26-1.3]
31-
basepython = python2.6
32-
deps =
33-
django == 1.3.7
34-
coverage == 3.6
35-
3631
[testenv:py26-1.4]
3732
basepython = python2.6
3833
deps =
39-
django == 1.4.10
34+
django == 1.4.13
4035
coverage == 3.6
4136

4237
[testenv:py26-1.5]
4338
basepython = python2.6
4439
deps =
45-
django == 1.5.5
40+
django == 1.5.8
4641
coverage == 3.6
4742

4843
[testenv:py26-1.6]
4944
basepython = python2.6
5045
deps =
51-
django == 1.6.2
46+
django == 1.6.5
5247
coverage == 3.6
5348

5449
[testenv:py26-trunk]
@@ -57,29 +52,22 @@ deps =
5752
https://github.com/django/django/tarball/master
5853
coverage == 3.6
5954

60-
61-
[testenv:py27-1.3]
62-
basepython = python2.7
63-
deps =
64-
django == 1.3.7
65-
coverage == 3.6
66-
6755
[testenv:py27-1.4]
6856
basepython = python2.7
6957
deps =
70-
django == 1.4.10
58+
django == 1.4.13
7159
coverage == 3.6
7260

7361
[testenv:py27-1.5]
7462
basepython = python2.7
7563
deps =
76-
django == 1.5.5
64+
django == 1.5.8
7765
coverage == 3.6
7866

7967
[testenv:py27-1.6]
8068
basepython = python2.7
8169
deps =
82-
django == 1.6.2
70+
django == 1.6.5
8371
coverage == 3.6
8472

8573
[testenv:py27-1.7]
@@ -98,13 +86,13 @@ deps =
9886
[testenv:py32-1.5]
9987
basepython = python3.2
10088
deps =
101-
django == 1.5.5
89+
django == 1.5.8
10290
coverage == 3.6
10391

10492
[testenv:py32-1.6]
10593
basepython = python3.2
10694
deps =
107-
django == 1.6.2
95+
django == 1.6.5
10896
coverage == 3.6
10997

11098
[testenv:py32-1.7]
@@ -123,13 +111,13 @@ deps =
123111
[testenv:py33-1.5]
124112
basepython = python3.3
125113
deps =
126-
django == 1.5.5
114+
django == 1.5.8
127115
coverage == 3.6
128116

129117
[testenv:py33-1.6]
130118
basepython = python3.3
131119
deps =
132-
django == 1.6.2
120+
django == 1.6.5
133121
coverage == 3.6
134122

135123
[testenv:py33-1.7]
@@ -143,3 +131,15 @@ basepython = python3.3
143131
deps =
144132
https://github.com/django/django/tarball/master
145133
coverage == 3.6
134+
135+
[testenv:py34-1.7]
136+
basepython = python3.4
137+
deps =
138+
https://github.com/django/django/tarball/stable/1.7.x
139+
coverage == 3.6
140+
141+
[testenv:py34-trunk]
142+
basepython = python3.4
143+
deps =
144+
https://github.com/django/django/tarball/master
145+
coverage == 3.6

0 commit comments

Comments
 (0)