Skip to content

Commit 4e31fb2

Browse files
adamchainzsobolevn
andauthored
Update a bunch of stuff for Django 5.1 (#2585)
From django/django@5e4c179: * `django.contrib.postgres.aggregates.general.JSONBAgg.__init__` removed From django/django@04eb1b4:: * `django.contrib.postgres.fields.citext.CIText` removed From django/django@6ad0dbc: * `django.test.signals.form_renderer_changed` added From django/django@fb92163: * `django.test.utils.garbage_collect` added From django/django@eff21d8: * `django.urls.resolvers.whitespace_set` added From django/django@3a3e737: * `django.core.signing.Signer.__init__` dropped support for positional arguments Co-authored-by: sobolevn <mail@sobolevn.me>
1 parent 04216c2 commit 4e31fb2

File tree

9 files changed

+9
-36
lines changed

9 files changed

+9
-36
lines changed

django-stubs/contrib/postgres/aggregates/general.pyi

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ class BoolOr(Aggregate):
3434

3535
class JSONBAgg(OrderableAggMixin, Aggregate):
3636
output_field: ClassVar[JSONField]
37-
def __init__(
38-
self, *expressions: BaseExpression | Combinable | str, default: Any | None = ..., **extra: Any
39-
) -> None: ...
4037
def resolve_expression(
4138
self,
4239
query: Any = ...,

django-stubs/contrib/postgres/fields/__init__.pyi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from .array import ArrayField as ArrayField
22
from .citext import CICharField as CICharField
33
from .citext import CIEmailField as CIEmailField
4-
from .citext import CIText as CIText
54
from .citext import CITextField as CITextField
65
from .hstore import HStoreField as HStoreField
76
from .jsonb import JSONField as JSONField
Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
from django.db.backends.base.base import BaseDatabaseWrapper
21
from django.db.models.fields import CharField, EmailField, TextField
32

4-
class CIText:
5-
def get_internal_type(self) -> str: ...
6-
def db_type(self, connection: BaseDatabaseWrapper) -> str: ...
7-
8-
class CICharField(CIText, CharField): ...
9-
class CIEmailField(CIText, EmailField): ...
10-
class CITextField(CIText, TextField): ...
3+
class CICharField(CharField): ...
4+
class CIEmailField(EmailField): ...
5+
class CITextField(TextField): ...

django-stubs/core/signing.pyi

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
from datetime import timedelta
2-
from typing import Any, Protocol, overload, type_check_only
3-
4-
from typing_extensions import deprecated
2+
from typing import Any, Protocol, type_check_only
53

64
BASE62_ALPHABET: str
75

@@ -45,7 +43,6 @@ class Signer:
4543
sep: str
4644
salt: bytes | str
4745
algorithm: str
48-
@overload
4946
def __init__(
5047
self,
5148
*,
@@ -55,17 +52,6 @@ class Signer:
5552
algorithm: str | None = None,
5653
fallback_keys: list[bytes | str] | None = None,
5754
) -> None: ...
58-
@overload
59-
@deprecated("Passing positional arguments to Signer is deprecated and will be removed in Django 5.1")
60-
def __init__(
61-
self,
62-
*args: Any,
63-
key: bytes | str | None = None,
64-
sep: str = ":",
65-
salt: bytes | str | None = None,
66-
algorithm: str | None = None,
67-
fallback_keys: list[bytes | str] | None = None,
68-
) -> None: ...
6955
def signature(self, value: bytes | str, key: bytes | str | None = None) -> str: ...
7056
def sign(self, value: str) -> str: ...
7157
def unsign(self, signed_value: str) -> str: ...

django-stubs/db/models/lookups.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class IntegerGreaterThanOrEqual(IntegerFieldOverflow, IntegerFieldFloatRounding,
9393
class IntegerLessThan(IntegerFieldOverflow, IntegerFieldFloatRounding, LessThan[int | float]): ...
9494
class IntegerLessThanOrEqual(IntegerFieldOverflow, LessThanOrEqual[int | float]): ...
9595

96-
class In(FieldGetDbPrepValueIterableMixin, BuiltinLookup):
96+
class In(FieldGetDbPrepValueIterableMixin, BuiltinLookup[_T]):
9797
def split_parameter_list_as_sql(self, compiler: SQLCompiler, connection: BaseDatabaseWrapper) -> Any: ...
9898

9999
class PatternLookup(BuiltinLookup[str]):

django-stubs/test/signals.pyi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ def complex_setting_changed(*, setting: str, enter: bool, **kwargs: Any) -> None
1818
def root_urlconf_changed(*, setting: str, **kwargs: Any) -> None: ...
1919
def static_storage_changed(*, setting: str, **kwargs: Any) -> None: ...
2020
def static_finders_changed(*, setting: str, **kwargs: Any) -> None: ...
21+
def form_renderer_changed(*, setting: str, **kwargs: Any) -> None: ...
2122
def auth_password_validators_changed(*, setting: str, **kwargs: Any) -> None: ...
2223
def user_model_swapped(*, setting: str, **kwargs: Any) -> None: ...

django-stubs/test/utils.pyi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,3 +169,4 @@ def require_jinja2(test_func: _C) -> _C: ...
169169
def register_lookup(
170170
field: type[RegisterLookupMixin], *lookups: type[Lookup | Transform], lookup_name: str | None = ...
171171
) -> AbstractContextManager[None]: ...
172+
def garbage_collect() -> None: ...

django-stubs/urls/resolvers.pyi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ class RegexPattern(CheckURLMixin):
6464
def match(self, path: str) -> tuple[str, tuple, dict[str, str]] | None: ...
6565
def check(self) -> list[CheckMessage]: ...
6666

67+
whitespace_set: frozenset[str]
68+
6769
class LocaleRegexRouteDescriptor:
6870
def __get__(self, instance: RoutePattern | None, cls: type | None = None) -> Pattern[str]: ...
6971

scripts/stubtest/allowlist_todo_django51.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,7 @@ django.contrib.gis.gdal.prototypes.raster.get_driver_description
3232
django.contrib.gis.gdal.prototypes.raster.register_all
3333
django.contrib.gis.geoip2.GeoIP2.info
3434
django.contrib.gis.geoip2.resources
35-
django.contrib.postgres.aggregates.JSONBAgg.__init__
36-
django.contrib.postgres.aggregates.general.JSONBAgg.__init__
37-
django.contrib.postgres.fields.CIText
38-
django.contrib.postgres.fields.citext.CIText
3935
django.contrib.postgres.indexes.BTreeIndex.__init__
40-
django.core.signing.Signer.__init__
4136
django.db.backends.oracle.features.DatabaseFeatures.bare_select_suffix
4237
django.db.backends.oracle.features.DatabaseFeatures.supports_aggregation_over_interval_types
4338
django.db.backends.oracle.features.DatabaseFeatures.supports_comparing_boolean_expr
@@ -53,9 +48,6 @@ django.db.models.fields.reverse_related.ForeignObjectRel.accessor_name
5348
django.db.models.lookups.In.get_refs
5449
django.forms.ModelChoiceField.validate_no_null_characters
5550
django.forms.models.ModelChoiceField.validate_no_null_characters
56-
django.test.signals.form_renderer_changed
57-
django.test.utils.garbage_collect
58-
django.urls.resolvers.whitespace_set
5951

6052
# Only discrepancies that appeared after Django 4.2 -> 5.0 update.
6153
# Unsorted: there are real problems and things we can really ignore:

0 commit comments

Comments
 (0)