Update to Django 6.0

timgraham · timgraham · commit 6da111a7afda · 2025-12-04T20:59:10.000-05:00
diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
@@ -3,13 +3,13 @@
 set -eux
 
 # Install django-mongodb-backend
-/opt/python/3.10/bin/python3 -m venv venv
+/opt/python/3.12/bin/python3 -m venv venv
 . venv/bin/activate
 python -m pip install -U pip
 pip install -e .
 
 # Install django and test dependencies
-git clone --branch mongodb-5.2.x https://github.com/mongodb-forks/django django_repo
+git clone --branch mongodb-6.0.x https://github.com/mongodb-forks/django django_repo
 pushd django_repo/tests/
 pip install -e ..
 pip install -r requirements/py3.txt
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -17,7 +17,7 @@ jobs:
           persist-credentials: false
       - uses: actions/setup-python@v6
         with:
-          python-version: '3.10'
+          python-version: '3.12'
           cache: 'pip'
           cache-dependency-path: 'pyproject.toml'
       - name: Install Python dependencies
@@ -39,7 +39,7 @@ jobs:
         with:
           cache: 'pip'
           cache-dependency-path: 'pyproject.toml'
-          python-version: '3.10'
+          python-version: '3.12'
       - name: Install dependencies
         run: |
           pip install -U pip
diff --git a/.github/workflows/test-python-atlas.yml b/.github/workflows/test-python-atlas.yml
@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@v6
         with:
           repository: 'mongodb-forks/django'
-          ref: 'mongodb-5.2.x'
+          ref: 'mongodb-6.0.x'
           path: 'django_repo'
           persist-credentials: false
       - name: Install system packages for Django's Python test dependencies
diff --git a/.github/workflows/test-python-geo.yml b/.github/workflows/test-python-geo.yml
@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@v6
         with:
           repository: 'mongodb-forks/django'
-          ref: 'mongodb-5.2.x'
+          ref: 'mongodb-6.0.x'
           path: 'django_repo'
           persist-credentials: false
       - name: Install system packages for Django's Python test dependencies
diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@v6
         with:
           repository: 'mongodb-forks/django'
-          ref: 'mongodb-5.2.x'
+          ref: 'mongodb-6.0.x'
           path: 'django_repo'
           persist-credentials: false
       - name: Install system packages for Django's Python test dependencies
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -21,6 +21,6 @@ python:
           - docs
 
 build:
-  os: ubuntu-22.04
+  os: ubuntu-24.04
   tools:
-    python: "3.11"
+    python: "3.12"
diff --git a/README.md b/README.md
@@ -17,21 +17,21 @@ https://django-mongodb-backend.readthedocs.io/en/latest/.
 ### Install
 
 Use the version of `django-mongodb-backend` 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:
 
 ```bash
-pip install django-mongodb-backend==5.2.*
+pip install django-mongodb-backend==6.0.*
 ```
 
 ### Create a project
 
 From your shell, run the following command to create a new Django project
 called `example` using our project template. Make sure the end of the template
-URL corresponds to your version of Django (e.g. `5.2.x.zip` for any Django
-5.2.x version).
+URL corresponds to your version of Django (e.g. `6.0.x.zip` for any Django
+6.0.x version).
 
 ```bash
-django-admin startproject example --template https://github.com/mongodb-labs/django-mongodb-project/archive/refs/heads/5.2.x.zip
+django-admin startproject example --template https://github.com/mongodb-labs/django-mongodb-project/archive/refs/heads/6.0.x.zip
 ```
 
 You can check what version of Django you're using with:
diff --git a/django_mongodb_backend/__init__.py b/django_mongodb_backend/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "5.2.4.dev0"
+__version__ = "6.0.0b0.dev0"
 
 # Check Django compatibility before other imports which may fail if the
 # wrong version of Django is installed.
diff --git a/django_mongodb_backend/features.py b/django_mongodb_backend/features.py
@@ -99,6 +99,18 @@ class DatabaseFeatures(GISFeatures, BaseDatabaseFeatures):
         "model_fields.test_jsonfield.TestSaveLoad.test_bulk_update_custom_get_prep_value",
         # To debug: https://github.com/mongodb/django-mongodb-backend/issues/362
         "constraints.tests.UniqueConstraintTests.test_validate_case_when",
