From d9bba15b7f2f9cb1b89eccbf18a0996a0566d1f1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 4 Mar 2024 18:06:03 +0400 Subject: [PATCH 1/9] Update black from 23.12.1 to 24.2.0 --- requirements/requirements-codestyle.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements-codestyle.txt b/requirements/requirements-codestyle.txt index 656f8aab..a3b5c237 100644 --- a/requirements/requirements-codestyle.txt +++ b/requirements/requirements-codestyle.txt @@ -1,4 +1,4 @@ -black==23.12.1 +black==24.2.0 flake8==7.0.0 flake8-bugbear==23.12.2 flake8-isort==6.1.1 From bb57103692982d02959b561e619e6209b201ad25 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 4 Mar 2024 18:06:03 +0400 Subject: [PATCH 2/9] Update flake8-bugbear from 23.12.2 to 24.2.6 --- requirements/requirements-codestyle.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements-codestyle.txt b/requirements/requirements-codestyle.txt index a3b5c237..df3e0608 100644 --- a/requirements/requirements-codestyle.txt +++ b/requirements/requirements-codestyle.txt @@ -1,5 +1,5 @@ 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 From 1d05589384d1ef573726b66ae0f850233d99128a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 4 Mar 2024 18:06:03 +0400 Subject: [PATCH 3/9] Update twine from 4.0.2 to 5.0.0 --- requirements/requirements-packaging.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements-packaging.txt b/requirements/requirements-packaging.txt index eb2532c4..489eeb83 100644 --- a/requirements/requirements-packaging.txt +++ b/requirements/requirements-packaging.txt @@ -1 +1 @@ -twine==4.0.2 +twine==5.0.0 From c8febf56aeb63acacec63f1f9a32f15f0db17a92 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 4 Mar 2024 18:06:04 +0400 Subject: [PATCH 4/9] Update faker from 22.2.0 to 23.3.0 --- requirements/requirements-testing.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt index b4595383..ef10ce0b 100644 --- a/requirements/requirements-testing.txt +++ b/requirements/requirements-testing.txt @@ -1,5 +1,5 @@ factory-boy==3.3.0 -Faker==22.2.0 +Faker==23.3.0 pytest==7.4.4 pytest-cov==4.1.0 pytest-django==4.7.0 From 06610129c7f0e93fe860a742b3b592348035b408 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 4 Mar 2024 18:06:04 +0400 Subject: [PATCH 5/9] Update pytest from 7.4.4 to 8.1.0 --- requirements/requirements-testing.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt index ef10ce0b..02f7def6 100644 --- a/requirements/requirements-testing.txt +++ b/requirements/requirements-testing.txt @@ -1,6 +1,6 @@ factory-boy==3.3.0 Faker==23.3.0 -pytest==7.4.4 +pytest==8.1.0 pytest-cov==4.1.0 pytest-django==4.7.0 pytest-factoryboy==2.6.0 From b0d2c45ed47bcbdcf2ecf0dd1f21d5f857925190 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 4 Mar 2024 18:06:04 +0400 Subject: [PATCH 6/9] Update pytest-django from 4.7.0 to 4.8.0 --- requirements/requirements-testing.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt index 02f7def6..a8d4abf0 100644 --- a/requirements/requirements-testing.txt +++ b/requirements/requirements-testing.txt @@ -2,6 +2,6 @@ factory-boy==3.3.0 Faker==23.3.0 pytest==8.1.0 pytest-cov==4.1.0 -pytest-django==4.7.0 +pytest-django==4.8.0 pytest-factoryboy==2.6.0 syrupy==4.6.0 From 81c7a0536524a2d43328a401ae65419a3930d870 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 4 Mar 2024 18:06:05 +0400 Subject: [PATCH 7/9] Update syrupy from 4.6.0 to 4.6.1 --- requirements/requirements-testing.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt index a8d4abf0..74e84d28 100644 --- a/requirements/requirements-testing.txt +++ b/requirements/requirements-testing.txt @@ -4,4 +4,4 @@ pytest==8.1.0 pytest-cov==4.1.0 pytest-django==4.8.0 pytest-factoryboy==2.6.0 -syrupy==4.6.0 +syrupy==4.6.1 From 0207295a3557852f4ae0f9b249fd4cf6c9395c94 Mon Sep 17 00:00:00 2001 From: Oliver Sauder Date: Tue, 5 Mar 2024 10:09:37 +0400 Subject: [PATCH 8/9] Rerun black --- example/tests/test_sideload_resources.py | 1 + rest_framework_json_api/parsers.py | 1 + rest_framework_json_api/relations.py | 6 +++--- rest_framework_json_api/renderers.py | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/example/tests/test_sideload_resources.py b/example/tests/test_sideload_resources.py index 5ca96afe..51bfb841 100644 --- a/example/tests/test_sideload_resources.py +++ b/example/tests/test_sideload_resources.py @@ -1,6 +1,7 @@ """ Test sideloading resources """ + import json from django.urls import reverse diff --git a/rest_framework_json_api/parsers.py b/rest_framework_json_api/parsers.py index e26f6028..a0a2aeb2 100644 --- a/rest_framework_json_api/parsers.py +++ b/rest_framework_json_api/parsers.py @@ -1,6 +1,7 @@ """ Parsers """ + from rest_framework import parsers from rest_framework.exceptions import ParseError diff --git a/rest_framework_json_api/relations.py b/rest_framework_json_api/relations.py index 32547253..0742c1ec 100644 --- a/rest_framework_json_api/relations.py +++ b/rest_framework_json_api/relations.py @@ -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 diff --git a/rest_framework_json_api/renderers.py b/rest_framework_json_api/renderers.py index 0664f73a..639f0b11 100644 --- a/rest_framework_json_api/renderers.py +++ b/rest_framework_json_api/renderers.py @@ -1,6 +1,7 @@ """ Renderers """ + import copy from collections import defaultdict from collections.abc import Iterable From e445a1d4a6c446163e0e7e392537545d239c2c57 Mon Sep 17 00:00:00 2001 From: Oliver Sauder Date: Tue, 5 Mar 2024 10:28:59 +0400 Subject: [PATCH 9/9] Updated pytest-factoryboy to work with newest pytest --- requirements/requirements-testing.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt index 74e84d28..b15dd948 100644 --- a/requirements/requirements-testing.txt +++ b/requirements/requirements-testing.txt @@ -3,5 +3,5 @@ Faker==23.3.0 pytest==8.1.0 pytest-cov==4.1.0 pytest-django==4.8.0 -pytest-factoryboy==2.6.0 +pytest-factoryboy==2.6.1 syrupy==4.6.1