Skip to content

Commit cae4040

Browse files
authored
Merge pull request #420 from peopledoc/add-drf-3.11-support
Add/Confirm support of Django REST Framework 3.11
2 parents 8fd37ec + 2d99cbd commit cae4040

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

CHANGELOG.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ master (unreleased)
66
==================
77

88
- Added a tox job target to create a Django model graph using `dot`. Run `tox -e django_graph` to see the result. Since the database schema doesn't change that often, this tox target won't be associated with automated tests or doc generation - it's probably going to be a one-shot.
9+
- Add/Confirm support of Django REST Framework 3.11 (#417).
910

1011
Release 7.0.0 (2021-03-11)
1112
==========================

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Warnings
1515

1616
* Python Compatibility : 3.6, 3.7, 3.8
1717
* Django compatibility : Django 2.2.
18-
* Django REST Framework : Compatible from the version 3.9.x to 3.10.x
18+
* Django REST Framework : Compatible from the version 3.9.x to 3.11.x
1919

2020
See the `Deprecation timeline <http://django-formidable.readthedocs.io/en/latest/deprecations.html>`_ document for more information on deprecated versions.
2121

docs/source/deprecations.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
Deprecation timeline
33
====================
44

5+
From 7.0.0 to x.y.z
6+
===================
7+
8+
Django REST Framework versions
9+
------------------------------
10+
11+
.. versionadded:: x.y.z
12+
13+
Add/Confirm support of Django REST Framework 3.11
14+
515
From 6.1.0 to 7.0.0
616
===================
717

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-
django22-py{36,37,38}-drf{39,310}-{sqlite,pg}
3+
django22-py{36,37,38}-drf{39,310,311}-{sqlite,pg}
44
spectest
55
flake8
66
isort-check
@@ -17,6 +17,7 @@ deps =
1717
; DRF versions
1818
drf39: djangorestframework<3.10
1919
drf310: djangorestframework<3.11
20+
drf311: djangorestframework<3.12
2021
; When testing with postgresql
2122
pg: psycopg2-binary
2223

0 commit comments

Comments
 (0)