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

@@ -59,7 +59,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

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_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

@@ -165,7 +165,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',
@@ -205,6 +204,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({
@@ -231,9 +232,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',
@@ -244,6 +243,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',
@@ -268,6 +268,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({

setup.cfg

@@ -16,8 +16,6 @@ classifiers =
  Operating System :: OS Independent
  Programming Language :: Python
  Programming Language :: Python :: 3
- Programming Language :: Python :: 3.10
- Programming Language :: Python :: 3.11
  Programming Language :: Python :: 3.12
  Programming Language :: Python :: 3.13
 project_urls =
@@ -28,7 +26,7 @@ project_urls =
 python_requires = >=3.10
 packages = find:
 install_requires =
- django >= 5.2, < 6.0
+# django >= 6.0, < 6.1
 
 [flake8]
 max-line-length = 119