update for Django 6.0

Author: timgraham

.github/workflows/linters.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.12'
       - run: python -m pip install flake8
       - name: flake8
         uses: liskin/gh-problem-matcher-wrap@v2
@@ -33,7 +33,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.12'
       - run: python -m pip install isort
       - name: isort
         uses: liskin/gh-problem-matcher-wrap@v2

.github/workflows/tests.yml

@@ -64,7 +64,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.12'
       - name: Install system packages for Django's Python test dependencies
         run: |
           sudo apt-get update

CHANGELOG.md

@@ -1,14 +1,6 @@
 # Changelog
 
-## 5.2.1 - Unreleased
+## 6.0 - Unreleased
 
-- Confirmed support for CockroachDB 25.2.x, 25.3.x, and 25.4.x (no code changes
-  required).
-- Fixed the ``Now`` database function to use the statement time
-  (``STATEMENT_TIMESTAMP``) rather than the transaction time
-  (``CURRENT_TIMESTAMP``).
-
-## 5.2 - 2025-04-07
-
-Initial release for Django 5.2.x and CockroachDB 23.2.x, 24.1.x, 24.3.x, and
-25.1.x.
+Initial release for Django 6.0.x and CockroachDB 24.1.x, 24.3.x, 25.2.x,
+25.3.x, and 25.4.x.

README.md

@@ -21,9 +21,9 @@ production it is advised to use the package built from sources.
 ## Install and usage
 
 Use the version of django-cockroachdb that corresponds to your version of
-Django. For example, to get the latest compatible release for Django 5.2.x:
+Django. For example, to get the latest compatible release for Django 6.0.x:
 
-`pip install django-cockroachdb==5.2.*`
+`pip install django-cockroachdb==6.0.*`
 
 The minor release number of Django doesn't correspond to the minor release
 number of django-cockroachdb. Use the latest minor release of each.

django-test-suite/build.sh

@@ -7,7 +7,7 @@ VERSION=$1
 
 # clone django into the repo.
 rm -rf _django_repo
-git clone --depth 1 --single-branch --branch cockroach-5.2.x https://github.com/timgraham/django _django_repo
+git clone --depth 1 --single-branch --branch cockroach-6.0.x https://github.com/timgraham/django _django_repo
 
 # install the django requirements.
 cd _django_repo/tests/

django-test-suite/cockroach_gis_settings.py

@@ -1,9 +1,9 @@
-from cockroach_settings import (
-    DATABASES, DEFAULT_AUTO_FIELD, PASSWORD_HASHERS, SECRET_KEY, USE_TZ,
-)
+from cockroach_settings import DATABASES, PASSWORD_HASHERS, SECRET_KEY, USE_TZ
 
 __all__ = [
-    'DATABASES', 'DEFAULT_AUTO_FIELD', 'PASSWORD_HASHERS', 'SECRET_KEY',
+    'DATABASES',
+    'PASSWORD_HASHERS',
+    'SECRET_KEY',
     'USE_TZ',
 ]
 

django-test-suite/cockroach_settings.py

@@ -24,7 +24,6 @@
     DATABASES['default']['OPTIONS']['server_side_binding'] = True
     DATABASES['other']['OPTIONS']['server_side_binding'] = True
 
-DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 SECRET_KEY = 'django_tests_secret_key'
 PASSWORD_HASHERS = [
     'django.contrib.auth.hashers.MD5PasswordHasher',

django_cockroachdb/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '5.2'
+__version__ = '6.0a0'
 
 # Check Django compatibility before other imports which may fail if the
 # wrong version of Django is installed.

django_cockroachdb/features.py

@@ -169,7 +169,6 @@ def django_test_expected_failures(self):
             'bulk_create.tests.BulkCreateTests.test_bulk_insert_nullable_fields',
             'many_to_one.tests.ManyToOneTests.test_add_remove_set_by_pk_raises',
             'many_to_one.tests.ManyToOneTests.test_fk_to_smallautofield',
-            'many_to_one.tests.ManyToOneTests.test_get_prefetch_queryset_reverse_warning',
             'many_to_one.tests.ManyToOneTests.test_get_prefetch_querysets_reverse_invalid_querysets_length',
             'migrations.test_operations.OperationTests.test_smallfield_autofield_foreignfield_growth',
             'migrations.test_operations.OperationTests.test_smallfield_bigautofield_foreignfield_growth',
@@ -209,6 +208,8 @@ def django_test_expected_failures(self):
                 'migrations.test_operations.OperationTests.test_add_generated_field',
                 # concat(): unknown signature: concat(string, int2) (desired <string>)
                 'db_functions.text.test_concat.ConcatTests.test_concat_non_str',
+                # unknown signature: concat(timestamptz, string)
+                "aggregation.tests.AggregateTestCase.test_string_agg_order_by",
             })
         if self.is_cockroachdb_25_1:
             expected_failures.update({
@@ -235,9 +236,7 @@ def django_test_expected_failures(self):
                 'expressions_case.tests.CaseExpressionTests.test_annotate_with_aggregation_in_predicate',
                 'expressions_case.tests.CaseExpressionTests.test_annotate_with_annotation_in_condition',
                 'expressions_case.tests.CaseExpressionTests.test_annotate_with_annotation_in_predicate',
-                'expressions_case.tests.CaseExpressionTests.test_annotate_with_empty_when',
                 'expressions_case.tests.CaseExpressionTests.test_annotate_with_expression_as_condition',
-                'expressions_case.tests.CaseExpressionTests.test_annotate_with_full_when',
                 'expressions_case.tests.CaseExpressionTests.test_annotate_with_join_in_condition',
                 'expressions_case.tests.CaseExpressionTests.test_annotate_with_join_in_predicate',
                 'expressions_case.tests.CaseExpressionTests.test_case_reuse',
@@ -248,6 +247,7 @@ def django_test_expected_failures(self):
                 'lookup.tests.LookupQueryingTests.test_conditional_expression',
                 'ordering.tests.OrderingTests.test_order_by_constant_value',
                 'queries.test_bulk_update.BulkUpdateNoteTests.test_batch_size',
+                'queries.test_bulk_update.BulkUpdateNoteTests.test_max_batch_size',
                 'queries.test_bulk_update.BulkUpdateNoteTests.test_multiple_fields',
                 'queries.test_bulk_update.BulkUpdateNoteTests.test_simple',
                 'queries.test_bulk_update.BulkUpdateTests.test_custom_pk',
@@ -272,6 +272,8 @@ def django_test_expected_failures(self):
                 # incompatible COALESCE expressions: unsupported binary
                 # operator: <decimal> / <float>  (desired <decimal>)
                 'aggregation.tests.AggregateTestCase.test_aggregation_default_passed_another_aggregate',
+                # could not parse "@" as type timestamptz: parsing as type timestamp: empty or blank input
+                "aggregation.tests.AggregateTestCase.test_string_agg_order_by",
             })
             if self.is_cockroachdb_24_3:
                 expected_failures.update({

django_cockroachdb_gis/features.py

@@ -70,6 +70,9 @@ def django_test_expected_failures(self):
             # 3D opclass not present on CockroachDB:
             # https://github.com/cockroachdb/cockroach/issues/47420#issuecomment-969578772
             'gis_tests.gis_migrations.test_operations.OperationTests.test_add_3d_field_opclass',
+            # GeometryType output value has incorrect casing:
+            # https://github.com/cockroachdb/cockroach/issues/152593
+            "gis_tests.geoapp.test_functions.GISFunctionsTests.test_geometry_type",
         })
         if self.uses_server_side_binding:
             expected_failures.update({