From 5f9b0f4551a2699b75b4cf7688ef7730868e80cc Mon Sep 17 00:00:00 2001 From: Avasam Date: Mon, 13 Apr 2026 10:32:23 -0400 Subject: [PATCH] Move `from typing import TypeAlias` outside `if TYPE_CHECKING` --- setuptools/_path.py | 5 +---- setuptools/_reqs.py | 5 +---- setuptools/build_meta.py | 5 +---- setuptools/command/bdist_egg.py | 4 +--- setuptools/compat/py311.py | 4 +--- setuptools/config/_apply_pyprojecttoml.py | 4 +--- setuptools/config/setupcfg.py | 4 +--- setuptools/dist.py | 6 +----- setuptools/warnings.py | 5 +---- 9 files changed, 9 insertions(+), 33 deletions(-) diff --git a/setuptools/_path.py b/setuptools/_path.py index 0a5b26ea4b..3485f9e8c1 100644 --- a/setuptools/_path.py +++ b/setuptools/_path.py @@ -3,13 +3,10 @@ import contextlib import os import sys -from typing import TYPE_CHECKING, TypeVar +from typing import TypeAlias, TypeVar from more_itertools import unique_everseen -if TYPE_CHECKING: - from typing import TypeAlias - StrPath: TypeAlias = str | os.PathLike[str] # Same as _typeshed.StrPath StrPathT = TypeVar("StrPathT", bound=str | os.PathLike[str]) diff --git a/setuptools/_reqs.py b/setuptools/_reqs.py index 19ef375cf1..02e42446f3 100644 --- a/setuptools/_reqs.py +++ b/setuptools/_reqs.py @@ -2,14 +2,11 @@ from collections.abc import Callable, Iterable, Iterator from functools import lru_cache -from typing import TYPE_CHECKING, TypeVar, overload +from typing import TypeAlias, TypeVar, overload import jaraco.text as text from packaging.requirements import Requirement -if TYPE_CHECKING: - from typing import TypeAlias - _T = TypeVar("_T") _StrOrIter: TypeAlias = str | Iterable[str] diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py index c80f53321c..b1770486be 100644 --- a/setuptools/build_meta.py +++ b/setuptools/build_meta.py @@ -39,7 +39,7 @@ import warnings from collections.abc import Iterable, Iterator, Mapping from pathlib import Path -from typing import TYPE_CHECKING, NoReturn +from typing import NoReturn, TypeAlias import setuptools @@ -51,9 +51,6 @@ import distutils from distutils.util import strtobool -if TYPE_CHECKING: - from typing import TypeAlias - __all__ = [ 'get_requires_for_build_sdist', 'get_requires_for_build_wheel', diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py index 02c94faff0..eca759e52c 100644 --- a/setuptools/command/bdist_egg.py +++ b/setuptools/command/bdist_egg.py @@ -12,7 +12,7 @@ from collections.abc import Iterator from sysconfig import get_path, get_platform, get_python_version from types import CodeType -from typing import TYPE_CHECKING, AnyStr, Literal +from typing import TYPE_CHECKING, AnyStr, Literal, TypeAlias from setuptools import Command from setuptools.extension import Library @@ -23,8 +23,6 @@ from distutils.dir_util import mkpath, remove_tree if TYPE_CHECKING: - from typing import TypeAlias - from _typeshed import GenericPath # Same as zipfile._ZipFileMode from typeshed diff --git a/setuptools/compat/py311.py b/setuptools/compat/py311.py index 2aec70b8cc..36d63b18ac 100644 --- a/setuptools/compat/py311.py +++ b/setuptools/compat/py311.py @@ -3,11 +3,9 @@ import shutil import sys from collections.abc import Callable -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING, Any, TypeAlias if TYPE_CHECKING: - from typing import TypeAlias - from _typeshed import ExcInfo, StrOrBytesPath # Same as shutil._OnExcCallback from typeshed diff --git a/setuptools/config/_apply_pyprojecttoml.py b/setuptools/config/_apply_pyprojecttoml.py index 140969feee..90aff5706f 100644 --- a/setuptools/config/_apply_pyprojecttoml.py +++ b/setuptools/config/_apply_pyprojecttoml.py @@ -18,7 +18,7 @@ from inspect import cleandoc from itertools import chain from types import MappingProxyType -from typing import TYPE_CHECKING, Any, TypeVar +from typing import TYPE_CHECKING, Any, TypeAlias, TypeVar from .. import _static from .._path import StrPath @@ -27,8 +27,6 @@ from ..warnings import SetuptoolsDeprecationWarning, SetuptoolsWarning if TYPE_CHECKING: - from typing import TypeAlias - from setuptools._importlib import metadata from setuptools.dist import Distribution diff --git a/setuptools/config/setupcfg.py b/setuptools/config/setupcfg.py index 96aeb9a3c5..5888eb67ed 100644 --- a/setuptools/config/setupcfg.py +++ b/setuptools/config/setupcfg.py @@ -18,7 +18,7 @@ from collections import defaultdict from collections.abc import Callable, Iterable, Iterator from functools import partial, wraps -from typing import TYPE_CHECKING, Any, ClassVar, Generic, TypeVar, cast +from typing import TYPE_CHECKING, Any, ClassVar, Generic, TypeAlias, TypeVar, cast from packaging.markers import default_environment as marker_env from packaging.requirements import InvalidRequirement, Requirement @@ -31,8 +31,6 @@ from . import expand if TYPE_CHECKING: - from typing import TypeAlias - from setuptools.dist import Distribution from distutils.dist import DistributionMetadata diff --git a/setuptools/dist.py b/setuptools/dist.py index e600404198..511aa18b1d 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -10,7 +10,7 @@ from collections.abc import Iterable, Iterator, MutableMapping, Sequence from glob import glob from pathlib import Path -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING, Any, TypeAlias from more_itertools import partition, unique_everseen from packaging.markers import InvalidMarker, Marker @@ -43,10 +43,6 @@ from distutils.fancy_getopt import translate_longopt from distutils.util import strtobool -if TYPE_CHECKING: - from typing import TypeAlias - - __all__ = ['Distribution'] _sequence = tuple, list diff --git a/setuptools/warnings.py b/setuptools/warnings.py index 97f6971cf7..a96de49a44 100644 --- a/setuptools/warnings.py +++ b/setuptools/warnings.py @@ -12,10 +12,7 @@ from datetime import date from inspect import cleandoc from textwrap import indent -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from typing import TypeAlias +from typing import TypeAlias _DueDate: TypeAlias = tuple[int, int, int] # time tuple _INDENT = 8 * " "