feat(django-spanner): isolate Django 6.0 skip_tests via conditional version check

Author: sakthivelmanii

packages/django-google-spanner/django_spanner/creation.py

@@ -26,16 +26,16 @@ def mark_skips(self):
             test_app = test_name.split(".")[0]
             # Importing a test app that isn't installed raises RuntimeError.
             if test_app in settings.INSTALLED_APPS:
+                test_case = import_string(test_case_name)
                 try:
-                    test_case = import_string(test_case_name)
                     method = getattr(test_case, method_name)
                     setattr(
                         test_case,
                         method_name,
                         skip("unsupported by Spanner")(method),
                     )
-                except (AttributeError, ImportError):
-                    # The test case or method might not exist in this version of Django.
+                except AttributeError:
+                    # The test method might not exist in this version of Django.
                     pass
 
     def create_test_db(self, *args, **kwargs):

packages/django-google-spanner/django_spanner/features.py

@@ -6,6 +6,7 @@
 
 import os
 
+import django
 from django.db.backends.base.features import BaseDatabaseFeatures
 from django.db.utils import InterfaceError
 
@@ -205,9 +206,6 @@ def introspected_field_types(self):
         "many_to_one_null.tests.ManyToOneNullTests.test_set_clear_non_bulk",
         "many_to_one_null.tests.ManyToOneNullTests.test_unsaved",
         "foreign_object.tests.MultiColumnFKTests.test_prefetch_foreignobject_reverse",
-        # Indexes tests
-        "indexes.tests.CoveringIndexTests.test_covering_index",
-        "indexes.tests.CoveringIndexTests.test_covering_partial_index",
         # Admin ChangeList tests
         "admin_changelist.tests.ChangeListTests.test_custom_lookup_in_search_fields",
         "admin_changelist.tests.ChangeListTests.test_deterministic_order_for_model_ordered_by_its_manager",
@@ -773,27 +771,6 @@ def introspected_field_types(self):
             "ordering.tests.OrderingTests.test_extra_ordering",
             "ordering.tests.OrderingTests.test_extra_ordering_quoting",
             "ordering.tests.OrderingTests.test_extra_ordering_with_table_name",
-            # Spanner uses random int64 IDs; test assumes monotonic ordering matching insertion order.
-            "prefetch_related.tests.PrefetchRelatedMTICacheTests.test_parent_m2m_available_in_child",
-            # Client-side AutoField ID generation sets pk before save; _is_pk_set() triggers refresh_from_db instead of AttributeError.
-            "defer_regress.tests.DeferCopyInstanceTests.test_bulk_create",
-            "defer_regress.tests.DeferCopyInstanceTests.test_save",
-            # Spanner does not support nested transactions/savepoints; raising inside atomic() aborts the whole transaction.
-            "update_only_fields.tests.UpdateOnlyFieldsTests.test_update_fields_not_updated",
-            # Test checks warning caller stacklevel; wrapping create_test_db shifts frame depth.
-            "backends.base.test_creation.TestDbCreationTests.test_serialize_deprecation",
-            # Runtime client-side AutoField initialization defaults trigger false-positive diffs in makemigrations autodetector.
-            "migrations.test_commands.MakeMigrationsTests.test_makemigrations_check_no_changes",
-            "migrations.test_commands.MakeMigrationsTests.test_makemigrations_model_rename_interactive",
-            "migrations.test_commands.MakeMigrationsTests.test_makemigrations_no_changes",
-            # Spanner query parameter limit (max_query_params = 900) limits batch chunk size.
-            "bulk_create.tests.BulkCreateTests.test_max_batch_size",
-            # Query count assertions mismatch due to Spanner batch DML execution behavior.
-            "bulk_create.tests.BulkCreateTransactionTests.test_multiple_batches",
-            # All objects get client-side PKs, collapsing multi-query insertion into a single batch query.
-            "bulk_create.tests.BulkCreateTransactionTests.test_objs_with_and_without_pk",
-            # Tie-breaker ordering on pk assumes sequential integer IDs; Spanner uses random IDs.
-            "ordering.tests.OrderingTests.test_order_by_case_when_constant_value",
             "ordering.tests.OrderingTests.test_order_by_constant_value",
             "ordering.tests.OrderingTests.test_order_by_f_expression",
             "ordering.tests.OrderingTests.test_order_by_f_expression_duplicates",
@@ -2289,3 +2266,33 @@ def introspected_field_types(self):
             "expressions.tests.BasicExpressionsTests.test_outerref_mixed_case_table_name",
             "db_functions.text.test_concat.ConcatTests.test_concat_non_str",
         )
+
+    django_6_0_skip_tests = (
+        # Indexes tests (upstream tests hardcode PostgreSQL's INCLUDE keyword)
+        "indexes.tests.CoveringIndexTests.test_covering_index",
+        "indexes.tests.CoveringIndexTests.test_covering_partial_index",
+        # Spanner uses random int64 IDs; test assumes monotonic ordering matching insertion order.
+        "prefetch_related.tests.PrefetchRelatedMTICacheTests.test_parent_m2m_available_in_child",
+        # Client-side AutoField ID generation sets pk before save; _is_pk_set() triggers refresh_from_db instead of AttributeError.
+        "defer_regress.tests.DeferCopyInstanceTests.test_bulk_create",
+        "defer_regress.tests.DeferCopyInstanceTests.test_save",
+        # Spanner does not support nested transactions/savepoints; raising inside atomic() aborts the whole transaction.
+        "update_only_fields.tests.UpdateOnlyFieldsTests.test_update_fields_not_updated",
+        # Test checks warning caller stacklevel; wrapping create_test_db shifts frame depth.
+        "backends.base.test_creation.TestDbCreationTests.test_serialize_deprecation",
+        # Runtime client-side AutoField initialization defaults trigger false-positive diffs in makemigrations autodetector.
+        "migrations.test_commands.MakeMigrationsTests.test_makemigrations_check_no_changes",
+        "migrations.test_commands.MakeMigrationsTests.test_makemigrations_model_rename_interactive",
+        "migrations.test_commands.MakeMigrationsTests.test_makemigrations_no_changes",
+        # Spanner query parameter limit (max_query_params = 900) limits batch chunk size.
+        "bulk_create.tests.BulkCreateTests.test_max_batch_size",
+        # Query count assertions mismatch due to Spanner batch DML execution behavior.
+        "bulk_create.tests.BulkCreateTransactionTests.test_multiple_batches",
+        # All objects get client-side PKs, collapsing multi-query insertion into a single batch query.
+        "bulk_create.tests.BulkCreateTransactionTests.test_objs_with_and_without_pk",
+        # Tie-breaker ordering on pk assumes sequential integer IDs; Spanner uses random IDs.
+        "ordering.tests.OrderingTests.test_order_by_case_when_constant_value",
+    )
+
+    if django.VERSION >= (6, 0):
+        skip_tests += django_6_0_skip_tests