run test in python 3.12 as well

.github/workflows/check.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.11']
+        python-version: ['3.11', '3.12']
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
@@ -25,7 +25,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.11']
+        python-version: ['3.11', '3.12']
     steps:
       - uses: actions/checkout@v3
         with:

.github/workflows/tests.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.11']
+        python-version: ['3.11', '3.12']
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

catalog/book/models.py

@@ -18,6 +18,7 @@
 """
 
 from os.path import exists
+from typing import TYPE_CHECKING
 
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
@@ -62,6 +63,8 @@ class EditionSchema(EditionInSchema, BaseSchema):
 
 
 class Edition(Item):
+    if TYPE_CHECKING:
+        works: "models.ManyToManyField[Work, Edition]"
     category = ItemCategory.Book
     url_path = "book"
 
@@ -164,17 +167,17 @@ def lookup_id_cleanup(cls, lookup_id_type: str | IdType, lookup_id_value: str):
             return detect_isbn_asin(lookup_id_value)
         return super().lookup_id_cleanup(lookup_id_type, lookup_id_value)
 
-    def merge_to(self, to_item: "Edition | None"):
+    def merge_to(self, to_item: "Edition | None"):  # type: ignore[reportIncompatibleMethodOverride]
         super().merge_to(to_item)
         if to_item:
             for work in self.works.all():
                 to_item.works.add(work)
         self.works.clear()
 
-    def delete(self, using=None, soft=True, *args, **kwargs):
+    def delete(self, using=None, keep_parents=False, soft=True, *args, **kwargs):
         if soft:
             self.works.clear()
-        return super().delete(using, soft, *args, **kwargs)
+        return super().delete(using, soft, keep_parents, *args, **kwargs)
 
     def update_linked_items_from_external_resource(self, resource):
         """add Work from resource.metadata['work'] if not yet"""
@@ -279,7 +282,7 @@ def lookup_id_type_choices(cls):
         ]
         return [(i.value, i.label) for i in id_types]
 
-    def merge_to(self, to_item: "Work | None"):
+    def merge_to(self, to_item: "Work | None"):  # type: ignore[reportIncompatibleMethodOverride]
         super().merge_to(to_item)
         if to_item:
             for edition in self.editions.all():
@@ -293,10 +296,10 @@ def merge_to(self, to_item: "Work | None"):
             to_item.other_title += [self.title]  # type: ignore
             to_item.save()
 
-    def delete(self, using=None, soft=True, *args, **kwargs):
+    def delete(self, using=None, keep_parents=False, soft=True, *args, **kwargs):
         if soft:
             self.editions.clear()
-        return super().delete(using, soft, *args, **kwargs)
+        return super().delete(using, keep_parents, soft, *args, **kwargs)
 
 
 class Series(Item):

catalog/collection/models.py

@@ -1,7 +1,13 @@
-from catalog.common import *
+from typing import TYPE_CHECKING
+
+from catalog.common import Item, ItemCategory
 
 
 class Collection(Item):
+    if TYPE_CHECKING:
+        from journal.models import Collection as JournalCollection
+
+        journal_item: "JournalCollection"
     category = ItemCategory.Collection
 
     @property

catalog/common/mixins.py

@@ -13,10 +13,11 @@ def clear(self):
     def clear(self):
         pass
 
-    def delete(self, using=None, soft=True, *args, **kwargs):
+    def delete(self, using=None, keep_parents=False, soft=True, *args, **kwargs):
         if soft:
             self.clear()
             self.is_deleted = True
             self.save(using=using)  # type: ignore
+            return 0, {}
         else:
-            return super().delete(using=using, *args, **kwargs)  # type: ignore
+            return super().delete(using=using, keep_parents=keep_parents, *args, **kwargs)  # type: ignore