CI: Enable Ruff pyupgrade fixes

.pre-commit-config.yaml

@@ -12,11 +12,6 @@ repos:
       - id: debug-statements
       - id: check-merge-conflict
       - id: end-of-file-fixer
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.4.0
-    hooks:
-      - id: pyupgrade
-        args: ["--py38-plus"]
   - repo: https://github.com/charliermarsh/ruff-pre-commit
     rev: v0.0.270
     hooks:

django-stubs/conf/__init__.pyi

@@ -1,8 +1,7 @@
-from typing import Any
+from typing import Any, Literal
 
 from _typeshed import Self
 from django.utils.functional import LazyObject
-from typing_extensions import Literal
 
 # explicit dependency on standard settings to make it loaded
 from . import global_settings  # noqa: F401

django-stubs/conf/global_settings.pyi

@@ -3,9 +3,9 @@ from re import Pattern
 
 # This is defined here as a do-nothing function because we can't import
 # django.utils.translation -- that module depends on the settings.
-from typing import Any, Protocol
+from typing import Any, Literal, Protocol
 
-from typing_extensions import Literal, TypeAlias
+from typing_extensions import TypeAlias
 
 _Admins: TypeAlias = list[tuple[str, str]]
 

django-stubs/contrib/admin/options.pyi

@@ -1,5 +1,12 @@
 from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence
-from typing import Any, Generic, Optional, TypeVar, Union  # noqa: Y037  # https://github.com/python/mypy/issues/12211
+from typing import (  # noqa: Y037  # https://github.com/python/mypy/issues/12211
+    Any,
+    Generic,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+)
 
 from django import forms
 from django.contrib.admin.filters import FieldListFilter, ListFilter
@@ -33,7 +40,7 @@ from django.urls.resolvers import URLPattern
 from django.utils.datastructures import _ListOrTuple
 from django.utils.functional import _StrOrPromise
 from django.utils.safestring import SafeString
-from typing_extensions import Literal, TypeAlias, TypedDict
+from typing_extensions import TypeAlias, TypedDict
 
 IS_POPUP_VAR: str
 TO_FIELD_VAR: str
@@ -81,7 +88,7 @@ class BaseModelAdmin(Generic[_ModelT]):
     raw_id_fields: Sequence[str]
     fields: _FieldGroups | None
     exclude: Sequence[str] | None
-    fieldsets: Optional[_FieldsetSpec]
+    fieldsets: Optional[_FieldsetSpec]  # noqa: UP007
     form: type[forms.ModelForm[_ModelT]]
     filter_vertical: Sequence[str]
     filter_horizontal: Sequence[str]

django-stubs/contrib/admin/utils.pyi

@@ -1,6 +1,6 @@
 import datetime
 from collections.abc import Callable, Iterable, Sequence
-from typing import Any, overload
+from typing import Any, Literal, overload
 from uuid import UUID
 
 from django.contrib.admin.options import BaseModelAdmin
@@ -15,7 +15,7 @@ from django.forms.forms import BaseForm
 from django.forms.formsets import BaseFormSet
 from django.http.request import HttpRequest
 from django.utils.datastructures import _IndexableCollection
-from typing_extensions import Literal, TypedDict
+from typing_extensions import TypedDict
 
 class FieldIsAForeignKeyColumnName(Exception): ...
 

django-stubs/contrib/admin/views/main.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Callable, Iterable, Sequence
-from typing import Any
+from typing import Any, Literal
 
 from django.contrib.admin.filters import ListFilter
 from django.contrib.admin.options import ModelAdmin, _DisplayT, _ListFilterT
@@ -9,7 +9,6 @@ from django.db.models.options import Options
 from django.db.models.query import QuerySet
 from django.forms.formsets import BaseFormSet
 from django.http.request import HttpRequest
-from typing_extensions import Literal
 
 ALL_VAR: str
 ORDER_VAR: str

django-stubs/contrib/auth/base_user.pyi

@@ -1,10 +1,9 @@
-from typing import Any, TypeVar, overload
+from typing import Any, Literal, TypeVar, overload
 
 from django.db import models
 from django.db.models.base import Model
 from django.db.models.expressions import Combinable
 from django.db.models.fields import BooleanField
-from typing_extensions import Literal
 
 _T = TypeVar("_T", bound=Model)
 

django-stubs/contrib/auth/models.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Iterable
-from typing import Any, TypeVar
+from typing import Any, Literal, TypeVar
 
 from django.contrib.auth.base_user import AbstractBaseUser as AbstractBaseUser
 from django.contrib.auth.base_user import BaseUserManager as BaseUserManager
@@ -10,7 +10,7 @@ from django.db.models import QuerySet
 from django.db.models.base import Model
 from django.db.models.manager import EmptyManager
 from django.utils.functional import _StrOrPromise
-from typing_extensions import Literal, TypeAlias
+from typing_extensions import TypeAlias
 
 _AnyUser: TypeAlias = Model | AnonymousUser
 

django-stubs/contrib/gis/db/backends/postgis/operations.pyi

@@ -1,10 +1,9 @@
-from typing import Any
+from typing import Any, Literal
 
 from django.contrib.gis.db.backends.base.operations import BaseSpatialOperations
 from django.contrib.gis.db.backends.utils import SpatialOperator
 from django.db.backends.postgresql.operations import DatabaseOperations
 from django.db.models import Func
-from typing_extensions import Literal
 
 BILATERAL: Literal["bilateral"]
 

django-stubs/contrib/gis/gdal/layer.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Iterator
-from typing import Any, AnyStr, overload
+from typing import Any, AnyStr, Literal, overload
 
 from django.contrib.gis.gdal.base import GDALBase
 from django.contrib.gis.gdal.envelope import Envelope
@@ -9,7 +9,6 @@ from django.contrib.gis.gdal.geometries import OGRGeometry
 from django.contrib.gis.gdal.geomtype import OGRGeomType
 from django.contrib.gis.gdal.srs import SpatialReference
 from django.contrib.gis.geos.geometry import GEOSGeometry
-from typing_extensions import Literal
 
 class Layer(GDALBase):
     ptr: Any

django-stubs/contrib/gis/gdal/raster/band.pyi

@@ -1,7 +1,6 @@
-from typing import Any, overload
+from typing import Any, Literal, overload
 
 from django.contrib.gis.gdal.raster.base import GDALRasterBase
-from typing_extensions import Literal
 
 class GDALBand(GDALRasterBase):
     source: Any

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

@@ -1,9 +1,8 @@
-from typing import Any
+from typing import Any, Literal
 
 from django.db import models
 from django.db.models.lookups import PostgresOperatorLookup
 from psycopg2.extras import DateRange, DateTimeTZRange, NumericRange, Range
-from typing_extensions import Literal
 
 class RangeBoundary(models.Expression):
     lower: str

django-stubs/contrib/postgres/operations.pyi

@@ -1,7 +1,8 @@
+from typing import Literal
+
 from django.db.backends.base.schema import BaseDatabaseSchemaEditor
 from django.db.migrations import AddConstraint, AddIndex, RemoveIndex
 from django.db.migrations.operations.base import Operation
-from typing_extensions import Literal
 
 class CreateExtension(Operation):
     reversible: bool

django-stubs/contrib/staticfiles/finders.pyi

@@ -1,9 +1,8 @@
 from collections.abc import Iterable, Iterator, Sequence
-from typing import Any, overload
+from typing import Any, Literal, overload
 
 from django.core.checks.messages import CheckMessage
 from django.core.files.storage import FileSystemStorage, Storage
-from typing_extensions import Literal
 
 searched_locations: Any
 

django-stubs/core/exceptions.pyi

@@ -1,8 +1,7 @@
 from collections.abc import Iterator
-from typing import Any
+from typing import Any, Literal
 
 from django.utils.functional import _StrOrPromise
-from typing_extensions import Literal
 
 class FieldDoesNotExist(Exception): ...
 class AppRegistryNotReady(Exception): ...

django-stubs/core/management/base.pyi

