Skip to content

Commit fb8f6c4

Browse files
authored
Added support for Django REST framework 3.13 (#1029)
1 parent 0c179d7 commit fb8f6c4

File tree

7 files changed

+11
-14
lines changed

7 files changed

+11
-14
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ any parts of the framework not mentioned in the documentation should generally b
1010

1111
## [Unreleased]
1212

13+
### Added
14+
15+
* Added support for Django REST framework 3.13.
16+
1317
### Changed
1418

1519
* Adjusted to only use f-strings for slight performance improvement.

README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Requirements
9090

9191
1. Python (3.6, 3.7, 3.8, 3.9, 3.10)
9292
2. Django (2.2, 3.2, 4.0)
93-
3. Django REST framework (3.12)
93+
3. Django REST framework (3.12, 3.13)
9494

9595
We **highly** recommend and only officially support the latest patch release of each Python, Django and REST framework series.
9696

docs/getting-started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ like the following:
5353

5454
1. Python (3.6, 3.7, 3.8, 3.9, 3.10)
5555
2. Django (2.2, 3.2, 4.0)
56-
3. Django REST framework (3.12)
56+
3. Django REST framework (3.12, 3.13)
5757

5858
We **highly** recommend and only officially support the latest patch release of each Python, Django and REST framework series.
5959

requirements/requirements-testing.txt

-5
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,3 @@ pytest-cov==3.0.0
66
pytest-django==4.5.1
77
pytest-factoryboy==2.1.0
88
syrupy==1.5.0
9-
# TODO remove pytz dep again once DRF higher than 3.12.4 is released
10-
# Django 4.0 removed dependency on pytz and made it optional but
11-
# DRF requires it and will define it as dependency in future versions
12-
# only adding this to testing though as DJA does not directly use pytz
13-
pytz==2021.3

setup.cfg

-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ DJANGO_SETTINGS_MODULE=example.settings.test
5858
filterwarnings =
5959
error::DeprecationWarning
6060
error::PendingDeprecationWarning
61-
# TODO remove again once DRF higher than 3.12.4 has been released
62-
ignore:'rest_framework' defines default_app_config
6361
# TODO remove in next major version of DJA 5.0.0
6462
# this deprecation warning filter needs to be added as AuthorSerializer is used in
6563
# too many tests which introduced the type field name in tests

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def get_package_data(package):
9797
],
9898
install_requires=[
9999
"inflection>=0.3.0",
100-
"djangorestframework>=3.12,<3.13",
100+
"djangorestframework>=3.12,<3.14",
101101
"django>=2.2,<4.1",
102102
],
103103
extras_require={

tox.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
[tox]
22
envlist =
3-
py{36,37,38,39}-django{22,32}-drf{312,master},
4-
py{38,39}-django40-drf{312,master},
5-
py310-django{32,40}-drf{312,master},
3+
py{36,37,38,39,310}-django{22,32}-drf{312,313,master},
4+
py{38,39,310}-django40-drf{313,master},
65
lint,docs
76

87
[testenv]
@@ -11,6 +10,7 @@ deps =
1110
django32: Django>=3.2,<3.3
1211
django40: Django>=4.0,<5.0
1312
drf312: djangorestframework>=3.12,<3.13
13+
drf313: djangorestframework>=3.13,<3.14
1414
drfmaster: https://github.com/encode/django-rest-framework/archive/master.zip
1515
-rrequirements/requirements-testing.txt
1616
-rrequirements/requirements-optionals.txt
@@ -45,5 +45,5 @@ deps =
4545
commands =
4646
sphinx-build -W -b html -d docs/_build/doctrees docs docs/_build/html
4747

48-
[testenv:py{36,37,38,39,310}-django{22,32}-drfmaster]
48+
[testenv:py{36,37,38,39,310}-django{22,32,40}-drfmaster]
4949
ignore_outcome = true

0 commit comments

Comments
 (0)