Merge branch 'main' into fix-1126-serialize-missing-pk

Author: axieum

.readthedocs.yaml

@@ -0,0 +1,16 @@
+version: 2
+
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "3.8"
+
+sphinx:
+  configuration: docs/conf.py
+
+python:
+  install:
+    - requirements: requirements/requirements-optionals.txt
+    - requirements: requirements/requirements-documentation.txt
+    - method: pip
+      path: .

AUTHORS

@@ -3,6 +3,7 @@ Adam Ziolkowski <[email protected]>
 Alan Crosswell <[email protected]>
 Alex Seidmann <[email protected]>
 Anton Shutik <[email protected]>
+Arttu Perälä <[email protected]>
 Ashley Loewen <[email protected]>
 Asif Saif Uddin <[email protected]>
 Beni Keller <[email protected]>

CHANGELOG.md

@@ -17,10 +17,13 @@ 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.
+* Replaced `OrderedDict` with `dict` which is also ordered since Python 3.7.
 
 ### Fixed
 
 * Refactored handling of the `sort` query parameter to fix duplicate declaration in the generated schema definition
+* Non-field serializer errors are given a source.pointer value of "/data".
 * Serialization of non-model `Serializer` results, e.g. `dict` without a `pk` attribute
 
 ## [6.0.0] - 2022-09-24

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

docs/requirements.txt

@@ -23,6 +23,13 @@ def validate_last_name(self, data):
             )
         return data
 
+    def validate(self, data):
+        if data["first_name"] == data["last_name"]:
+            raise serializers.ValidationError(
+                "First name cannot be the same as last name!"
+            )
+        return data
+
     class Meta:
         model = auth_models.User
         fields = (

example/api/serializers/identity.py

@@ -3,7 +3,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

example/migrations/0001_initial.py

@@ -3,7 +3,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("contenttypes", "0002_remove_content_type_name"),
         ("example", "0001_initial"),

example/migrations/0002_taggeditem.py

@@ -3,7 +3,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("contenttypes", "0002_remove_content_type_name"),
         ("example", "0002_taggeditem"),

example/migrations/0003_polymorphics.py

@@ -3,7 +3,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("example", "0003_polymorphics"),
     ]

example/migrations/0004_auto_20171011_0631.py

@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("example", "0004_auto_20171011_0631"),
     ]

example/migrations/0005_auto_20180922_1508.py

@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("example", "0005_auto_20180922_1508"),
     ]

example/migrations/0006_auto_20181228_0752.py

@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("example", "0006_auto_20181228_0752"),
     ]

example/migrations/0007_artproject_description.py

@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("example", "0007_artproject_description"),
     ]

example/migrations/0008_labresults.py

@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("example", "0008_labresults"),
     ]

example/migrations/0009_labresults_author.py

@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("example", "0009_labresults_author"),
     ]

example/migrations/0010_auto_20210714_0809.py

@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("contenttypes", "0002_remove_content_type_name"),
         ("example", "0010_auto_20210714_0809"),

example/migrations/0011_rename_type_author_author_type_and_more.py

@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("example", "0011_rename_type_author_author_type_and_more"),
     ]

example/migrations/0012_author_full_name.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",