Skip to content

Commit 52fae7a

Browse files
michael-kblueyed
authored andcommitted
Enable tests for Django 2.2 and add classifier (pytest-dev#693)
1 parent 2ec5318 commit 52fae7a

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

.travis.yml

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ jobs:
2222
dist: xenial
2323
sudo: true
2424

25+
- python: 3.7
26+
env: TOXENV=py37-dj22-sqlite-coverage
27+
dist: xenial
28+
sudo: true
29+
2530
- python: 3.6
2631
env: TOXENV=py36-djmaster-sqlite-coverage
2732

README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ 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-2.1,
31+
* Django: 1.8-1.11, 2.0-2.2,
3232
and latest master branch (compatible at the time of each release)
3333
* Python: CPython 2.7, 3.4-3.7 or PyPy 2, 3
3434
* pytest: >=3.6

setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ def read(fname):
5555
'Framework :: Django :: 1.11',
5656
'Framework :: Django :: 2.0',
5757
'Framework :: Django :: 2.1',
58+
'Framework :: Django :: 2.2',
5859
'Intended Audience :: Developers',
5960
'License :: OSI Approved :: BSD License',
6061
'Operating System :: OS Independent',

tox.ini

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[tox]
22
envlist =
3-
py{35,36}-dj{21,20,111,110,19,18}-postgres
3+
py{37}-dj{22,21,20,111}-postgres
4+
py{35,36}-dj{22,21,20,111,110,19,18}-postgres
45
py34-dj{20,111,110}-postgres
56
py27-dj{111,110}-{mysql_innodb,mysql_myisam,postgres}
67
py27-dj{111,110,19,18}-postgres
@@ -10,8 +11,9 @@ envlist =
1011
extras = testing
1112
deps =
1213
djmaster: https://github.com/django/django/archive/master.tar.gz
13-
dj21: Django>=2.1a1,<2.2
14-
dj20: Django>=2.0a1,<2.1
14+
dj22: Django>=2.2a1,<2.3
15+
dj21: Django>=2.1,<2.2
16+
dj20: Django>=2.0,<2.1
1517
dj111: Django>=1.11,<1.12
1618
dj110: Django>=1.10,<1.11
1719
dj19: Django>=1.9,<1.10

0 commit comments

Comments
 (0)