Merge branch 'main' into order

Author: sliverc

.readthedocs.yaml

@@ -0,0 +1,13 @@
+version: 2
+
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "3.8"
+
+sphinx:
+  configuration: docs/conf.py
+
+python:
+  install:
+    - requirements: docs/requirements.txt

CHANGELOG.md

@@ -17,6 +17,7 @@ any parts of the framework not mentioned in the documentation should generally b
 ### Changed
 
 * Added support to overwrite serializer methods in customized schema class
+* Adjusted some still old formatted strings to f-strings.
 
 ### Fixed
 

docs/conf.py

@@ -61,7 +61,7 @@
 # General information about the project.
 project = "Django REST framework JSON:API"
 year = datetime.date.today().year
-copyright = "{}, Django REST framework JSON:API contributors".format(year)
+copyright = f"{year}, Django REST framework JSON:API contributors"
 author = "Django REST framework JSON:API contributors"
 
 # The version info for the project you're documenting, acts as replacement for

rest_framework_json_api/django_filters/backends.py

@@ -142,5 +142,5 @@ def get_schema_operation_parameters(self, view):
         for res in result:
             if "name" in res:
                 name = format_field_name(res["name"].replace("__", "."))
-                res["name"] = "filter[{}]".format(name)
+                res["name"] = f"filter[{name}]"
         return result

rest_framework_json_api/renderers.py

@@ -160,7 +160,7 @@ def extract_relationships(cls, fields, resource, resource_instance):
                 (relations.PrimaryKeyRelatedField, relations.HyperlinkedRelatedField),
             ):
                 resolved, relation = utils.get_relation_instance(
-                    resource_instance, "%s_id" % source, field.parent
+                    resource_instance, f"{source}_id", field.parent
                 )
                 if not resolved:
                     continue
@@ -327,7 +327,7 @@ def extract_included(
                 serializer_data = field.data
 
             new_included_resources = [
-                key.replace("%s." % field_name, "", 1)
+                key.replace(f"{field_name}.", "", 1)
                 for key in included_resources
                 if field_name == key.split(".")[0]
             ]

rest_framework_json_api/settings.py

@@ -30,7 +30,7 @@ def __init__(self, user_settings=settings, defaults=DEFAULTS):
 
     def __getattr__(self, attr):
         if attr not in self.defaults:
-            raise AttributeError("Invalid JSON:API setting: '%s'" % attr)
+            raise AttributeError(f"Invalid JSON:API setting: '{attr}'")
 
         value = getattr(
             self.user_settings, JSON_API_SETTINGS_PREFIX + attr, self.defaults[attr]

rest_framework_json_api/utils.py

@@ -264,7 +264,7 @@ def get_related_resource_type(relation):
         if hasattr(relation, "child_relation"):
             return get_related_resource_type(relation.child_relation)
         raise APIException(
-            _("Could not resolve resource type for relation %s" % relation)
+            _(f"Could not resolve resource type for relation {relation}")
         )
 
     return get_resource_type_from_model(relation_model)