Fixed Django 5.x compatibility

jazzband · Aug 11, 2024 · 76a5357 · 76a5357
1 parent 222f5d9
commit 76a5357
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,26 +9,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.10', '3.11', '3.12']
         django-version: ['4.2', '5.0', '5.1', 'main']
         include:
           - python-version: '3.8'
             django-version: '4.2'
           - python-version: '3.9'
             django-version: '4.2'
-        exclude:
-          - python-version: '3.8'
-            django-version: '5.0'
-          - python-version: '3.8'
-            django-version: '5.1'
-          - python-version: '3.8'
-            django-version: 'main'
-          - python-version: '3.9'
-            django-version: '5.0'
-          - python-version: '3.9'
-            django-version: '5.1'
-          - python-version: '3.9'
-            django-version: 'main'
 
     services:
       postgres:

diff --git a/sortedm2m/fields.py b/sortedm2m/fields.py
@@ -39,6 +39,11 @@ def get_queryset(self):
                 queryset = super().get_queryset()
                 return self._apply_rel_ordering(queryset)
 
+        def get_prefetch_querysets(self, instances, queryset=None):
+            # Apply the same ordering for prefetch ones
+            result = super().get_prefetch_querysets(instances, queryset)
+            return (self._apply_rel_ordering(result[0]),) + result[1:]
+
         def get_prefetch_queryset(self, instances, queryset=None):
             # Apply the same ordering for prefetch ones
             result = super().get_prefetch_queryset(instances, queryset)

diff --git a/sortedm2m_tests/test_base.py b/sortedm2m_tests/test_base.py
@@ -250,7 +250,7 @@ def set_up_test_model(
         # Make the "current" state.
         model_options = {
             "swappable": "TEST_SWAP_MODEL",
-            "index_together": [["weight", "pink"]] if index_together else [],
+            "indexes": models.Index(fields=["weight", "pink"]) if index_together else [],
             "unique_together": [["pink", "weight"]] if unique_together else [],
         }
         if options: