Bump ruff to 0.13.0 (#2828)

Author: sobolevn

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
         args: [--fix=lf]
       - id: check-case-conflict
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.12
+    rev: v0.13.0
     hooks:
       - id: ruff
         args: ["--fix", "--exit-non-zero-on-fix"]

django-stubs/contrib/admin/options.pyi

@@ -299,7 +299,7 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
 _ChildModelT = TypeVar("_ChildModelT", bound=Model)
 _ParentModelT = TypeVar("_ParentModelT", bound=Model)
 
-class InlineModelAdmin(Generic[_ChildModelT, _ParentModelT], BaseModelAdmin[_ChildModelT]):
+class InlineModelAdmin(BaseModelAdmin[_ChildModelT], Generic[_ChildModelT, _ParentModelT]):
     model: type[_ChildModelT]
     fk_name: str | None
     formset: type[BaseInlineFormSet[_ChildModelT, _ParentModelT, forms.ModelForm[_ChildModelT]]]

django-stubs/contrib/auth/forms.pyi

@@ -60,7 +60,7 @@ class SetUnusablePasswordMixin(Generic[_UserType]):
     def validate_password_for_user(self, user: _UserType, **kwargs: Any) -> None: ...
     def set_password_and_save(self, user: _User, commit: bool = True, **kwargs: Any) -> _User: ...
 
-class BaseUserCreationForm(Generic[_UserType], forms.ModelForm[_UserType]):
+class BaseUserCreationForm(forms.ModelForm[_UserType], Generic[_UserType]):
     error_messages: _ErrorMessagesDict
     password1: forms.Field
     password2: forms.Field
@@ -112,7 +112,7 @@ class PasswordResetForm(forms.Form):
         extra_email_context: dict[str, str] | None = ...,
     ) -> None: ...
 
-class SetPasswordForm(Generic[_UserType], SetPasswordMixin, forms.Form):
+class SetPasswordForm(SetPasswordMixin, forms.Form, Generic[_UserType]):
     new_password1: forms.Field
     new_password2: forms.Field
     user: _UserType
@@ -123,7 +123,7 @@ class PasswordChangeForm(SetPasswordForm):
     old_password: forms.Field
     def clean_old_password(self) -> str: ...
 
-class AdminPasswordChangeForm(Generic[_UserType], forms.Form):
+class AdminPasswordChangeForm(forms.Form, Generic[_UserType]):
     error_messages: _ErrorMessagesDict
     required_css_class: str
     usable_password_help_text: str

django-stubs/db/models/query.pyi

@@ -36,7 +36,7 @@ class BaseIterable(Generic[_T]):
     def __init__(self, queryset: QuerySet[Model], chunked_fetch: bool = False, chunk_size: int = 100) -> None: ...
     def __aiter__(self) -> AsyncIterator[_T]: ...
 
-class ModelIterable(Generic[_Model], BaseIterable[_Model]):
+class ModelIterable(BaseIterable[_Model], Generic[_Model]):
     def __iter__(self) -> Iterator[_Model]: ...
 
 class RawModelIterable(BaseIterable[dict[str, Any]]):
@@ -54,7 +54,7 @@ class NamedValuesListIterable(ValuesListIterable[NamedTuple]):
 class FlatValuesListIterable(BaseIterable[_T]):
     def __iter__(self) -> Iterator[_T]: ...
 
-class QuerySet(Generic[_Model, _Row], Iterable[_Row], Sized):
+class QuerySet(Iterable[_Row], Sized, Generic[_Model, _Row]):
     model: type[_Model]
     query: Query
     _iterable_class: type[BaseIterable]

django-stubs/forms/formsets.pyi

@@ -25,7 +25,7 @@ class ManagementForm(Form):
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
     def clean(self) -> dict[str, int | None]: ...
 
-class BaseFormSet(Generic[_F], Sized, RenderableFormMixin):
+class BaseFormSet(Sized, RenderableFormMixin, Generic[_F]):
     form: type[_F]
     extra: int
     can_order: bool

django-stubs/forms/models.pyi

@@ -67,7 +67,7 @@ class ModelFormOptions(Generic[_M]):
 
 class ModelFormMetaclass(DeclarativeFieldsMetaclass): ...
 
