django-json-api · sliverc · Feb 21, 2023 · Feb 20, 2023 · Feb 20, 2023 · Feb 20, 2023
diff --git a/example/migrations/0001_initial.py b/example/migrations/0001_initial.py
@@ -3,7 +3,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

diff --git a/example/migrations/0002_taggeditem.py b/example/migrations/0002_taggeditem.py
@@ -3,7 +3,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("contenttypes", "0002_remove_content_type_name"),
         ("example", "0001_initial"),

diff --git a/example/migrations/0003_polymorphics.py b/example/migrations/0003_polymorphics.py
@@ -3,7 +3,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("contenttypes", "0002_remove_content_type_name"),
         ("example", "0002_taggeditem"),

diff --git a/example/migrations/0004_auto_20171011_0631.py b/example/migrations/0004_auto_20171011_0631.py
@@ -3,7 +3,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("example", "0003_polymorphics"),
     ]

diff --git a/example/migrations/0005_auto_20180922_1508.py b/example/migrations/0005_auto_20180922_1508.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("example", "0004_auto_20171011_0631"),
     ]

diff --git a/example/migrations/0006_auto_20181228_0752.py b/example/migrations/0006_auto_20181228_0752.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("example", "0005_auto_20180922_1508"),
     ]

diff --git a/example/migrations/0007_artproject_description.py b/example/migrations/0007_artproject_description.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("example", "0006_auto_20181228_0752"),
     ]

diff --git a/example/migrations/0008_labresults.py b/example/migrations/0008_labresults.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("example", "0007_artproject_description"),
     ]

diff --git a/example/migrations/0009_labresults_author.py b/example/migrations/0009_labresults_author.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("example", "0008_labresults"),
     ]

diff --git a/example/migrations/0010_auto_20210714_0809.py b/example/migrations/0010_auto_20210714_0809.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("example", "0009_labresults_author"),
     ]

diff --git a/example/migrations/0011_rename_type_author_author_type_and_more.py b/example/migrations/0011_rename_type_author_author_type_and_more.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("contenttypes", "0002_remove_content_type_name"),
         ("example", "0010_auto_20210714_0809"),

diff --git a/example/migrations/0012_author_full_name.py b/example/migrations/0012_author_full_name.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("example", "0011_rename_type_author_author_type_and_more"),
     ]

diff --git a/example/serializers.py b/example/serializers.py
@@ -181,7 +181,6 @@ class JSONAPIMeta:
 
 
 class EntryDRFSerializers(drf_serilazers.ModelSerializer):
