Merge branch 'master' into fix/pyright-unknown

.pre-commit-config.yaml

@@ -13,12 +13,12 @@ repos:
       - id: check-merge-conflict
       - id: end-of-file-fixer
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.7
+    rev: v0.1.8
     hooks:
       - id: ruff
         args: ["--fix", "--exit-non-zero-on-fix"]
   - repo: https://github.com/psf/black
-    rev: 23.11.0
+    rev: 23.12.0
     hooks:
       - id: black
   - repo: https://github.com/codespell-project/codespell

django-stubs/db/models/fields/json.pyi

@@ -4,6 +4,7 @@ from typing import Any, ClassVar, TypeVar
 
 from django.db.backends.base.base import BaseDatabaseWrapper
 from django.db.models import lookups
+from django.db.models.expressions import Expression
 from django.db.models.fields import TextField
 from django.db.models.lookups import PostgresOperatorLookup, Transform
 from django.db.models.sql.compiler import SQLCompiler
@@ -29,6 +30,7 @@ class JSONField(CheckFieldDefaultMixin, Field[_ST, _GT]):
         decoder: type[json.JSONDecoder] | None = ...,
         **kwargs: Any,
     ) -> None: ...
+    def from_db_value(self, value: str | None, expression: Expression, connection: BaseDatabaseWrapper) -> Any: ...
 
 class DataContains(PostgresOperatorLookup): ...
 class ContainedBy(PostgresOperatorLookup): ...

requirements.txt

@@ -1,5 +1,5 @@
 # Dev tools:
-black==23.11.0
+black==23.12.0
 pre-commit==3.5.0
 pytest==7.4.3
 pytest-mypy-plugins==3.0.0

scripts/stubtest/allowlist_todo.txt

@@ -396,7 +396,6 @@ django.contrib.gis.db.models.IntegerField.class_lookups
 django.contrib.gis.db.models.IntegerField.formfield
 django.contrib.gis.db.models.JSONField.class_lookups
 django.contrib.gis.db.models.JSONField.formfield
-django.contrib.gis.db.models.JSONField.from_db_value
 django.contrib.gis.db.models.JSONField.get_transform
 django.contrib.gis.db.models.Lookup.get_prep_lhs
 django.contrib.gis.db.models.Lookup.lookup_name
@@ -979,7 +978,6 @@ django.db.models.IntegerField.class_lookups
 django.db.models.IntegerField.formfield
 django.db.models.JSONField.class_lookups
 django.db.models.JSONField.formfield
-django.db.models.JSONField.from_db_value
 django.db.models.JSONField.get_transform
 django.db.models.Lookup.get_prep_lhs
 django.db.models.Lookup.lookup_name
@@ -1196,7 +1194,6 @@ django.db.models.fields.json.HasKeyLookup.as_sql
 django.db.models.fields.json.HasKeyLookup.as_sqlite
 django.db.models.fields.json.JSONField.class_lookups
 django.db.models.fields.json.JSONField.formfield
-django.db.models.fields.json.JSONField.from_db_value
 django.db.models.fields.json.JSONField.get_transform
 django.db.models.fields.json.KeyTextTransform.as_mysql
 django.db.models.fields.json.KeyTransform.as_mysql