@@ -1,12 +1,11 @@
 from argparse import ArgumentParser, HelpFormatter, Namespace
 from collections.abc import Callable, Iterable, Sequence
 from io import TextIOBase
-from typing import Any, TextIO
+from typing import Any, Literal, TextIO
 
 from django.apps.config import AppConfig
 from django.core.management.color import Style
 from django.utils.datastructures import _ListOrTuple
-from typing_extensions import Literal
 
 class CommandError(Exception):
     def __init__(self, *args: Any, returncode: int = ..., **kwargs: Any) -> None: ...

django-stubs/db/backends/mysql/base.pyi

@@ -1,8 +1,7 @@
 from collections.abc import Container, Iterator
-from typing import Any
+from typing import Any, Literal
 
 from django.db.backends.base.base import BaseDatabaseWrapper
-from typing_extensions import Literal
 
 from .client import DatabaseClient
 from .creation import DatabaseCreation

django-stubs/db/backends/utils.pyi

@@ -4,11 +4,11 @@ from contextlib import contextmanager
 from decimal import Decimal
 from logging import Logger
 from types import TracebackType
-from typing import Any, Protocol, overload
+from typing import Any, Literal, Protocol, overload
 from uuid import UUID
 
 from _typeshed import Self
-from typing_extensions import Literal, TypeAlias
+from typing_extensions import TypeAlias
 
 logger: Logger
 

django-stubs/db/migrations/operations/special.pyi

@@ -1,10 +1,9 @@
 from collections.abc import Mapping, Sequence
-from typing import Any, Optional, Protocol  # noqa: Y037  # https://github.com/python/mypy/issues/12211
+from typing import Any, Literal, Protocol
 
 from django.db.backends.base.schema import BaseDatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 from django.utils.datastructures import _ListOrTuple
-from typing_extensions import Literal
 
 from .base import Operation
 
@@ -17,14 +16,14 @@ class SeparateDatabaseAndState(Operation):
 
 class RunSQL(Operation):
     noop: Literal[""]