-
     tags = TaggedItemDRFSerializer(many=True, read_only=True)
     url = drf_serilazers.HyperlinkedIdentityField(
         view_name="drf-entry-blog-detail",

diff --git a/example/tests/conftest.py b/example/tests/conftest.py
@@ -31,7 +31,6 @@
 
 @pytest.fixture
 def single_entry(blog, author, entry_factory, comment_factory, tagged_item_factory):
-
     entry = entry_factory(blog=blog, authors=(author,))
     comment_factory(entry=entry)
     tagged_item_factory(content_object=entry)
@@ -40,7 +39,6 @@ def single_entry(blog, author, entry_factory, comment_factory, tagged_item_facto
 
 @pytest.fixture
 def multiple_entries(blog_factory, author_factory, entry_factory, comment_factory):
-
     entries = [
         entry_factory(blog=blog_factory(), authors=(author_factory(),)),
         entry_factory(blog=blog_factory(), authors=(author_factory(),)),

diff --git a/example/tests/integration/test_meta.py b/example/tests/integration/test_meta.py
@@ -7,7 +7,6 @@
 
 
 def test_top_level_meta_for_list_view(blog, client):
-
     expected = {
         "data": [
             {
@@ -37,7 +36,6 @@ def test_top_level_meta_for_list_view(blog, client):
 
 
 def test_top_level_meta_for_detail_view(blog, client):
-
     expected = {
         "data": {
             "type": "blogs",

diff --git a/example/tests/integration/test_model_resource_name.py b/example/tests/integration/test_model_resource_name.py
@@ -50,7 +50,6 @@ def _check_relationship_and_included_comment_type_are_the_same(django_client, ur
 
 @pytest.mark.usefixtures("single_entry")
 class TestModelResourceName:
-
     create_data = {
         "data": {
             "type": "resource_name_from_JSONAPIMeta",
@@ -147,7 +146,6 @@ def teardown_method(self, method):
 
 @pytest.mark.usefixtures("single_entry")
 class TestResourceNameConsistency:
-
     # Included rename tests
     def test_type_match_on_included_and_inline_base(self, client):
         _check_relationship_and_included_comment_type_are_the_same(

diff --git a/example/tests/integration/test_non_paginated_responses.py b/example/tests/integration/test_non_paginated_responses.py
@@ -11,7 +11,6 @@
     new=lambda s: [],
 )
 def test_multiple_entries_no_pagination(multiple_entries, client):
-
     expected = {
         "data": [
             {

diff --git a/example/tests/integration/test_pagination.py b/example/tests/integration/test_pagination.py
@@ -11,7 +11,6 @@
     new=lambda s: [],
 )
 def test_pagination_with_single_entry(single_entry, client):
-
     expected = {
         "data": [
             {

diff --git a/example/tests/unit/test_default_drf_serializers.py b/example/tests/unit/test_default_drf_serializers.py
@@ -71,7 +71,6 @@ def test_render_format_field_names(db, settings, entry):
 
 @pytest.mark.django_db
 def test_blog_create(client):
-
     url = reverse("drf-entry-blog-list")
     name = "Dummy Name"
 
@@ -107,7 +106,6 @@ def test_blog_create(client):
 
 @pytest.mark.django_db
 def test_get_object_gives_correct_blog(client, blog, entry):
-
     url = reverse("drf-entry-blog-detail", kwargs={"entry_pk": entry.id})
     resp = client.get(url)
     expected = {
@@ -126,7 +124,6 @@ def test_get_object_gives_correct_blog(client, blog, entry):
 
 @pytest.mark.django_db
 def test_get_object_patches_correct_blog(client, blog, entry):
-
     url = reverse("drf-entry-blog-detail", kwargs={"entry_pk": entry.id})
     new_name = blog.name + " update"
     assert not new_name == blog.name
@@ -163,7 +160,6 @@ def test_get_object_patches_correct_blog(client, blog, entry):
 
 @pytest.mark.django_db
 def test_get_object_deletes_correct_blog(client, entry):
-
     url = reverse("drf-entry-blog-detail", kwargs={"entry_pk": entry.id})
 
     resp = client.delete(url)

diff --git a/requirements/requirements-codestyle.txt b/requirements/requirements-codestyle.txt
@@ -1,5 +1,5 @@
-black==22.12.0
+black==23.1.0
 flake8==6.0.0
-flake8-bugbear==23.1.14
+flake8-bugbear==23.2.13
 flake8-isort==6.0.0
-isort==5.11.4
+isort==5.12.0
diff --git a/requirements/requirements-documentation.txt b/requirements/requirements-documentation.txt
@@ -1,3 +1,3 @@
 recommonmark==0.7.1
-Sphinx==5.3.0
-sphinx_rtd_theme==1.1.1
+Sphinx==6.1.3
+sphinx_rtd_theme==1.2.0
diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt
@@ -1,5 +1,5 @@
 factory-boy==3.2.1
-Faker==16.4.0
+Faker==17.0.0
 pytest==7.2.1
 pytest-cov==4.0.0
 pytest-django==4.5.2

diff --git a/rest_framework_json_api/renderers.py b/rest_framework_json_api/renderers.py
@@ -499,7 +499,6 @@ def render_errors(self, data, accepted_media_type=None, renderer_context=None):
         )
 
     def render(self, data, accepted_media_type=None, renderer_context=None):
-
         renderer_context = renderer_context or {}
 
         view = renderer_context.get("view", None)
@@ -545,7 +544,6 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
         included_resources = utils.get_included_resources(request, serializer)
 
         if serializer is not None:
-
             # Extract root meta for any type of serializer
             json_api_meta.update(self.extract_root_meta(serializer, serializer_data))
 

diff --git a/rest_framework_json_api/schemas/openapi.py b/rest_framework_json_api/schemas/openapi.py
@@ -298,9 +298,8 @@ def get_schema(self, request=None, public=False):
                 if components_schemas[k] == components[k]:
                     continue
                 warnings.warn(
-                    'Schema component "{}" has been overriden with a different value.'.format(
-                        k
-                    )
+                    f'Schema component "{k}" has been overriden with a different value.',
+                    stacklevel=1,
                 )
 
             components_schemas.update(components)

diff --git a/rest_framework_json_api/utils.py b/rest_framework_json_api/utils.py
@@ -415,7 +415,6 @@ def format_drf_errors(response, context, exc):
 def format_error_object(message, pointer, response):
     errors = []
     if isinstance(message, dict):
-
         # as there is no required field in error object we check that all fields are string
         # except links, source or meta which might be a dict
         is_custom_error = all(

diff --git a/rest_framework_json_api/views.py b/rest_framework_json_api/views.py
@@ -66,7 +66,6 @@ def get_queryset(self, *args, **kwargs):
             self.request, self.get_serializer_class()
         )
         for included in included_resources + ["__all__"]:
-
             select_related = self.get_select_related(included)
             if select_related is not None:
                 qs = qs.select_related(*select_related)
@@ -110,7 +109,6 @@ def get_queryset(self, *args, **kwargs):
                 if level == levels[-1]:
                     included_model = field
                 else:
-
                     if issubclass(field_class, ReverseOneToOneDescriptor):
                         model_field = field.related.field
                     else:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,7 +3,6 @@


		class Migration(migrations.Migration):

		initial = True

		dependencies = []
Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ @@
     class Migration(migrations.Migration):
         dependencies = [
             ("example", "0003_polymorphics"),
         ]
@@ Expand Down @@