Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reuse functools.cached_property definition instead of defining our own #1771

Merged
merged 6 commits into from
Oct 24, 2023

Conversation

intgr
Copy link
Collaborator

@intgr intgr commented Oct 15, 2023

I have made things!

This was motivated by my comments at #1761 (review).

Mypy has special handling for functools.cached_property, making it compatible with classvars and the @property decorator (mypy-play example). But this handling did not extend to our django.utils.functional.cached_property.

By simply re-exporting functools.cached_property, we can piggyback on the already existing infrastructure in typeshed/mypy.

Note that typeshed did not define functools.cached_property on Python 3.7 and older. So this will break for users of older Python versions. But I think that's fine since we advertise 3.8 as the minimal Python version.

Ping @flaeppe @UnknownPlatypus, any reservations about this approach here?

  • TODO: Would be useful to have a test for property/cached_property compatbility

Related issues

@UnknownPlatypus
Copy link
Contributor

UnknownPlatypus commented Oct 15, 2023

@intgr , I like this idea and was experimenting a bit with it yesterday for #1761 and related pr's.

I do think it's a good thing because we want the special mypy behavior, and doing this is the easiest way to get there. Django will also use functools.cached_property directly some day.


That being said, this PR breaks the stubtest.sh script.

Firstly with errors directly linked to django.utils.functional.cached_property we should just ignore.

django.utils.functional.cached_property errors
error: django.utils.functional.cached_property.__class_getitem__ is not present at runtime
Stub: in file /home/thibaut/workspace/django-stubs/django-stubs/utils/functional.pyi:196
def (cls: Type[functools.cached_property[_T`1]], item: Any) -> types.GenericAlias
Runtime:
MISSING

error: django.utils.functional.cached_property.__init__ is inconsistent, stub does not have argument "name"
Stub: in file /home/thibaut/workspace/django-stubs/django-stubs/utils/functional.pyi:187
def (self: functools.cached_property[_T`1], func: def (Any) -> _T`1)
Runtime: in file /home/thibaut/workspace/django-stubs/.venv/lib/python3.11/site-packages/django/utils/functional.py:26
def (self, func, name=None)

error: django.utils.functional.cached_property.__set__ is not present at runtime
Stub: in file /home/thibaut/workspace/django-stubs/django-stubs/utils/functional.pyi:194
def (self: functools.cached_property[_T`1], instance: builtins.object, value: _T`1)
Runtime:
MISSING

error: django.utils.functional.cached_property.name is not present in stub
Stub: in file /home/thibaut/workspace/django-stubs/django-stubs/utils/functional.pyi
MISSING
Runtime:
None

Secondly because every cached_property we declared in the stub defer in type from runtime (because we now declare them as functools.cached_property in stubs but they are actually django.utils.functional.cached_property at runtime.)

sample "cannot reconcile @Property on stub with runtime object" errors
error: django.urls.resolvers.URLResolver.url_patterns is inconsistent, cannot reconcile @property on stub with runtime object
Stub: in file /home/thibaut/workspace/django-stubs/django-stubs/urls/resolvers.pyi:129
def (self: django.urls.resolvers.URLResolver) -> builtins.list[Union[django.urls.resolvers.URLPattern, django.urls.resolvers.URLResolver]]
Runtime:
<django.utils.functional.cached_property object at 0x7f4e75b674d0>

error: django.urls.resolvers.URLResolver.urlconf_module is inconsistent, cannot reconcile @property on stub with runtime object
Stub: in file /home/thibaut/workspace/django-stubs/django-stubs/urls/resolvers.pyi:127
def (self: django.urls.resolvers.URLResolver) -> Union[types.ModuleType, None, typing.Sequence[Union[django.urls.resolvers.URLPattern, django.urls.resolvers.URLResolver]]]
Runtime:
<django.utils.functional.cached_property object at 0x7f4e75b67490>

error: django.utils.connection.BaseConnectionHandler.settings is inconsistent, cannot reconcile @property on stub with runtime object
Stub: in file /home/thibaut/workspace/django-stubs/django-stubs/utils/connection.pyi:22
def (self: django.utils.connection.BaseConnectionHandler[_T`1]) -> builtins.dict[builtins.str, Any]
Runtime:
<django.utils.functional.cached_property object at 0x7f4e75f0c2d0>

Both "issues" are not really a problem I think, if we go down this road, this is normal to have them. We just need to add some entries to the allowlist.txt file. Adding --generate-allowlist to the stubtest script should give you that.

