Skip to content

Commit 032e060

Browse files
committed
Enable tests for Django 2.1 and add classifier
Closes #614.
1 parent f667ef9 commit 032e060

File tree

5 files changed

+15
-2
lines changed

5 files changed

+15
-2
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ jobs:
99
env: TOXENV=py36-djmaster-postgres
1010
- python: 3.6
1111
env: TOXENV=py36-dj20-postgres
12+
- python: 3.6
13+
env: TOXENV=py36-dj21-postgres
1214
- python: 3.6
1315
env: TOXENV=py36-dj111-sqlite
1416

README.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ pytest-django allows you to test your Django project/applications with the
2828
<https://pytest-django.readthedocs.io/en/latest/contributing.html>`_
2929
* Version compatibility:
3030

31-
* Django: 1.8-1.11, 2.0 and latest master branch (compatible at the time of each release)
31+
* Django: 1.8-1.11, 2.0-2.1,
32+
and latest master branch (compatible at the time of each release)
3233
* Python: CPython 2.7, 3.4-3.6 or PyPy 2, 3
3334
* pytest: >=3.6
3435

docs/changelog.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
Changelog
22
=========
33

4+
unreleased
5+
------------------
6+
7+
Compatibility
8+
^^^^^^^^^^^^^
9+
10+
* Support Django 2.1 (no changes necessary) (#614).
11+
412
3.3.0 (2018-06-15)
513
------------------
614

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ def read(fname):
4444
'Framework :: Django :: 1.10',
4545
'Framework :: Django :: 1.11',
4646
'Framework :: Django :: 2.0',
47+
'Framework :: Django :: 2.1',
4748
'Intended Audience :: Developers',
4849
'License :: OSI Approved :: BSD License',
4950
'Operating System :: OS Independent',

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist =
3-
- py{35,36}-dj{20,111,110,19,18}-postgres
3+
- py{35,36}-dj{21,20,111,110,19,18}-postgres
44
- py34-dj{20,111,110}-postgres
55
- py27-dj{111,110}-{mysql_innodb,mysql_myisam,postgres}
66
- py27-dj{111,110,19,18}-postgres
@@ -14,6 +14,7 @@ deps =
1414
{env:_PYTESTDJANGO_TOX_EXTRA_DEPS:}
1515

1616
djmaster: https://github.com/django/django/archive/master.tar.gz
17+
dj21: Django>=2.1a1,<2.2
1718
dj20: Django>=2.0a1,<2.1
1819
dj111: Django>=1.11,<1.12
1920
dj110: Django>=1.10,<1.11

0 commit comments

Comments
 (0)