Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions example/tests/test_sideload_resources.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Test sideloading resources
"""

import json

from django.urls import reverse
Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements-codestyle.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
black==23.12.1
black==24.2.0
flake8==7.0.0
flake8-bugbear==23.12.2
flake8-bugbear==24.2.6
flake8-isort==6.1.1
isort==5.13.2
2 changes: 1 addition & 1 deletion requirements/requirements-packaging.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
twine==4.0.2
twine==5.0.0
10 changes: 5 additions & 5 deletions requirements/requirements-testing.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
factory-boy==3.3.0
Faker==22.2.0
pytest==7.4.4
Faker==23.3.0
pytest==8.1.0
pytest-cov==4.1.0
pytest-django==4.7.0
pytest-factoryboy==2.6.0
syrupy==4.6.0
pytest-django==4.8.0
pytest-factoryboy==2.6.1
syrupy==4.6.1
1 change: 1 addition & 0 deletions rest_framework_json_api/parsers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Parsers
"""

from rest_framework import parsers
from rest_framework.exceptions import ParseError

Expand Down
6 changes: 3 additions & 3 deletions rest_framework_json_api/relations.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ def get_links(self, obj=None, lookup_field="pk"):
return_data = {}

kwargs = {
lookup_field: getattr(obj, lookup_field)
if obj
else view.kwargs[lookup_field]
lookup_field: (
getattr(obj, lookup_field) if obj else view.kwargs[lookup_field]
)
}

field_name = self.field_name if self.field_name else self.parent.field_name
Expand Down
1 change: 1 addition & 0 deletions rest_framework_json_api/renderers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Renderers
"""

import copy
from collections import defaultdict
from collections.abc import Iterable
Expand Down