-    sql: str | _ListOrTuple[str | tuple[str, dict[str, Any] | Optional[_ListOrTuple[str]]]]
-    reverse_sql: str | None | _ListOrTuple[str | tuple[str, dict[str, Any] | Optional[_ListOrTuple[str]]]]
+    sql: str | _ListOrTuple[str | tuple[str, dict[str, Any] | _ListOrTuple[str] | None]]
+    reverse_sql: str | None | _ListOrTuple[str | tuple[str, dict[str, Any] | _ListOrTuple[str] | None]]
     state_operations: Sequence[Operation]
     hints: Mapping[str, Any]
     def __init__(
         self,
-        sql: str | _ListOrTuple[str | tuple[str, dict[str, Any] | Optional[_ListOrTuple[str]]]],
-        reverse_sql: str | None | _ListOrTuple[str | tuple[str, dict[str, Any] | Optional[_ListOrTuple[str]]]] = ...,
+        sql: str | _ListOrTuple[str | tuple[str, dict[str, Any] | _ListOrTuple[str] | None]],
+        reverse_sql: str | None | _ListOrTuple[str | tuple[str, dict[str, Any] | _ListOrTuple[str] | None]] = ...,
         state_operations: Sequence[Operation] = ...,
         hints: Mapping[str, Any] | None = ...,
         elidable: bool = ...,

django-stubs/db/migrations/operations/utils.pyi

@@ -1,9 +1,9 @@
 from collections import namedtuple
 from collections.abc import Iterator
+from typing import Literal
 
 from django.db.migrations.state import ModelState, ProjectState
 from django.db.models import Field, Model
-from typing_extensions import Literal
 
 def resolve_relation(
     model: str | type[Model], app_label: str | None = ..., model_name: str | None = ...

django-stubs/db/models/base.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Collection, Iterable, Sequence
-from typing import Any, TypeVar
+from typing import Any, Final, TypeVar
 
 from _typeshed import Self
 from django.core.checks.messages import CheckMessage
@@ -8,7 +8,6 @@ from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db.models import BaseConstraint, Field
 from django.db.models.manager import BaseManager
 from django.db.models.options import Options
-from typing_extensions import Final
 
 _Self = TypeVar("_Self", bound=Model)
 

django-stubs/db/models/expressions.pyi

@@ -1,7 +1,7 @@
 import datetime
 from collections.abc import Callable, Iterable, Iterator, Sequence
 from decimal import Decimal
-from typing import Any
+from typing import Any, Literal
 
 from _typeshed import Self
 from django.db.backends.base.base import BaseDatabaseWrapper
@@ -11,7 +11,7 @@ from django.db.models.lookups import Lookup, Transform
 from django.db.models.query import QuerySet
 from django.db.models.sql.compiler import SQLCompiler, _AsSqlType
 from django.db.models.sql.query import Query
-from typing_extensions import Literal, TypeAlias
+from typing_extensions import TypeAlias
 
 class SQLiteNumericMixin:
     def as_sqlite(self, compiler: SQLCompiler, connection: BaseDatabaseWrapper, **extra_context: Any) -> _AsSqlType: ...

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

@@ -1,5 +1,5 @@
 from collections.abc import Callable, Iterable, Sequence
-from typing import Any, TypeVar, overload
+from typing import Any, Literal, TypeVar, overload
 from uuid import UUID
 
 from django.core import validators  # due to weird mypy.stubtest error
@@ -21,7 +21,7 @@ from django.db.models.fields.reverse_related import OneToOneRel as OneToOneRel
 from django.db.models.manager import RelatedManager
 from django.db.models.query_utils import FilteredRelation, PathInfo, Q
 from django.utils.functional import _StrOrPromise
-from typing_extensions import Literal, Self
+from typing_extensions import Self
 
 RECURSIVE_RELATIONSHIP_CONSTANT: Literal["self"]
 

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

@@ -1,13 +1,12 @@
 from collections.abc import Callable, Sequence
-from typing import Any
+from typing import Any, Literal
 
 from django.db.models.base import Model
 from django.db.models.fields import AutoField, Field, _AllLimitChoicesTo, _ChoicesList, _LimitChoicesTo
 from django.db.models.fields.related import ForeignKey, ForeignObject, ManyToManyField, OneToOneField
 from django.db.models.lookups import Lookup, StartsWith
 from django.db.models.query_utils import FilteredRelation, PathInfo
 from django.db.models.sql.where import WhereNode
-from typing_extensions import Literal
 
 from .mixins import FieldCacheMixin
 

django-stubs/db/models/lookups.pyi

@@ -1,13 +1,12 @@
 from collections.abc import Iterable, Mapping
-from typing import Any, Generic, TypeVar
+from typing import Any, Generic, Literal, TypeVar
 
 from _typeshed import Self
 from django.db.backends.base.base import BaseDatabaseWrapper
 from django.db.models.expressions import Expression, Func
 from django.db.models.query_utils import RegisterLookupMixin
 from django.db.models.sql.compiler import SQLCompiler, _AsSqlType, _ParamT
 from django.utils.datastructures import OrderedSet
-from typing_extensions import Literal
 
 _T = TypeVar("_T")
 

django-stubs/db/models/options.pyi

@@ -1,5 +1,12 @@
 from collections.abc import Iterable, Sequence
-from typing import Any, Generic, TypeVar, Union, overload  # noqa: Y037   # https://github.com/python/mypy/issues/12211
+from typing import (  # noqa: Y037   # https://github.com/python/mypy/issues/12211
+    Any,
+    Generic,
+    Literal,
+    TypeVar,
+    Union,
+    overload,
+)
 
 from django.apps.config import AppConfig
 from django.apps.registry import Apps
@@ -14,7 +21,7 @@ from django.db.models.manager import Manager
 from django.db.models.query_utils import PathInfo
 from django.utils.datastructures import ImmutableList, _ListOrTuple
 from django.utils.functional import _StrOrPromise
-from typing_extensions import Literal, TypeAlias
+from typing_extensions import TypeAlias
 
 PROXY_PARENTS: object
 EMPTY_RELATION_TREE: Any