Skip to content

Commit 197c165

Browse files
committed
Merge pull request #27 from founders4schools/test-Django-1.9-py35
Edit tox and travis files to test Django 1.9 & Python 3.5
2 parents a392527 + 5b5d433 commit 197c165

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ env:
33
- TOX_ENV=py27-dj-1.6
44
- TOX_ENV=py27-dj-1.7
55
- TOX_ENV=py27-dj-1.8
6+
- TOX_ENV=py27-dj-1.9
67
- TOX_ENV=py27-dj-master
78
- TOX_ENV=py33-dj-1.6
89
- TOX_ENV=py33-dj-1.7
910
- TOX_ENV=py33-dj-1.8
1011
- TOX_ENV=py34-dj-1.6
1112
- TOX_ENV=py34-dj-1.7
1213
- TOX_ENV=py34-dj-1.8
14+
- TOX_ENV=py34-dj-1.9
1315
- TOX_ENV=py34-dj-master
16+
- TOX_ENV=py35-dj-1.9
1417
- TOX_ENV=py35-dj-master
1518

1619
matrix:

tox.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
[tox]
22
envlist =
3-
{py27,py33,py34}-dj-{1.6,1.7,1.8,master}
3+
{py27,py33,py34,py35}-dj-{1.6,1.7,1.8,1.9,master}
44

55
[testenv]
66
commands = ./runtests.py
77
deps =
88
dj-1.6: Django==1.6.11
99
dj-1.6: South==1.0.2
10-
dj-1.7: Django==1.7.8
11-
dj-1.8: Django==1.8.2
10+
dj-1.7: Django==1.7.11
11+
dj-1.8: Django==1.8.7
12+
dj-1.9: Django==1.9
1213
dj-master: https://github.com/django/django/archive/master.tar.gz
1314
mock

0 commit comments

Comments
 (0)