-class BaseModelForm(Generic[_M], BaseForm):
+class BaseModelForm(BaseForm, Generic[_M]):
     instance: _M
     _meta: ModelFormOptions[_M]
     def __init__(
@@ -108,7 +108,7 @@ def modelform_factory(
 
 _ModelFormT = TypeVar("_ModelFormT", bound=ModelForm)
 
-class BaseModelFormSet(Generic[_M, _ModelFormT], BaseFormSet[_ModelFormT]):
+class BaseModelFormSet(BaseFormSet[_ModelFormT], Generic[_M, _ModelFormT]):
     model: type[_M]
     edit_only: bool
     unique_fields: Collection[str]
@@ -171,7 +171,7 @@ def modelformset_factory(
     edit_only: bool = False,
 ) -> type[BaseModelFormSet[_M, _ModelFormT]]: ...
 
-class BaseInlineFormSet(Generic[_M, _ParentM, _ModelFormT], BaseModelFormSet[_M, _ModelFormT]):
+class BaseInlineFormSet(BaseModelFormSet[_M, _ModelFormT], Generic[_M, _ParentM, _ModelFormT]):
     instance: _ParentM
     save_as_new: bool
     unique_fields: Collection[str]

django-stubs/views/generic/detail.pyi

@@ -6,7 +6,7 @@ from django.views.generic.base import ContextMixin, TemplateResponseMixin, View
 
 _M = TypeVar("_M", bound=models.Model)
 
-class SingleObjectMixin(Generic[_M], ContextMixin):
+class SingleObjectMixin(ContextMixin, Generic[_M]):
     model: type[_M]
     queryset: models.query.QuerySet[_M] | None
     slug_field: str

django-stubs/views/generic/edit.pyi

@@ -13,7 +13,7 @@ _FormT = TypeVar("_FormT", bound=BaseForm)
 _ModelFormT = TypeVar("_ModelFormT", bound=BaseModelForm)
 _M = TypeVar("_M", bound=models.Model)
 
-class FormMixin(Generic[_FormT], ContextMixin):
+class FormMixin(ContextMixin, Generic[_FormT]):
     initial: dict[str, Any]
     form_class: type[_FormT] | None
     success_url: _StrOrPromise | None = None
@@ -28,7 +28,7 @@ class FormMixin(Generic[_FormT], ContextMixin):
     def form_invalid(self, form: _FormT) -> HttpResponse: ...
     def get_context_data(self, **kwargs: Any) -> dict[str, Any]: ...
 
-class ModelFormMixin(Generic[_M, _ModelFormT], FormMixin[_ModelFormT], SingleObjectMixin[_M]):
+class ModelFormMixin(FormMixin[_ModelFormT], SingleObjectMixin[_M], Generic[_M, _ModelFormT]):
     fields: _ListOrTuple[str] | Literal["__all__"] | None
     def get_form_class(self) -> type[_ModelFormT]: ...
     def get_form_kwargs(self) -> dict[str, Any]: ...
@@ -66,9 +66,9 @@ class DeletionMixin(Generic[_M]):
     def delete(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse: ...
     def get_success_url(self) -> str: ...
 
-class BaseDeleteView(Generic[_M, _ModelFormT], DeletionMixin[_M], FormMixin[_ModelFormT], BaseDetailView[_M]):
+class BaseDeleteView(DeletionMixin[_M], FormMixin[_ModelFormT], BaseDetailView[_M], Generic[_M, _ModelFormT]):
     object: _M
 
-class DeleteView(Generic[_M, _ModelFormT], SingleObjectTemplateResponseMixin, BaseDeleteView[_M, _ModelFormT]):
+class DeleteView(SingleObjectTemplateResponseMixin, BaseDeleteView[_M, _ModelFormT], Generic[_M, _ModelFormT]):
     object: _M
     template_name_suffix: str

django-stubs/views/generic/list.pyi

@@ -13,7 +13,7 @@ class _HasModel(Protocol):
     @property
     def model(self) -> type[Model]: ...
 
-class MultipleObjectMixin(Generic[_M], ContextMixin):
+class MultipleObjectMixin(ContextMixin, Generic[_M]):
     allow_empty: bool
     queryset: QuerySet[_M] | None
     model: type[_M] | None