+        # StringAgg is not supported.
+        "aggregation.tests.AggregateTestCase.test_distinct_on_stringagg",
+        "aggregation.tests.AggregateTestCase.test_string_agg_escapes_delimiter",
+        "aggregation.tests.AggregateTestCase.test_string_agg_filter",
+        "aggregation.tests.AggregateTestCase.test_string_agg_filter_in_subquery",
+        "aggregation.tests.AggregateTestCase.test_stringagg_default_value",
+        # bulk_create() population of _order not implemented.
+        # https://github.com/django/django/commit/953095d1e603fe0f8f01175b1409ca23818dcff9
+        "contenttypes_tests.test_order_with_respect_to.OrderWithRespectToGFKTests.test_bulk_create_allows_duplicate_order_values",
+        "contenttypes_tests.test_order_with_respect_to.OrderWithRespectToGFKTests.test_bulk_create_mixed_scenario",
+        "contenttypes_tests.test_order_with_respect_to.OrderWithRespectToGFKTests.test_bulk_create_respects_mixed_manual_order",
+        "contenttypes_tests.test_order_with_respect_to.OrderWithRespectToGFKTests.test_bulk_create_with_existing_children",
     }
     # $bitAnd, #bitOr, and $bitXor are new in MongoDB 6.3.
     _django_test_expected_failures_bitwise = {
@@ -139,6 +151,7 @@ def django_test_expected_failures(self):
             "validation.test_unique.PerformUniqueChecksTest.test_unique_db_default",
         },
         "Insert expressions aren't supported.": {
+            "basic.tests.ModelTest.test_save_expressions",
             "bulk_create.tests.BulkCreateTests.test_bulk_insert_now",
             "bulk_create.tests.BulkCreateTests.test_bulk_insert_expressions",
             "expressions.tests.BasicExpressionsTests.test_new_object_create",
@@ -201,6 +214,7 @@ def django_test_expected_failures(self):
             "prefetch_related.tests.LookupOrderingTest.test_order",
             "prefetch_related.tests.MultiDbTests.test_using_is_honored_m2m",
             "prefetch_related.tests.MultiTableInheritanceTest",
+            "prefetch_related.tests.PrefetchRelatedMTICacheTests",
             "prefetch_related.tests.PrefetchRelatedTests",
             "prefetch_related.tests.ReadPrefetchedObjectsCacheTests",
             "prefetch_related.tests.Ticket21410Tests",
@@ -563,6 +577,7 @@ def django_test_expected_failures(self):
         "Custom lookups are not supported.": {
             "custom_lookups.tests.BilateralTransformTests",
             "custom_lookups.tests.LookupTests.test_basic_lookup",
+            "custom_lookups.tests.LookupTests.test_custom_lookup_with_subquery",
             "custom_lookups.tests.LookupTests.test_custom_name_lookup",
             "custom_lookups.tests.LookupTests.test_div3_extract",
             "custom_lookups.tests.SubqueryTransformTests.test_subquery_usage",
@@ -580,6 +595,9 @@ def django_test_expected_failures(self):
             "test_utils.tests.DisallowedDatabaseQueriesTests.test_disallowed_database_queries",
             "test_utils.tests.DisallowedDatabaseQueriesTests.test_disallowed_thread_database_connection",
         },
+        "search lookup not supported on non-Atlas.": {
+            "expressions.tests.BasicExpressionsTests.test_lookups_subquery",
+        },
     }
 
     @cached_property
diff --git a/django_mongodb_backend/gis/operations.py b/django_mongodb_backend/gis/operations.py
@@ -40,6 +40,7 @@ def gis_operators(self):
         "FromWKT",
         "GeoHash",
         "GeometryDistance",
+        "GeometryType",
         "Intersection",
         "IsEmpty",
         "IsValid",
@@ -52,6 +53,7 @@ def gis_operators(self):
         "Perimeter",
         "PointOnSurface",
         "Reverse",
+        "Rotate",
         "Scale",
         "SnapToGrid",
         "SymDifference",
diff --git a/docs/conf.py b/docs/conf.py
@@ -42,8 +42,8 @@
 
 intersphinx_mapping = {
     "django": (
-        "https://docs.djangoproject.com/en/5.2/",
-        "https://docs.djangoproject.com/en/5.2/_objects/",
+        "https://docs.djangoproject.com/en/6.0/",
+        "https://docs.djangoproject.com/en/6.0/_objects/",
     ),
     "mongodb": ("https://www.mongodb.com/docs/languages/python/django-mongodb/v5.2/", None),
     "pymongo": ("https://www.mongodb.com/docs/languages/python/pymongo-driver/current/", None),
diff --git a/docs/index.rst b/docs/index.rst
@@ -2,7 +2,7 @@
 Django MongoDB Backend
 ======================
 
-version 5.2.x for Django 5.2.x
+version 6.0.x for Django 6.0.x
 
 .. rubric:: Everything you need to know about Django MongoDB Backend.
 
diff --git a/docs/internals/contributing/unit-tests.rst b/docs/internals/contributing/unit-tests.rst
@@ -35,13 +35,13 @@ Third, clone your fork and install it:
 
 Next, get and install a copy of MongoDB's Django fork. This fork has some
 test suite adaptions for Django MongoDB Backend. There is a branch for each
-feature release of Django (e.g. ``mongodb-5.2.x`` below).
+feature release of Django (e.g. ``mongodb-6.0.x`` below).
 
 .. code-block:: bash
 
    $ git clone https://github.com/mongodb-forks/django.git django-repo
    $ cd django-repo
-   $ git checkout -t origin/mongodb-5.2.x
+   $ git checkout -t origin/mongodb-6.0.x
    $ python -m pip install -e .
    $ python -m pip install -r tests/requirements/py3.txt
 
diff --git a/docs/intro/configure.rst b/docs/intro/configure.rst
@@ -18,9 +18,9 @@ project template:
 
 .. code-block:: bash
 
-    $ django-admin startproject mysite --template https://github.com/mongodb-labs/django-mongodb-project/archive/refs/heads/5.2.x.zip
+    $ django-admin startproject mysite --template https://github.com/mongodb-labs/django-mongodb-project/archive/refs/heads/6.0.x.zip
 
-(If you're using a version of Django other than 5.2.x, replace the two numbers
+(If you're using a version of Django other than 6.0.x, replace the two numbers
 to match the first two numbers from your version.)
 
 This template includes the following line in ``settings.py``::
@@ -85,22 +85,25 @@ third-party apps. For example:
 Creating Django applications
 ============================
 
-Whenever you run ``python manage.py startapp``, you must remove the line::
+To create a new application, use ``python manage.py startapp``. No extra steps
+are necessary.
 
-    default_auto_field = 'django.db.models.BigAutoField'
+.. versionchanged:: 6.0
 
-from the new application's ``apps.py`` file (or change it to reference
-``"django_mongodb_backend.fields.ObjectIdAutoField"``).
+    In Django 5.2.x, whenever you run ``python manage.py startapp``, you must
+    remove the line::
 
-Alternatively, you can use the following :djadmin:`startapp` template which
-includes this change:
+        default_auto_field = 'django.db.models.BigAutoField'
 
-.. code-block:: bash
+    from the new application's ``apps.py`` file (or change it to reference
+    ``"django_mongodb_backend.fields.ObjectIdAutoField"``).
 
