Skip to content

Commit 8920f8c

Browse files
committed
add django 1.10 to travis config
1 parent 54c1a71 commit 8920f8c

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ env:
1818
- TOXENV=py27-d19-pg
1919
- TOXENV=py27-d19-sqlite
2020
- TOXENV=py27-d19-mysql
21+
- TOXENV=py27-d110-pg
22+
- TOXENV=py27-d110-sqlite
23+
- TOXENV=py27-d110-mysql
2124

2225
- TOXENV=py33-d18-pg
2326
- TOXENV=py33-d18-sqlite
@@ -31,11 +34,16 @@ env:
3134
- TOXENV=py35-d18-sqlite
3235
- TOXENV=py35-d19-pg
3336
- TOXENV=py35-d19-sqlite
37+
- TOXENV=py35-d110-pg
38+
- TOXENV=py35-d110-sqlite
3439

3540
- TOXENV=pypy-d18-pg
3641
- TOXENV=pypy-d18-sqlite
3742
- TOXENV=pypy-d19-pg
3843
- TOXENV=pypy-d19-sqlite
44+
- TOXENV=pypy-d110-pg
45+
- TOXENV=pypy-d110-sqlite
46+
3947

4048

4149
install:

tox.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
envlist = py{27}-d{18,19,110}-{pg,sqlite,mysql},
3-
py{34,35}-d{18,19}-{pg,sqlite}
4-
pypy-d{18,19}-{pg,sqlite}
3+
py{34,35}-d{18,19,110}-{pg,sqlite}
4+
pypy-d{18,19,110}-{pg,sqlite}
55

66
[pytest]
77
python_paths=./tests/demoapp/
@@ -39,7 +39,7 @@ setenv =
3939

4040
deps=
4141
py{27,33,34,35}-{pg}: psycopg2>=2.6.1
42-
pypy-d{18,19}-{pg}: psycopg2cffi
42+
pypy-d{18,19,110}-{pg}: psycopg2cffi
4343

4444
mysql: mysqlclient
4545

@@ -50,7 +50,7 @@ deps=
5050
d19: django-reversion==1.10
5151

5252
d110: django-reversion==1.10
53-
d110: django>=1.10.dev,<1.11
53+
d110: django>=1.10,<1.11
5454

5555
-rsrc/requirements/testing.pip
5656

0 commit comments

Comments
 (0)