Finally, I noticed that stubtest now don't raise errors for cases where runtime is a cached_property but stubs use a property. This might make it a bit more difficult to stay sync but since it mostly don't change anything, typing wise, it's probably ok.

TODO: Would be useful to have a test for property/cached_property compatbility

About that, you might want to extend the test that is currently failing in this MR.

Copy link
Member

@sobolevn sobolevn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the idea!

@flaeppe
Copy link
Member

flaeppe commented Oct 17, 2023

I also think this is what we want, piggybacking on the special treatment of functools.cached_property.

This is not a very fresh reference, but I'm gonna use it anyway: https://stackoverflow.com/a/68594071

So, if that still stands, which I think it does. We should really be more than fine, it's just unfortunate that it's difficult to get alignments with overrides..

Also, the ticket linked from SO above is relevant: https://code.djangoproject.com/ticket/30949

@intgr
Copy link
Collaborator Author

intgr commented Oct 17, 2023

I finally found the time to fix the tests as well.

Thanks for the pointers @UnknownPlatypus

As can be seen from the test diff, functools.cached_property has somewhat different behavior in mypy (on the class it appears as a function instead of a property descriptor). But for typical code using cached_property, this is unimportant.

Copy link
Member

@flaeppe flaeppe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@intgr intgr merged commit 3b2c257 into typeddjango:master Oct 24, 2023
35 checks passed
@intgr intgr deleted the reuse-functools-cached_property branch October 24, 2023 10:50
descope bot referenced this pull request in descope/django-descope Dec 30, 2023
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [django-stubs](https://togithub.com/typeddjango/django-stubs)
([changelog](https://togithub.com/typeddjango/django-stubs/releases)) |
dev | patch | `4.2.3` -> `4.2.7` |

---

### Release Notes

<details>
<summary>typeddjango/django-stubs (django-stubs)</summary>

###
[`v4.2.7`](https://togithub.com/typeddjango/django-stubs/releases/tag/4.2.7)

[Compare
Source](https://togithub.com/typeddjango/django-stubs/compare/4.2.6...4.2.7)

#### Headline changes

-   **mypy 1.7:** Recommended mypy version updated to 1.7.x
- Improved type inference for `ManyToManyField` and
`Model.<manytomany>.through`
- If you previously imported `RelatedManager` or `ManyRelatedManager`,
update those to django-stubs-ext:
`from django_stubs_ext.db.models.manager import ManyRelatedManager,
RelatedManager`
- It's now allowed to override Django's `@cached_property` properties
with class variables or `@property` properties.
- Even though Django 5.0 was released yesterday, this version does not
yet include any changes specific to Django 5.0.

#### Plugin improvements

- Improved `ManyToManyDescriptor` and fixed `Model.<manytomany>.through`
typing by [@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1805](https://togithub.com/typeddjango/django-stubs/pull/1805)
- Fixed `Self`-typed custom queryset methods to be compatible with
`QuerySet` by [@&#8203;moranabadie](https://togithub.com/moranabadie) in
[https://github.com/typeddjango/django-stubs/pull/1852](https://togithub.com/typeddjango/django-stubs/pull/1852)

#### django-stubs-ext

- django-stubs-ext: Export `RelatedManager`, `ManyRelatedManager`
stub-only classes by [@&#8203;intgr](https://togithub.com/intgr) in
[https://github.com/typeddjango/django-stubs/pull/1834](https://togithub.com/typeddjango/django-stubs/pull/1834)
- Updated `TypedModelMeta` `ordering` attribute to allow `OrderBy`
objects by
[@&#8203;HansAarneLiblik](https://togithub.com/HansAarneLiblik) in
[https://github.com/typeddjango/django-stubs/pull/1847](https://togithub.com/typeddjango/django-stubs/pull/1847)

#### Stubs fixes

- Added missing `search_help_text=` parameter to `ChangeList.__init__()`
by [@&#8203;quinox](https://togithub.com/quinox) in
[https://github.com/typeddjango/django-stubs/pull/1801](https://togithub.com/typeddjango/django-stubs/pull/1801)
- Allow additional types for SQL parameters in `migrations.RunSQL()` by
[@&#8203;UnknownPlatypus](https://togithub.com/UnknownPlatypus) in
[https://github.com/typeddjango/django-stubs/pull/1803](https://togithub.com/typeddjango/django-stubs/pull/1803)
- Allow custom Form class in `SuccessMessageMixin.form_valid()` by
[@&#8203;SukiCZ](https://togithub.com/SukiCZ) in
[https://github.com/typeddjango/django-stubs/pull/1812](https://togithub.com/typeddjango/django-stubs/pull/1812)
- Fixed `db_comment=` parameter position for
`django.db.models.Field.__init__()` by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1815](https://togithub.com/typeddjango/django-stubs/pull/1815)
- Added missing `RelatedField.__init__()` method and removed
`ForeignObject.__init__(db_constraint=)` parameter in Field constructors
by [@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1816](https://togithub.com/typeddjango/django-stubs/pull/1816)
- Fixed argument types of `assertNumQueries()` and
`assertQuerySetEqual()` by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1823](https://togithub.com/typeddjango/django-stubs/pull/1823)
- Fixed `get_deleted_objects()` return from `list[Model]` -> `list[str]`
by [@&#8203;golgor](https://togithub.com/golgor) in
[https://github.com/typeddjango/django-stubs/pull/1825](https://togithub.com/typeddjango/django-stubs/pull/1825)
- Removed incorrect `django.db.models` re-exports by
[@&#8203;intgr](https://togithub.com/intgr) in
[https://github.com/typeddjango/django-stubs/pull/1835](https://togithub.com/typeddjango/django-stubs/pull/1835)
- Fixed `TemplateResponse.cookies` attribute and `SimpleCookie` type by
[@&#8203;apollo13](https://togithub.com/apollo13) in
[https://github.com/typeddjango/django-stubs/pull/1702](https://togithub.com/typeddjango/django-stubs/pull/1702)

#### Stubs improvements

- Added stubs for `django.contrib.postgres.expressions` by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1765](https://togithub.com/typeddjango/django-stubs/pull/1765)
- Improved hints of `django.contrib.gis.gdal.libgdal` by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1811](https://togithub.com/typeddjango/django-stubs/pull/1811)
- Simulate `@deconstructible` as a mixin class by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1818](https://togithub.com/typeddjango/django-stubs/pull/1818)
- Improved types for `django.db.models.enums.*` modules by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1819](https://togithub.com/typeddjango/django-stubs/pull/1819)
- Added `BaseExpression.contains_subquery()` method (update to Django
4.2.7) by [@&#8203;intgr](https://togithub.com/intgr) in
[https://github.com/typeddjango/django-stubs/pull/1827](https://togithub.com/typeddjango/django-stubs/pull/1827)
- Improved types for multiple methods of `QuerySet` by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1822](https://togithub.com/typeddjango/django-stubs/pull/1822)
- Improved `Collector` and `NestedObjects` attributes, methods by
[@&#8203;intgr](https://togithub.com/intgr) in
[https://github.com/typeddjango/django-stubs/pull/1826](https://togithub.com/typeddjango/django-stubs/pull/1826)
- Added `django.db.models.functions.MD5()` database function by
[@&#8203;kevinmarsh](https://togithub.com/kevinmarsh) in
[https://github.com/typeddjango/django-stubs/pull/1830](https://togithub.com/typeddjango/django-stubs/pull/1830)
- Constrained multiple `BaseModelAdmin` attributes to be either list or
tuple by [@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1832](https://togithub.com/typeddjango/django-stubs/pull/1832)
- Constrained multiple `BaseModelAdmin` methods to return either list or
tuple by [@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1833](https://togithub.com/typeddjango/django-stubs/pull/1833)
- Accurately infer `capfirst()` `None` return by
[@&#8203;intgr](https://togithub.com/intgr) in
[https://github.com/typeddjango/django-stubs/pull/1842](https://togithub.com/typeddjango/django-stubs/pull/1842)
- Various improvements in `django.core.management.commands` modules by
[@&#8203;UnknownPlatypus](https://togithub.com/UnknownPlatypus) in
[https://github.com/typeddjango/django-stubs/pull/1829](https://togithub.com/typeddjango/django-stubs/pull/1829)
- Added `Model._do_update()` method signature by
[@&#8203;pfouque](https://togithub.com/pfouque) in
[https://github.com/typeddjango/django-stubs/pull/1854](https://togithub.com/typeddjango/django-stubs/pull/1854)

##### Stubs improvements: @&#8203;cached_property

- Reuse `functools.cached_property` definition instead of defining our
own by [@&#8203;intgr](https://togithub.com/intgr) in
[https://github.com/typeddjango/django-stubs/pull/1771](https://togithub.com/typeddjango/django-stubs/pull/1771)
- Updated `@property` attributes to `@cached_property` part 1 by
[@&#8203;UnknownPlatypus](https://togithub.com/UnknownPlatypus) in
[https://github.com/typeddjango/django-stubs/pull/1761](https://togithub.com/typeddjango/django-stubs/pull/1761)
- Updated `@property` attributes to `@cached_property` part 2 by
[@&#8203;UnknownPlatypus](https://togithub.com/UnknownPlatypus) in
[https://github.com/typeddjango/django-stubs/pull/1768](https://togithub.com/typeddjango/django-stubs/pull/1768)
- Updated Expression classes `output_field` to `@cached_property` or
`ClassVar` and improves type by
[@&#8203;UnknownPlatypus](https://togithub.com/UnknownPlatypus) in
[https://github.com/typeddjango/django-stubs/pull/1769](https://togithub.com/typeddjango/django-stubs/pull/1769)

#### Housekeeping

- Moved plugin generated `<Model>_RelatedManager` entries to allowlist
by [@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1806](https://togithub.com/typeddjango/django-stubs/pull/1806)
- Moved `RelatedManager` to
`django.db.models.fields.related_descriptors` by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1814](https://togithub.com/typeddjango/django-stubs/pull/1814)
- Restored `RelatedManager`, `ManyRelatedManager` to inherit from
`Manager` not `BaseManager` by
[@&#8203;intgr](https://togithub.com/intgr) in
[https://github.com/typeddjango/django-stubs/pull/1843](https://togithub.com/typeddjango/django-stubs/pull/1843)
- Upgraded to mypy 1.7.0 by [@&#8203;intgr](https://togithub.com/intgr)
in
[https://github.com/typeddjango/django-stubs/pull/1837](https://togithub.com/typeddjango/django-stubs/pull/1837)
- Unify plugin check for model type info by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1853](https://togithub.com/typeddjango/django-stubs/pull/1853)
- Version 4.2.7 release (django-stubs, django-stubs-ext) by
[@&#8203;intgr](https://togithub.com/intgr) in
[https://github.com/typeddjango/django-stubs/pull/1856](https://togithub.com/typeddjango/django-stubs/pull/1856)

#### New Contributors

- [@&#8203;SukiCZ](https://togithub.com/SukiCZ) made their first
contribution in
[https://github.com/typeddjango/django-stubs/pull/1812](https://togithub.com/typeddjango/django-stubs/pull/1812)
- [@&#8203;golgor](https://togithub.com/golgor) made their first
contribution in
[https://github.com/typeddjango/django-stubs/pull/1825](https://togithub.com/typeddjango/django-stubs/pull/1825)
- [@&#8203;HansAarneLiblik](https://togithub.com/HansAarneLiblik) made
their first contribution in
[https://github.com/typeddjango/django-stubs/pull/1847](https://togithub.com/typeddjango/django-stubs/pull/1847)
- [@&#8203;apollo13](https://togithub.com/apollo13) made their first
contribution in
[https://github.com/typeddjango/django-stubs/pull/1702](https://togithub.com/typeddjango/django-stubs/pull/1702)
- [@&#8203;pfouque](https://togithub.com/pfouque) made their first
contribution in
[https://github.com/typeddjango/django-stubs/pull/1854](https://togithub.com/typeddjango/django-stubs/pull/1854)

**Full Changelog**:
typeddjango/django-stubs@4.2.6...4.2.7

###
[`v4.2.6`](https://togithub.com/typeddjango/django-stubs/releases/tag/4.2.6)

[Compare
Source](https://togithub.com/typeddjango/django-stubs/compare/4.2.5...4.2.6)

#### Headline changes

- Fixed several bugs in version 4.2.5. Thanks to everyone for
contributing fixes on a short order!
- Removed direct mypy dependency. If you are using mypy, please add an
explicit `mypy` dev dependency to your project, or install django-stubs
with the extra `django-stubs[compatible-mypy]`.

Mypy remains **the only supported type checker**. Improvements for other
type checkers may be considered in the future, pull requests welcome.
See
[#&#8203;1628](https://togithub.com/typeddjango/django-stubs/issues/1628)
for details.

#### Plugin fixes

- Fixed `as_manager()` and `from_queryset()` when combined with `Self`
types
([#&#8203;1788](https://togithub.com/typeddjango/django-stubs/issues/1788))
by [@&#8203;moranabadie](https://togithub.com/moranabadie) in
[https://github.com/typeddjango/django-stubs/pull/1789](https://togithub.com/typeddjango/django-stubs/pull/1789)
- Fix IndexError crash when using `from_queryset()` of custom Manager
subclass by [@&#8203;moranabadie](https://togithub.com/moranabadie) in
[https://github.com/typeddjango/django-stubs/pull/1786](https://togithub.com/typeddjango/django-stubs/pull/1786)
- Revert "Use `parse_bool` implementation from mypy" by
[@&#8203;intgr](https://togithub.com/intgr) in
[https://github.com/typeddjango/django-stubs/pull/1792](https://togithub.com/typeddjango/django-stubs/pull/1792)
    (Turns out this was not necessary and will be reverted)

#### Stubs fixes

- Fixed `Field.formfield()`, `GeometryField.formfield()` method
arguments by [@&#8203;brianhelba](https://togithub.com/brianhelba) in
[https://github.com/typeddjango/django-stubs/pull/1778](https://togithub.com/typeddjango/django-stubs/pull/1778)

#### Stubs improvements

- Various improvements in `django.core.management` modules by
[@&#8203;UnknownPlatypus](https://togithub.com/UnknownPlatypus) in
[https://github.com/typeddjango/django-stubs/pull/1787](https://togithub.com/typeddjango/django-stubs/pull/1787)
- Various improvments in `django.db.backend.base` modules by
[@&#8203;UnknownPlatypus](https://togithub.com/UnknownPlatypus) in
[https://github.com/typeddjango/django-stubs/pull/1791](https://togithub.com/typeddjango/django-stubs/pull/1791)

#### Housekeeping

- Drop hard dependency on mypy by
[@&#8203;intgr](https://togithub.com/intgr) in
[https://github.com/typeddjango/django-stubs/pull/1782](https://togithub.com/typeddjango/django-stubs/pull/1782)
- Version 4.2.6 release (django-stubs only) by
[@&#8203;intgr](https://togithub.com/intgr) in
[https://github.com/typeddjango/django-stubs/pull/1794](https://togithub.com/typeddjango/django-stubs/pull/1794)

**Full Changelog**:
typeddjango/django-stubs@4.2.5...4.2.6

###
[`v4.2.5`](https://togithub.com/typeddjango/django-stubs/releases/tag/4.2.5)

[Compare
Source](https://togithub.com/typeddjango/django-stubs/compare/4.2.4...4.2.5)

#### Headline changes

-   **mypy 1.6:** Recommended mypy version updated to 1.6.x
- Next django-stubs version (4.2.6) will remove direct mypy dependency.
If you are using mypy, please add an explicit `mypy` dev dependency to
your project, or install django-stubs with the extra
`django-stubs[compatible-mypy]`.

Mypy remains **the only supported type checker**. Improvements for other
type checkers may be considered in the future, pull requests welcome.
See
[#&#8203;1628](https://togithub.com/typeddjango/django-stubs/issues/1628)
for details.
-   Officially added Python 3.12 support

#### Stubs fixes

- Made `default_storage` produce a `Storage` object by
[@&#8203;brianhelba](https://togithub.com/brianhelba) in
[https://github.com/typeddjango/django-stubs/pull/1665](https://togithub.com/typeddjango/django-stubs/pull/1665)
- Fixed wrong type hints for `SyndicationFeed` methods by
[@&#8203;WhyNotHugo](https://togithub.com/WhyNotHugo) in
[https://github.com/typeddjango/django-stubs/pull/1705](https://togithub.com/typeddjango/django-stubs/pull/1705)
- Fixed variance of `Migration.operations` attribute by
[@&#8203;asottile](https://togithub.com/asottile) in
[https://github.com/typeddjango/django-stubs/pull/1707](https://togithub.com/typeddjango/django-stubs/pull/1707)
- Fixed variance of all `Migration` list attributes by
[@&#8203;brianhelba](https://togithub.com/brianhelba) in
[https://github.com/typeddjango/django-stubs/pull/1710](https://togithub.com/typeddjango/django-stubs/pull/1710)
- Adjust `bases=` parameter in `CreateModel` migration op to allow for
mixins by [@&#8203;asottile](https://togithub.com/asottile) in
[https://github.com/typeddjango/django-stubs/pull/1708](https://togithub.com/typeddjango/django-stubs/pull/1708)
- Fixed `_Composable` protocol for compatibility with `psycopg2-stubs`
change by [@&#8203;andersk](https://togithub.com/andersk) in
[https://github.com/typeddjango/django-stubs/pull/1714](https://togithub.com/typeddjango/django-stubs/pull/1714)
- Various fixes and improvements in `django.views` modules by
[@&#8203;GabDug](https://togithub.com/GabDug) in
[https://github.com/typeddjango/django-stubs/pull/1716](https://togithub.com/typeddjango/django-stubs/pull/1716)
- Removed `null` and `validators` arguments from
`ManyToManyField.__init__` by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1720](https://togithub.com/typeddjango/django-stubs/pull/1720)
- Various fixes and improvements in `django.test` modules by
[@&#8203;UnknownPlatypus](https://togithub.com/UnknownPlatypus) in
[https://github.com/typeddjango/django-stubs/pull/1752](https://togithub.com/typeddjango/django-stubs/pull/1752)
- Fixed `BaseModelForm`, `ErrorList`, `ErrorDict` constructor
`renderer=` parameter by [@&#8203;GabDug](https://togithub.com/GabDug)
in
[https://github.com/typeddjango/django-stubs/pull/1690](https://togithub.com/typeddjango/django-stubs/pull/1690)

#### Stubs improvements

- Annotated return value of all `deconstruct` methods by
[@&#8203;brianhelba](https://togithub.com/brianhelba) in
[https://github.com/typeddjango/django-stubs/pull/1695](https://togithub.com/typeddjango/django-stubs/pull/1695)
- Added missing arguments to `SQLCompiler` methods by
[@&#8203;ashm-tech](https://togithub.com/ashm-tech) in
[https://github.com/typeddjango/django-stubs/pull/1689](https://togithub.com/typeddjango/django-stubs/pull/1689)
- Added missing `max_length` attribute to `forms.FileField` by
[@&#8203;GabDug](https://togithub.com/GabDug) in
[https://github.com/typeddjango/django-stubs/pull/1715](https://togithub.com/typeddjango/django-stubs/pull/1715)
- Added missing type arguments to various generic classes by
[@&#8203;GabDug](https://togithub.com/GabDug) in
[https://github.com/typeddjango/django-stubs/pull/1717](https://togithub.com/typeddjango/django-stubs/pull/1717)
- Added missing `Layer.num_feat` attribute (GeoDjango) by
[@&#8203;niconoe](https://togithub.com/niconoe) in
[https://github.com/typeddjango/django-stubs/pull/1722](https://togithub.com/typeddjango/django-stubs/pull/1722)
- Specify `AbstractBaseUser.REQUIRED_FIELDS` as `ClassVar` by
[@&#8203;WhyNotHugo](https://togithub.com/WhyNotHugo) in
[https://github.com/typeddjango/django-stubs/pull/1737](https://togithub.com/typeddjango/django-stubs/pull/1737)
- Improve `fields.Field.formfield()` method by
[@&#8203;WhyNotHugo](https://togithub.com/WhyNotHugo) in
[https://github.com/typeddjango/django-stubs/pull/1739](https://togithub.com/typeddjango/django-stubs/pull/1739)
- Added `ModelStateFieldsCacheDescriptor.__get__` method by
[@&#8203;asottile](https://togithub.com/asottile) in
[https://github.com/typeddjango/django-stubs/pull/1743](https://togithub.com/typeddjango/django-stubs/pull/1743)
- Update `Model._meta` to `ClassVar[Options[Self]]` by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1732](https://togithub.com/typeddjango/django-stubs/pull/1732)
- Improved `django.test.signals` types by
[@&#8203;UnknownPlatypus](https://togithub.com/UnknownPlatypus) in
[https://github.com/typeddjango/django-stubs/pull/1751](https://togithub.com/typeddjango/django-stubs/pull/1751)
- Updated Django to 4.2.6 and updated stubs by
[@&#8203;sobolevn](https://togithub.com/sobolevn) in
[https://github.com/typeddjango/django-stubs/pull/1757](https://togithub.com/typeddjango/django-stubs/pull/1757)
- Require 1 callable argument for `@cached_property` decorated method by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1766](https://togithub.com/typeddjango/django-stubs/pull/1766)
- Allow `psycopg2.sql.SQL` in `QuerySet.raw()` by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1767](https://togithub.com/typeddjango/django-stubs/pull/1767)
- Added missing stubs in `django.middleware.csrf` module by
[@&#8203;UnknownPlatypus](https://togithub.com/UnknownPlatypus) in
[https://github.com/typeddjango/django-stubs/pull/1770](https://togithub.com/typeddjango/django-stubs/pull/1770)
- Various improvements in `django.core.cache` modules by
[@&#8203;UnknownPlatypus](https://togithub.com/UnknownPlatypus) in
[https://github.com/typeddjango/django-stubs/pull/1774](https://togithub.com/typeddjango/django-stubs/pull/1774)
- Improved `Field.formfield()`, `GeometryField.formfield()` methods by
[@&#8203;brianhelba](https://togithub.com/brianhelba) in
[https://github.com/typeddjango/django-stubs/pull/1724](https://togithub.com/typeddjango/django-stubs/pull/1724)
- Fixed query `F.resolve_expression()` return type by
[@&#8203;schinckel](https://togithub.com/schinckel) in
[https://github.com/typeddjango/django-stubs/pull/1659](https://togithub.com/typeddjango/django-stubs/pull/1659)

#### Plugin improvements

- Resolve dynamic `Manager` methods through manager MRO by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1701](https://togithub.com/typeddjango/django-stubs/pull/1701)
- Use `functools.cached_property` instead of Django's in mypy plugin by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1721](https://togithub.com/typeddjango/django-stubs/pull/1721)
- Improved hints for `ReverseOneToOneDescriptor` and start using it by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1733](https://togithub.com/typeddjango/django-stubs/pull/1733)
- Add better support for `ManyToManyField`'s `through` model by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1719](https://togithub.com/typeddjango/django-stubs/pull/1719)
- Resolve any `settings.AUTH_USER_MODEL` used as `to=` in relation by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1746](https://togithub.com/typeddjango/django-stubs/pull/1746)
- Added missing `_default_manager` symbol to generated `through` model
by [@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1745](https://togithub.com/typeddjango/django-stubs/pull/1745)

#### Plugin crash fixes

- Gracefully handle unwanted types when creating fallback managers by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1728](https://togithub.com/typeddjango/django-stubs/pull/1728)
    Fixes some `AssertionError` crashes.
- Handle mismatching types in queryset method resolving gracefully by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1727](https://togithub.com/typeddjango/django-stubs/pull/1727)
    Fixes some `AssertionError` crashes.
- Fixed crash on bad arguments for model relationship fields by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1735](https://togithub.com/typeddjango/django-stubs/pull/1735)
    Fixes some `ValueError` crashes.

#### Documentation

- Fixed link to `django_stubs_ext` by
[@&#8203;tony](https://togithub.com/tony) in
[https://github.com/typeddjango/django-stubs/pull/1747](https://togithub.com/typeddjango/django-stubs/pull/1747)
&
[https://github.com/typeddjango/django-stubs/pull/1748](https://togithub.com/typeddjango/django-stubs/pull/1748)
- Add version 4.2.4 to version compatibility table by
[@&#8203;intgr](https://togithub.com/intgr) in
[https://github.com/typeddjango/django-stubs/pull/1758](https://togithub.com/typeddjango/django-stubs/pull/1758)

#### Housekeeping

- Removed a bunch of unused code by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1687](https://togithub.com/typeddjango/django-stubs/pull/1687)
- Removed redefinition of inherited `deconstruct` methods. by
[@&#8203;brianhelba](https://togithub.com/brianhelba) in
[https://github.com/typeddjango/django-stubs/pull/1693](https://togithub.com/typeddjango/django-stubs/pull/1693)
&
[https://github.com/typeddjango/django-stubs/pull/1694](https://togithub.com/typeddjango/django-stubs/pull/1694)
- Use `parse_bool` implementation from mypy by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1703](https://togithub.com/typeddjango/django-stubs/pull/1703)
- Specify error codes in `# type: ignore` comments for plugin code by
[@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1726](https://togithub.com/typeddjango/django-stubs/pull/1726)
- Specify error codes in `# type: ignore` comments in stubs files by
[@&#8203;UnknownPlatypus](https://togithub.com/UnknownPlatypus) in
[https://github.com/typeddjango/django-stubs/pull/1734](https://togithub.com/typeddjango/django-stubs/pull/1734)
- CI: Enable testing with Python 3.12 by
[@&#8203;intgr](https://togithub.com/intgr) in
[https://github.com/typeddjango/django-stubs/pull/1759](https://togithub.com/typeddjango/django-stubs/pull/1759)
- Bump mypy from 1.5.1 to 1.6.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/typeddjango/django-stubs/pull/1764](https://togithub.com/typeddjango/django-stubs/pull/1764)
- Tests: Add mypy error codes to typecheck by
[@&#8203;UnknownPlatypus](https://togithub.com/UnknownPlatypus) in
[https://github.com/typeddjango/django-stubs/pull/1773](https://togithub.com/typeddjango/django-stubs/pull/1773)
- chore: Migrate from flake8 to ruff by
[@&#8203;GabDug](https://togithub.com/GabDug) in
[https://github.com/typeddjango/django-stubs/pull/1718](https://togithub.com/typeddjango/django-stubs/pull/1718)
- Update black version by
[@&#8203;sobolevn](https://togithub.com/sobolevn) in
[https://github.com/typeddjango/django-stubs/pull/1776](https://togithub.com/typeddjango/django-stubs/pull/1776)
- Added test to verify that `Manager.from_queryset()` handles invalid
argument types by [@&#8203;flaeppe](https://togithub.com/flaeppe) in
[https://github.com/typeddjango/django-stubs/pull/1731](https://togithub.com/typeddjango/django-stubs/pull/1731)
- Version 4.2.5 release (django-stubs, django-stubs-ext) by
[@&#8203;intgr](https://togithub.com/intgr) in
[https://github.com/typeddjango/django-stubs/pull/1777](https://togithub.com/typeddjango/django-stubs/pull/1777)

#### New Contributors

- [@&#8203;ashm-tech](https://togithub.com/ashm-tech) made their first
contribution in
[https://github.com/typeddjango/django-stubs/pull/1689](https://togithub.com/typeddjango/django-stubs/pull/1689)
- [@&#8203;WhyNotHugo](https://togithub.com/WhyNotHugo) made their first
contribution in
[https://github.com/typeddjango/django-stubs/pull/1705](https://togithub.com/typeddjango/django-stubs/pull/1705)
- [@&#8203;niconoe](https://togithub.com/niconoe) made their first
contribution in
[https://github.com/typeddjango/django-stubs/pull/1722](https://togithub.com/typeddjango/django-stubs/pull/1722)
- [@&#8203;schinckel](https://togithub.com/schinckel) made their first
contribution in
[https://github.com/typeddjango/django-stubs/pull/1659](https://togithub.com/typeddjango/django-stubs/pull/1659)

**Full Changelog**:
typeddjango/django-stubs@4.2.4...4.2.5

###
[`v4.2.4`](https://togithub.com/typeddjango/django-stubs/releases/tag/4.2.4)

[Compare
Source](https://togithub.com/typeddjango/django-stubs/compare/4.2.3...4.2.4)

Most important changes:

- This version add Mypy `1.5.*` support and update `[compatible-mypy]`
extra to use `1.5.*`.
- We also update our stubs to be compatible with Django `4.2.5` (and all
prior versions of `4.2`).
- `django_stubs_ext/` folder was renamed to be just `ext/`, it should
not affect users (unless you install it from git)
- We no longer assume the `objects` attribute to be present on generic
Model classes. As per the [django
documentation](https://docs.djangoproject.com/en/4.2/topics/db/managers/#django.db.models.Model.\_default_manager),
code working with generic models should use the `_default_manager`
attribute instead.

This time there is no corresponding release of `django-stubs-ext`.

#### Plugin changes

- We now forbid to instantiate abstract models
[https://github.com/typeddjango/django-stubs/pull/1663](https://togithub.com/typeddjango/django-stubs/pull/1663)
[@&#8203;flaeppe](https://togithub.com/flaeppe)
- Manager attributes are now `ClassVar`s
[https://github.com/typeddjango/django-stubs/pull/1672](https://togithub.com/typeddjango/django-stubs/pull/1672)
[@&#8203;flaeppe](https://togithub.com/flaeppe)

Thanks a lot to all contributors and maintainers! 🎉

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy42NC4yIiwidXBkYXRlZEluVmVyIjoiMzcuNjQuMiIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Co-authored-by: descope[bot] <descope[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants