Merge remote-tracking branch 'origin/development' into development

# Conflicts:
#	poetry.lock

Author: timsavage

.github/workflows/tests.yml

@@ -30,7 +30,6 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip poetry
-        python -m pip wheel --use-pep517 "pyyaml (==6.0)"
         poetry install --all-extras --no-root
 
     - name: Test with pytest

HISTORY

@@ -1,9 +1,12 @@
-2.10rc1
-=======
+2.10
+====
 
 Changes
 -------
 
+- Remove simplejson as a fallback. Is no longer required with Python 3.8 plus and
+  has worse performance that the builtin json module.
+
 - Simplify the internals of the Resource metaclass to make it easier to understand
   and maintain. Greater sharing of code between Resource and AnnotatedResource
 
@@ -19,6 +22,12 @@ Changes
   resource.
 
 
+Bugfix
+------
+
+- ResourceOptions.abstract flag was not being set for abstract AnnotatedResrouces.
+
+
 2.9
 ===
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "odin"
-version = "2.10rc1"
+version = "2.10"
 description = "Data-structure definition/validation/traversal, mapping and serialisation toolkit for Python"
 authors = ["Tim Savage <tim@savage.company>"]
 license = "BSD-3-Clause"

src/odin/annotated_resource/__init__.py

@@ -86,6 +86,7 @@ def __new__(
         new_meta = _new_meta_instance(
             meta_options_type, attrs.pop("Meta", None), new_class
         )
+        new_meta.abstract = abstract
 
         # Bail out early if we have already created this class.
         r = registration.get_resource(new_meta.resource_name)

src/odin/codecs/json_codec.py

@@ -1,16 +1,12 @@
 import datetime
+import json
 import typing
 import uuid
 
 from odin import ResourceAdapter, bases, resources, serializers
 from odin.exceptions import CodecDecodeError, CodecEncodeError
 from odin.utils import getmeta
 
-try:
-    import simplejson as json
-except ImportError:
-    import json
-
 LIST_TYPES = (bases.ResourceIterable, typing.ValuesView, typing.KeysView)
 JSON_TYPES = {
     datetime.date: serializers.date_iso_format,

tests/test_annotated_resources.py

@@ -11,6 +11,7 @@
     Library,
     Publisher,
     AltBook,
+    LibraryBook
 )
 
 
@@ -51,6 +52,20 @@ def test_fields_are_inherited_from_parent_resources(self):
             "publisher",
         ]
 
+    def test_abstract_option_is_set_for_abstract_resources(self):
+        target = getmeta(LibraryBook)
+
+        actual = target.abstract
+
+        assert actual is True
+
+    def test_abstract_option_is_clear_for_non_abstract_resources(self):
+        target = getmeta(Book)
+
+        actual = target.abstract
+
+        assert actual is False
+
     def test_cached_properties_work_as_expected(self):
         target = Publisher(name="Super Pub")
 

tests/test_resources.py

@@ -18,6 +18,7 @@
     Library,
     Subscriber,
     AltBook,
+    LibraryBook
 )
 
 
@@ -241,6 +242,19 @@ def test_shadow_fields_are_identified(self):
         assert isinstance(actual, tuple)
         assert [f.name for f in actual] == ["title"]
 
+    def test_abstract_option_is_set_for_abstract_resources(self):
+        target = getmeta(LibraryBook)
+
+        actual = target.abstract
+
+        assert actual is True
+
+    def test_abstract_option_is_clear_for_non_abstract_resources(self):
+        target = getmeta(Book)
+
+        actual = target.abstract
+
+        assert actual is False
 
 class TestConstructionMethods:
     def test_build_object_graph_empty_dict_no_clean(self):