Skip to content

Commit dc8adfa

Browse files
committed
add django 3.1 to test matrix
1 parent 7458d56 commit dc8adfa

File tree

4 files changed

+25
-3
lines changed

4 files changed

+25
-3
lines changed

.travis.yml

+15
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ matrix:
1717
- env: TOXENV=py36-django30-drfmaster
1818
- env: TOXENV=py37-django30-drfmaster
1919
- env: TOXENV=py38-django30-drfmaster
20+
- env: TOXENV=py36-django31-drfmaster
21+
- env: TOXENV=py37-django31-drfmaster
22+
- env: TOXENV=py38-django31-drfmaster
2023

2124
include:
2225
- python: 3.6
@@ -65,6 +68,10 @@ matrix:
6568
env: TOXENV=py36-django30-drf311
6669
- python: 3.6
6770
env: TOXENV=py36-django30-drfmaster
71+
- python: 3.6
72+
env: TOXENV=py36-django31-drf311
73+
- python: 3.6
74+
env: TOXENV=py36-django31-drfmaster
6875

6976
- python: 3.7
7077
env: TOXENV=py37-django21-drf310
@@ -82,6 +89,10 @@ matrix:
8289
env: TOXENV=py37-django30-drf311
8390
- python: 3.7
8491
env: TOXENV=py37-django30-drfmaster
92+
- python: 3.7
93+
env: TOXENV=py37-django31-drf311
94+
- python: 3.7
95+
env: TOXENV=py37-django31-drfmaster
8596

8697
- python: 3.8
8798
env: TOXENV=py38-django22-drf311
@@ -91,6 +102,10 @@ matrix:
91102
env: TOXENV=py38-django30-drf311
92103
- python: 3.8
93104
env: TOXENV=py38-django30-drfmaster
105+
- python: 3.8
106+
env: TOXENV=py38-django31-drf311
107+
- python: 3.8
108+
env: TOXENV=py38-django31-drfmaster
94109

95110
install:
96111
- pip install tox

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
Note that in line with [Django REST Framework policy](http://www.django-rest-framework.org/topics/release-notes/),
99
any parts of the framework not mentioned in the documentation should generally be considered private API, and may be subject to change.
1010

11+
## [Unreleased]
12+
13+
### Added
14+
* Added support for Django 3.1
15+
1116
## [3.2.0] - 2020-08-26
1217

1318
### Added

setup.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,15 @@ def get_package_data(package):
8484
'Programming Language :: Python :: 3.5',
8585
'Programming Language :: Python :: 3.6',
8686
'Programming Language :: Python :: 3.7',
87+
'Programming Language :: Python :: 3.8',
8788
'Topic :: Internet :: WWW/HTTP',
8889
'Topic :: Software Development :: Libraries :: Application Frameworks',
8990
'Topic :: Software Development :: Libraries :: Python Modules',
9091
],
9192
install_requires=[
9293
'inflection>=0.3.0',
93-
'djangorestframework>=3.10,<3.12',
94-
'django>=1.11,<3.1',
94+
'djangorestframework>=3.10,<3.13',
95+
'django>=1.11,<3.2',
9596
],
9697
extras_require={
9798
'django-polymorphic': ['django-polymorphic>=2.0'],

tox.ini

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ envlist =
33
py{35,36}-django{111}-drf{310,311,master},
44
py{35,36,37}-django{21,22}-drf{310,311,master},
55
py38-django22-drf{311,master},
6-
py{36,37,38}-django{30}-drf{311,master},
6+
py{36,37,38}-django{30,31}-drf{311,master},
77
lint,docs
88

99
[testenv]
@@ -12,6 +12,7 @@ deps =
1212
django21: Django>=2.1,<2.2
1313
django22: Django>=2.2,<2.3
1414
django30: Django>=3.0,<3.1
15+
django31: Django>=3.1,<3.2
1516
drf310: djangorestframework>=3.10.2,<3.11
1617
drf311: djangorestframework>=3.11,<3.12
1718
drfmaster: https://github.com/encode/django-rest-framework/archive/master.zip

0 commit comments

Comments
 (0)