Skip to content

Commit 2dca49d

Browse files
committed
Update to Django 6.0
1 parent cdb9d1a commit 2dca49d

File tree

9 files changed

+17
-14
lines changed

9 files changed

+17
-14
lines changed

.evergreen/run-tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
set -eux
44

55
# Install django-mongodb-backend
6-
/opt/python/3.10/bin/python3 -m venv venv
6+
/opt/python/3.12/bin/python3 -m venv venv
77
. venv/bin/activate
88
python -m pip install -U pip
99
pip install -e .
1010

1111
# Install django and test dependencies
12-
git clone --branch mongodb-5.2.x https://github.com/mongodb-forks/django django_repo
12+
git clone --branch mongodb-6.0.x https://github.com/mongodb-forks/django django_repo
1313
pushd django_repo/tests/
1414
pip install -e ..
1515
pip install -r requirements/py3.txt

.github/workflows/linters.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
persist-credentials: false
1818
- uses: actions/setup-python@v5
1919
with:
20-
python-version: '3.10'
20+
python-version: '3.12'
2121
cache: 'pip'
2222
cache-dependency-path: 'pyproject.toml'
2323
- name: Install Python dependencies
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
cache: 'pip'
3939
cache-dependency-path: 'pyproject.toml'
40-
python-version: '3.10'
40+
python-version: '3.12'
4141
- name: Install dependencies
4242
run: |
4343
pip install -U pip

.github/workflows/test-python-atlas.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/checkout@v4
3434
with:
3535
repository: 'mongodb-forks/django'
36-
ref: 'mongodb-5.2.x'
36+
ref: 'mongodb-6.0.x'
3737
path: 'django_repo'
3838
persist-credentials: false
3939
- name: Install system packages for Django's Python test dependencies

.github/workflows/test-python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/checkout@v4
3434
with:
3535
repository: 'mongodb-forks/django'
36-
ref: 'mongodb-5.2.x'
36+
ref: 'mongodb-6.0.x'
3737
path: 'django_repo'
3838
persist-credentials: false
3939
- name: Install system packages for Django's Python test dependencies

.readthedocs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ python:
2121
- docs
2222

2323
build:
24-
os: ubuntu-22.04
24+
os: ubuntu-24.04
2525
tools:
26-
python: "3.11"
26+
python: "3.12"

django_mongodb_backend/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "5.2.0b2.dev0"
1+
__version__ = "6.0.0b0.dev0"
22

33
# Check Django compatibility before other imports which may fail if the
44
# wrong version of Django is installed.

django_mongodb_backend/cache.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import pickle
2-
from datetime import datetime, timezone
2+
from datetime import UTC, datetime
33

44
from django.core.cache.backends.base import DEFAULT_TIMEOUT, BaseCache
55
from django.core.cache.backends.db import Options
@@ -72,7 +72,7 @@ def get_backend_timeout(self, timeout=DEFAULT_TIMEOUT):
7272
if timeout is None:
7373
return datetime.max
7474
timestamp = super().get_backend_timeout(timeout)
75-
return datetime.fromtimestamp(timestamp, tz=timezone.utc)
75+
return datetime.fromtimestamp(timestamp, tz=UTC)
7676

7777
def get(self, key, default=None, version=None):
7878
return self.get_many([key], version).get(key, default)

django_mongodb_backend/features.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,11 @@ class DatabaseFeatures(BaseDatabaseFeatures):
8686
# Value.as_mql() doesn't call output_field.get_db_prep_save():
8787
# https://github.com/mongodb/django-mongodb-backend/issues/282
8888
"model_fields.test_jsonfield.TestSaveLoad.test_bulk_update_custom_get_prep_value",
89+
# This backend overrides DatabaseCreation.create_test_db() so the
90+
# deprecation warnings stacklevel points to the wrong file.
91+
"backends.base.test_creation.TestDbCreationTests.test_serialize_deprecation",
92+
# This backend has a custom format_debug_sql().
93+
"backends.tests.LastExecutedQueryTest.test_debug_sql",
8994
}
9095
# $bitAnd, #bitOr, and $bitXor are new in MongoDB 6.3.
9196
_django_test_expected_failures_bitwise = {

pyproject.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dynamic = ["version", "dependencies"]
88
description = "Django MongoDB Backend"
99
readme = "README.md"
1010
license = {file="LICENSE"}
11-
requires-python = ">=3.10"
11+
requires-python = ">=3.12"
1212
authors = [
1313
{ name = "The MongoDB Python Team" },
1414
]
@@ -27,8 +27,6 @@ classifiers = [
2727
"Operating System :: OS Independent",
2828
"Programming Language :: Python :: 3",
2929
"Programming Language :: Python :: 3 :: Only",
30-
"Programming Language :: Python :: 3.10",
31-
"Programming Language :: Python :: 3.11",
3230
"Programming Language :: Python :: 3.12",
3331
"Programming Language :: Python :: 3.13",
3432
]

0 commit comments

Comments
 (0)