update for Django 5.1

Author: timgraham

CHANGELOG.md

@@ -1,12 +1,5 @@
 # Changelog
 
-## 5.0.1 - Unreleased
+## 5.1 - Unreleased
 
-- Confirm support for CockroachDB 23.2.x (no code changes required), which adds
-  support for ordering by JSON.
-
-- Confirm support for CockroachDB 24.1.x (no code changes required).
-
-## 5.0 - 2023-12-11
-
-Initial release for Django 5.0.x and CockroachDB 22.2.x and 23.1.x.
+Initial release for Django 5.1.x and CockroachDB 23.1.x, 23.2.x, and 24.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 5.0.x:
+Django. For example, to get the latest compatible release for Django 5.1.x:
 
-`pip install django-cockroachdb==5.0.*`
+`pip install django-cockroachdb==5.1.*`
 
 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.0.x https://github.com/timgraham/django _django_repo
+git clone --depth 1 --single-branch --branch cockroach-5.1.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__ = '5.0'
+__version__ = '5.1a0'
 
 # Check Django compatibility before other imports which may fail if the
 # wrong version of Django is installed.

django_cockroachdb/features.py

@@ -151,6 +151,9 @@ def django_test_expected_failures(self):
             # CockroachDB doesn't support dropping the primary key.
             'schema.tests.SchemaTests.test_alter_int_pk_to_int_unique',
             # CockroachDB doesn't support changing the primary key of table.
+            # psycopg.errors.InvalidColumnReference: column "id" is referenced
+            # by the primary key
+            'migrations.test_operations.OperationTests.test_alter_id_pk_to_uuid_pk',
             'schema.tests.SchemaTests.test_alter_not_unique_field_to_primary_key',
             'schema.tests.SchemaTests.test_primary_key',
             # SmallAutoField doesn't work:
@@ -179,6 +182,10 @@ def django_test_expected_failures(self):
             'aggregation.tests.AggregateTestCase.test_aggregation_default_expression',
             # ProgrammingError: VALUES types int and float cannot be matched
             'field_defaults.tests.DefaultTests.test_bulk_create_mixed_db_defaults_function',
+            # concat(): unknown signature: concat(string, int2) (desired <string>)
+            'db_functions.text.test_concat.ConcatTests.test_concat_non_str',
+            # unknown signature: concat(varchar, int) (returning <string>)
+            'migrations.test_operations.OperationTests.test_add_generate_field',
         })
         if not self.is_cockroachdb_23_2:
             expected_failures.update({
@@ -187,6 +194,8 @@ def django_test_expected_failures(self):
                 'schema.tests.SchemaTests.test_func_index_json_key_transform',
                 # ordering by JSON isn't supported:
                 # https://github.com/cockroachdb/cockroach/issues/35706
+                'db_functions.comparison.test_json_object.JSONObjectTests.test_order_by_key',
+                'db_functions.comparison.test_json_object.JSONObjectTests.test_order_by_nested_key',
                 'expressions_window.tests.WindowFunctionTests.test_key_transform',
                 'model_fields.test_jsonfield.TestQuerying.test_deep_distinct',
                 'model_fields.test_jsonfield.TestQuerying.test_order_grouping_custom_decoder',

setup.cfg

@@ -11,7 +11,7 @@ long_description_content_type = text/markdown
 classifiers =
     Development Status :: 5 - Production/Stable
     Framework :: Django
-    Framework :: Django :: 5.0
+    Framework :: Django :: 5.1
     License :: OSI Approved :: Apache Software License
     Operating System :: OS Independent
     Programming Language :: Python