Skip to content

Commit 46551a9

Browse files
authored
Added Django support for version 4.1. (#1077)
1 parent db5cf1c commit 46551a9

File tree

8 files changed

+25
-18
lines changed

8 files changed

+25
-18
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ any parts of the framework not mentioned in the documentation should generally b
1515
* Fixed invalid relationship pointer in error objects when field naming formatting is used.
1616
* Properly resolved related resource type when nested source field is defined.
1717

18+
### Added
19+
20+
* Added support for Django 4.1.
21+
1822
### Removed
1923

2024
* Removed support for Django 2.2.

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Requirements
8989
------------
9090

9191
1. Python (3.7, 3.8, 3.9, 3.10)
92-
2. Django (3.2, 4.0)
92+
2. Django (3.2, 4.0, 4.1)
9393
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.

docs/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ like the following:
5252
## Requirements
5353

5454
1. Python (3.7, 3.8, 3.9, 3.10)
55-
2. Django (3.2, 4.0)
55+
2. Django (3.2, 4.0, 4.1)
5656
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.

example/tests/unit/test_default_drf_serializers.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,26 +44,26 @@ class DummyTestViewSet(viewsets.ModelViewSet):
4444
serializer_class = DummyTestSerializer
4545

4646

47-
def render_dummy_test_serialized_view(view_class):
48-
serializer = DummyTestSerializer(instance=Entry())
47+
def render_dummy_test_serialized_view(view_class, entry):
48+
serializer = DummyTestSerializer(instance=entry)
4949
renderer = JSONRenderer()
5050
return renderer.render(serializer.data, renderer_context={"view": view_class()})
5151

5252

5353
# tests
54-
def test_simple_reverse_relation_included_renderer():
54+
def test_simple_reverse_relation_included_renderer(db, entry):
5555
"""
5656
Test renderer when a single reverse fk relation is passed.
5757
"""
58-
rendered = render_dummy_test_serialized_view(DummyTestViewSet)
58+
rendered = render_dummy_test_serialized_view(DummyTestViewSet, entry)
5959

6060
assert rendered
6161

6262

63-
def test_render_format_field_names(settings):
63+
def test_render_format_field_names(db, settings, entry):
6464
"""Test that json field is kept untouched."""
6565
settings.JSON_API_FORMAT_FIELD_NAMES = "dasherize"
66-
rendered = render_dummy_test_serialized_view(DummyTestViewSet)
66+
rendered = render_dummy_test_serialized_view(DummyTestViewSet, entry)
6767

6868
result = json.loads(rendered.decode())
6969
assert result["data"]["attributes"]["json-field"] == {"JsonKey": "JsonValue"}

example/tests/unit/test_renderers.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,25 +88,25 @@ def render_dummy_test_serialized_view(view_class, instance):
8888
return renderer.render(serializer.data, renderer_context={"view": view_class()})
8989

9090

91-
def test_simple_reverse_relation_included_renderer():
91+
def test_simple_reverse_relation_included_renderer(db, entry):
9292
"""
9393
Test renderer when a single reverse fk relation is passed.
9494
"""
95-
rendered = render_dummy_test_serialized_view(DummyTestViewSet, Entry())
95+
rendered = render_dummy_test_serialized_view(DummyTestViewSet, entry)
9696

9797
assert rendered
9898

9999

100-
def test_simple_reverse_relation_included_read_only_viewset():
101-
rendered = render_dummy_test_serialized_view(ReadOnlyDummyTestViewSet, Entry())
100+
def test_simple_reverse_relation_included_read_only_viewset(db, entry):
101+
rendered = render_dummy_test_serialized_view(ReadOnlyDummyTestViewSet, entry)
102102

103103
assert rendered
104104

105105

106-
def test_render_format_field_names(settings):
106+
def test_render_format_field_names(db, entry, settings):
107107
"""Test that json field is kept untouched."""
108108
settings.JSON_API_FORMAT_FIELD_NAMES = "dasherize"
109-
rendered = render_dummy_test_serialized_view(DummyTestViewSet, Entry())
109+
rendered = render_dummy_test_serialized_view(DummyTestViewSet, entry)
110110

111111
result = json.loads(rendered.decode())
112112
assert result["data"]["attributes"]["json-field"] == {"JsonKey": "JsonValue"}

setup.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ DJANGO_SETTINGS_MODULE=example.settings.test
5858
filterwarnings =
5959
error::DeprecationWarning
6060
error::PendingDeprecationWarning
61+
# Remove when DRF is not depending on it anymore
62+
ignore:The django.utils.timezone.utc alias is deprecated.
6163
testpaths =
6264
example
6365
tests

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def get_package_data(package):
9797
install_requires=[
9898
"inflection>=0.5.0",
9999
"djangorestframework>=3.12,<3.14",
100-
"django>=3.2,<4.1",
100+
"django>=3.2,<4.2",
101101
],
102102
extras_require={
103103
"django-polymorphic": ["django-polymorphic>=3.0"],

tox.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
[tox]
22
envlist =
33
py{37,38,39,310}-django32-drf{312,313,master},
4-
py{38,39,310}-django40-drf{313,master},
4+
py{38,39,310}-django{40,41}-drf{313,master},
55
lint,docs
66

77
[testenv]
88
deps =
99
django32: Django>=3.2,<3.3
10-
django40: Django>=4.0,<5.0
10+
django40: Django>=4.0,<4.1
11+
django41: Django>=4.1,<4.2
1112
drf312: djangorestframework>=3.12,<3.13
1213
drf313: djangorestframework>=3.13,<3.14
1314
drfmaster: https://github.com/encode/django-rest-framework/archive/master.zip
@@ -44,5 +45,5 @@ deps =
4445
commands =
4546
sphinx-build -W -b html -d docs/_build/doctrees docs docs/_build/html
4647

47-
[testenv:py{37,38,39,310}-django{32,40}-drfmaster]
48+
[testenv:py{37,38,39,310}-django{32,40,41}-drfmaster]
4849
ignore_outcome = true

0 commit comments

Comments
 (0)