Skip to content

Commit 0bb5e9f

Browse files
committed
Add Django 2.1 to test matrix
1 parent 80d529f commit 0bb5e9f

File tree

4 files changed

+21
-5
lines changed

4 files changed

+21
-5
lines changed

.travis.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ matrix:
1111
- env: TOXENV=docs
1212
python: "3.5"
1313
# Supported Python / Django versions w/ SQLite
14+
- env: TOXENV=py35-django-21
15+
python: "3.5"
16+
- env: TOXENV=py36-django-21
17+
python: "3.6"
1418
- env: TOXENV=py35-django-20
1519
python: "3.5"
1620
- env: TOXENV=py36-django-20
@@ -32,9 +36,13 @@ matrix:
3236
- env: TOXENV=py34-django-18
3337
python: "3.4"
3438
# Test with PostgreSQL
35-
- env: TOXENV=py35-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-111-postgres"
39+
- env: TOXENV=py35-django-21-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-21-postgres"
40+
python: "3.5"
41+
- env: TOXENV=py36-django-21-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-21-postgres"
42+
python: "3.6"
43+
- env: TOXENV=py35-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-20-postgres"
3644
python: "3.5"
37-
- env: TOXENV=py36-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-111-postgres"
45+
- env: TOXENV=py36-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-20-postgres"
3846
python: "3.6"
3947
- env: TOXENV=py27-django-111-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-111-postgres"
4048
python: "2.7"
@@ -51,9 +59,13 @@ matrix:
5159
- env: TOXENV=py27-django-18-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-18-postgres"
5260
python: "2.7"
5361
# Test with MySQL
54-
- env: TOXENV=py35-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-111-mysql"
62+
- env: TOXENV=py35-django-21-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-21-mysql"
63+
python: "3.5"
64+
- env: TOXENV=py36-django-21-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-21-mysql"
65+
python: "3.6"
66+
- env: TOXENV=py35-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-20-mysql"
5567
python: "3.5"
56-
- env: TOXENV=py36-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-111-mysql"
68+
- env: TOXENV=py36-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-20-mysql"
5769
python: "3.6"
5870
- env: TOXENV=py27-django-111-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-111-mysql"
5971
python: "2.7"

README.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ recommended. It follows the `Django's support policy`_, supporting:
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
4949
* Django 2.0 with Python 3.4, 3.5 or 3.6
50+
* Django 2.1 with Python 3.5 or 3.6
5051

5152
Python 3.7 should work, but is untested in TravisCI.
5253

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ def get_long_description(title):
7171
'Framework :: Django :: 1.10',
7272
'Framework :: Django :: 1.11',
7373
'Framework :: Django :: 2.0',
74+
'Framework :: Django :: 2.1',
7475
'Intended Audience :: Developers',
7576
'License :: OSI Approved :: BSD License',
7677
'Operating System :: OS Independent',

tox.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
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{34,35,36}-django-{20,master}{,-postgres,-mysql}
5+
py{34,35,36,37}-django-20{,-postgres,-mysql}
6+
py{35,36,37}-django-{21,master}{,-postgres,-mysql}
67
flake8
78
docs
89
skip_missing_interpreters = True
@@ -20,6 +21,7 @@ deps =
2021
django-110: Django>=1.10,<1.11
2122
django-111: Django>=1.11,<2.0
2223
django-20: Django>=2.0,<2.1
24+
django-21: Django>=2.1,<2.2
2325
django-master: https://github.com/django/django/archive/master.tar.gz
2426
postgres: psycopg2
2527
mysql: mysqlclient

0 commit comments

Comments
 (0)