Skip to content

Commit e6014ea

Browse files
authored
Merge pull request #49 from ticosax/travis-django-master
Django master dropped support of python3.4
2 parents d64b71a + d8956bd commit e6014ea

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ matrix:
2828
python: 3.6
2929
- env: TOXENV=py34-dj-2.0
3030
python: 3.4
31-
- env: TOXENV=py34-dj-master
32-
python: 3.4
3331
- env: TOXENV=py35-dj-2.0
3432
python: 3.5
3533
- env: TOXENV=py35-dj-master
@@ -39,8 +37,6 @@ matrix:
3937
- env: TOXENV=py36-dj-master
4038
python: 3.6
4139
allow_failures:
42-
- env: TOXENV=py34-dj-master
43-
python: 3.4
4440
- env: TOXENV=py35-dj-master
4541
python: 3.5
4642
- env: TOXENV=py36-dj-master

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[tox]
22
envlist =
33
py{27,34,35,36}-dj-{1.8,1.10,1.11}
4-
py{34,35,36}-dj-{2.0,master}
4+
py{34,35,36}-dj-2.0
5+
py{35,36}-dj-master
56

67
[testenv]
78
commands = ./runtests.py

0 commit comments

Comments
 (0)