-    $ python manage.py startapp myapp --template https://github.com/mongodb-labs/django-mongodb-app/archive/refs/heads/5.2.x.zip
+    Alternatively, you can use the following :djadmin:`startapp` template which
+    includes this change:
 
-(If you're using a version of Django other than 5.2.x, replace the two numbers
-to match the first two numbers from your version.)
+    .. code-block:: bash
+
+        $ python manage.py startapp myapp --template https://github.com/mongodb-labs/django-mongodb-app/archive/refs/heads/5.2.x.zip
 
 .. _configuring-databases-setting:
 
diff --git a/docs/intro/install.rst b/docs/intro/install.rst
@@ -3,11 +3,11 @@ Installing Django MongoDB Backend
 =================================
 
 Use the version of ``django-mongodb-backend`` that corresponds to your version
-of Django. For example, to get the latest compatible release for Django 5.2.x:
+of Django. For example, to get the latest compatible release for Django 6.0.x:
 
 .. code-block:: bash
 
-    $ pip install django-mongodb-backend==5.2.*
+    $ pip install django-mongodb-backend==6.0.*
 
 The minor release number of Django doesn't correspond to the minor release
 number of ``django-mongodb-backend``. Use the latest minor release of each.
diff --git a/docs/releases/5.2.x.rst b/docs/releases/5.2.x.rst
@@ -2,6 +2,8 @@
 Django MongoDB Backend 5.2.x
 ============================
 
+.._ django-mongodb-backend-5.2.4:
+
 5.2.4
 =====
 
diff --git a/docs/releases/6.0.x.rst b/docs/releases/6.0.x.rst
@@ -0,0 +1,28 @@
+============================
+Django MongoDB Backend 6.0.x
+============================
+
+6.0.0
+=====
+
+*Unreleased*
+
+Initial release from the state of :ref:`django-mongodb-backend 5.2.4
+<django-mongodb-backend-5.2.4>`.
+
+Regarding new features in Django 6.0, ...
+
+New features
+------------
+
+- ...
+
+Backwards incompatible changes
+------------------------------
+
+- ...
+
+Bug fixes
+---------
+
+- ...
diff --git a/docs/releases/index.rst b/docs/releases/index.rst
@@ -5,12 +5,13 @@ Release notes
 The release notes will tell you what's new in each version and will also
 describe any backwards-incompatible changes.
 
-Below are release notes through Django MongoDB backend 5.2.x. Newer versions of
+Below are release notes through Django MongoDB backend 6.0.x. Newer versions of
 the documentation contain the release notes for any later releases.
 
 .. toctree::
    :maxdepth: 1
 
+   6.0.x
    5.2.x
    5.1.x
    5.0.x
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,7 @@ dynamic = ["version", "dependencies"]
 description = "Django MongoDB Backend"
 readme = "README.md"
 license = {file="LICENSE"}
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 authors = [
     { name = "The MongoDB Python Team" },
 ]
@@ -21,14 +21,12 @@ keywords = [
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Framework :: Django",
-    "Framework :: Django :: 5.2",
+    "Framework :: Django :: 6.0",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-django>=5.2,<6.0
+django>=6.0,<6.1
 pymongo>=4.7,<5.0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-__version__ = "5.2.4.dev0"`
	`1`	`+__version__ = "6.0.0b0.dev0"`
`2`	`2`
`3`	`3`	`# Check Django compatibility before other imports which may fail if the`
`4`	`4`	`# wrong version of Django is installed.`