update for Django 5.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.8'
+          python-version: '3.10'
       - 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.8'
+          python-version: '3.10'
       - run: python -m pip install isort
       - name: isort
         uses: liskin/gh-problem-matcher-wrap@v2

.github/workflows/tests.yml

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

CHANGELOG.md

@@ -1,9 +1,5 @@
 # Changelog
 
-## 4.2.1 - TBD
+## 5.0 - TBD
 
-- Confirmed support for CockroachDB 23.1.x (no changes were required).
-
-## 4.2 - 2023-04-06
-
-Initial release for Django 4.2.x and CockroachDB 22.1.x and 22.2.x.
+Initial release for Django 5.0.x and CockroachDB 22.2.x and 23.1.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 4.2.x:
+Django. For example, to get the latest compatible release for Django 5.0.x:
 
-`pip install django-cockroachdb==4.2.*`
+`pip install django-cockroachdb==5.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-4.2.x https://github.com/timgraham/django _django_repo
+git clone --depth 1 --single-branch --branch cockroach-5.0.x https://github.com/timgraham/django _django_repo
 
 # install the django requirements.
 cd _django_repo/tests/

django_cockroachdb/__init__.py

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

django_cockroachdb/features.py

@@ -71,6 +71,8 @@ def introspected_field_types(self):
         # https://github.com/cockroachdb/cockroach/issues/54817
         'non_default': 'sv',
         'swedish_ci': 'sv-x-icu',
+        # Not supported: https://github.com/cockroachdb/cockroach/issues/111091
+        'virtual': None,
     }
 
     @cached_property
@@ -148,6 +150,8 @@ 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',
             # unsupported comparison operator: <jsonb> > <string>:
@@ -182,6 +186,8 @@ def django_test_expected_failures(self):
             # of type decimal, found type float
             # https://github.com/cockroachdb/cockroach/issues/73587#issuecomment-988408190
             'aggregation.tests.AggregateTestCase.test_aggregation_default_using_decimal_from_database',
+            # ProgrammingError: VALUES types int and float cannot be matched
+            'field_defaults.tests.DefaultTests.test_bulk_create_mixed_db_defaults_function',
         })
         if self.uses_server_side_binding:
             expected_failures.update({
@@ -223,6 +229,7 @@ def django_test_expected_failures(self):
                 'queries.test_bulk_update.BulkUpdateTests.test_large_batch',
                 'queries.test_bulk_update.BulkUpdateTests.test_updated_rows_when_passing_duplicates',
                 'queries.test_q.QCheckTests.test_expression',
+                'queries.test_qs_combinators.QuerySetSetOperationTests.test_union_multiple_models_with_values_list_and_annotations',  # noqa
                 # unsupported binary operator: <interval> / <decimal>
                 'expressions.tests.FTimeDeltaTests.test_durationfield_multiply_divide',
                 # InvalidParameterValue: unsupported binary operator: <int4> / <float>

django_cockroachdb/operations.py

@@ -1,6 +1,6 @@
 import time
+from zoneinfo import ZoneInfo
 
-from django.db.backends.base.base import timezone_constructor
 from django.db.backends.postgresql.operations import (
     DatabaseOperations as PostgresDatabaseOperations,
 )
@@ -47,7 +47,7 @@ def adapt_datetimefield_value(self, value):
         """
         # getattr() guards against F() objects which don't have tzinfo.
         if value and getattr(value, 'tzinfo', '') is None and self.connection.timezone_name is not None:
-            connection_timezone = timezone_constructor(self.connection.timezone_name)
+            connection_timezone = ZoneInfo(self.connection.timezone_name)
             value = value.replace(tzinfo=connection_timezone)
         return value
 

django_cockroachdb_gis/features.py

@@ -54,6 +54,7 @@ def django_test_expected_failures(self):
             # unknown function: st_3dextent()
             # https://github.com/cockroachdb/cockroach/issues/60864
             'gis_tests.geo3d.tests.Geo3DTest.test_extent',
+            'gis_tests.geo3d.tests.Geo3DTest.test_extent3d_filter',
             # unknown signature: st_scale(geometry, decimal, decimal, decimal)
             # https://github.com/cockroachdb/cockroach/issues/49027
             'gis_tests.geo3d.tests.Geo3DFunctionsTests.test_scale',

setup.cfg

@@ -11,13 +11,11 @@ long_description_content_type = text/markdown
 classifiers =
     Development Status :: 5 - Production/Stable
     Framework :: Django
-    Framework :: Django :: 4.2
+    Framework :: Django :: 5.0
     License :: OSI Approved :: Apache Software License
     Operating System :: OS Independent
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
     Programming Language :: Python :: 3.12