Skip to content

Commit 25394e7

Browse files
committed
Add Django 2.0 to TravisCI test matrix
Add Django 2.0 with Python 3.5 and 3.6 to the test matrix, and fix some other entries. Use Django 2.0 in requirements.txt, which means Python 3.5 or greater is needed for quality checks.
1 parent 1873ab7 commit 25394e7

File tree

4 files changed

+20
-6
lines changed

4 files changed

+20
-6
lines changed

.travis.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@ matrix:
77
include:
88
# Quality checks
99
- env: TOXENV=flake8
10-
python: "2.7"
10+
python: "3.5"
1111
- env: TOXENV=docs
12-
python: "2.7"
12+
python: "3.5"
1313
# Supported Python / Django versions w/ SQLite
14+
- env: TOXENV=py35-django-20
15+
python: "3.5"
16+
- env: TOXENV=py36-django-20
17+
python: "3.6"
1418
- env: TOXENV=py27-django-111
1519
python: "2.7"
1620
- env: TOXENV=py36-django-111
@@ -28,6 +32,10 @@ matrix:
2832
- env: TOXENV=py34-django-18
2933
python: "3.4"
3034
# Test with PostgreSQL
35+
- env: TOXENV=py35-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-111-postgres"
36+
python: "3.5"
37+
- env: TOXENV=py36-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-111-postgres"
38+
python: "3.6"
3139
- env: TOXENV=py27-django-111-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-111-postgres"
3240
python: "2.7"
3341
- env: TOXENV=py36-django-111-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-111-postgres"
@@ -43,6 +51,10 @@ matrix:
4351
- env: TOXENV=py27-django-18-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-18-postgres"
4452
python: "2.7"
4553
# Test with MySQL
54+
- env: TOXENV=py35-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-111-mysql"
55+
python: "3.5"
56+
- env: TOXENV=py36-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-111-mysql"
57+
python: "3.6"
4658
- env: TOXENV=py27-django-111-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-111-mysql"
4759
python: "2.7"
4860
- env: TOXENV=py36-django-111-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-111-mysql"

README.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ recommended. It follows the `Django's support policy`_, supporting:
4646
* Django 1.9 with Python 2.7, 3.4, or 3.5
4747
* Django 1.10 with Python 2.7, 3.4, or 3.5
4848
* Django 1.11 (LTS) with Python 2.7, 3.4, 3.5, or 3.6
49+
* Django 2.0 with Python 3.5 or 3.6
4950

5051
.. _latest release: https://pypi.python.org/pypi/nose
5152
.. _Django's support policy: https://docs.djangoproject.com/en/1.8/internals/release-process/#supported-versions

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
# Latest Django
6-
Django>=1.11,<2.0
6+
Django>=2.0,<2.1
77

88
# This project
99
-e .

tox.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
envlist =
33
py{27,34,35}-django-{18,19,110}{,-postgres,-mysql}
44
py{27,34,35,36}-django-111{,-postgres,-mysql}
5-
py{35,36}-django-master{,-postgres,-mysql}
5+
py{35,36}-django-{20,master}{,-postgres,-mysql}
66
flake8
77
docs
88
skip_missing_interpreters = True
@@ -17,8 +17,9 @@ deps =
1717
dj-database-url
1818
django-18: Django>=1.8,<1.9
1919
django-19: Django>=1.9,<1.10
20-
django-110: Django==1.10,<1.11
21-
django-111: Django==1.11,<1.12
20+
django-110: Django>=1.10,<1.11
21+
django-111: Django>=1.11,<2.0
22+
django-20: Django>=2.0,<2.1
2223
django-master: https://github.com/django/django/archive/master.tar.gz
2324
postgres: psycopg2
2425
mysql: mysqlclient

0 commit comments

Comments
 (0)