Skip to content

Commit d8a2bfc

Browse files
committed
Add Django 1.11 to CI builds.
1 parent b7a32b0 commit d8a2bfc

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

.travis.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ matrix:
88

99
- python: 3.5
1010
env: TOXENV=py35-pytest30-djangomaster-postgres
11+
- python: 3.5
12+
env: TOXENV=py35-pytest30-django1.11-postgres
1113
- python: 3.5
1214
env: TOXENV=py35-pytest30-django1.10-postgres
1315
- python: 3.5
@@ -18,15 +20,17 @@ matrix:
1820
env: TOXENV=py35-checkqa
1921

2022
- python: 3.4
21-
env: TOXENV=py34-pytest30-django1.10-postgres
23+
env: TOXENV=py34-pytest30-django1.11-postgres
2224

2325
- python: 3.3
2426
env: TOXENV=py34-pytest30-django1.8-postgres
2527

2628
- python: 2.7
27-
env: TOXENV=py27-pytest30-django1.10-mysql_innodb
29+
env: TOXENV=py27-pytest30-django1.11-mysql_innodb
30+
- python: 2.7
31+
env: TOXENV=py27-pytest30-django1.11-mysql_myisam
2832
- python: 2.7
29-
env: TOXENV=py27-pytest30-django1.10-mysql_myisam
33+
env: TOXENV=py27-pytest30-django1.11-postgres
3034
- python: 2.7
3135
env: TOXENV=py27-pytest30-django1.10-postgres
3236
- python: 2.7
@@ -39,7 +43,7 @@ matrix:
3943
env: TOXENV=py27-checkqa
4044

4145
- python: pypy
42-
env: TOXENV=pypy-pytest30-django1.10-sqlite_file
46+
env: TOXENV=pypy-pytest30-django1.11-sqlite_file
4347

4448
allow_failures:
4549
- env: TOXENV=py35-pytest30-djangomaster-postgres

tox.ini

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[tox]
22
envlist =
3-
- py35-pytest30-django{master,1.10,1.9,1.8}-postgres
4-
- py34-pytest30-django1.10-postgres
3+
- py35-pytest30-django{master,1.11,1.10,1.9,1.8}-postgres
4+
- py34-pytest30-django{1.11,1.10}-postgres
55
- py33-pytest30-django1.8-postgres
6-
- py27-pytest30-django1.10-{mysql_innodb,mysql_myisam,postgres}
7-
- py27-pytest30-django{1.9,1.8,1.7}-postgres
6+
- py27-pytest30-django{1.11,1.10}-{mysql_innodb,mysql_myisam,postgres}
7+
- py27-pytest30-django{1.11,1.10,1.9,1.8,1.7}-postgres
88
- pypy3-pytest30-django1.8-{sqlite,sqlite_file}
99
- pypy3-pytest29-django1.8-sqlite_file
1010
- pypy-pytest30-django1.10-sqlite_file
@@ -18,6 +18,7 @@ deps =
1818
checkqa: flake8
1919

2020
djangomaster: https://github.com/django/django/archive/master.tar.gz
21+
django1.11: Django==1.11a1
2122
django1.10: Django>=1.10,<1.11
2223
django1.9: Django>=1.9,<1.10
2324
django1.8: Django>=1.8,<1.9
@@ -29,7 +30,7 @@ deps =
2930
postgres: psycopg2
3031

3132
pytest29: pytest>=2.9,<3.0
32-
pytest30: pytest>=3.0,<3.1
33+
pytest30: pytest>=3.0,<3.1.11a1
3334

3435
setenv =
3536
PYTHONPATH = {toxinidir}:{env:PYTHONPATH:}

0 commit comments

Comments
 (0)