From dc389eafe7031e1cffb0d28c5bb5053c98b785cd Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Fri, 3 Feb 2023 12:43:35 +0100 Subject: [PATCH] Update setuptools to 67.1 (#9664) Replace some instances of `Any` with `Incomplete` or proper types. --- stubs/setuptools/METADATA.toml | 2 +- stubs/setuptools/pkg_resources/__init__.pyi | 6 ++-- stubs/setuptools/setuptools/msvc.pyi | 34 ++++++++++----------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/stubs/setuptools/METADATA.toml b/stubs/setuptools/METADATA.toml index 87ae9c5fc..31d16cccd 100644 --- a/stubs/setuptools/METADATA.toml +++ b/stubs/setuptools/METADATA.toml @@ -1,2 +1,2 @@ -version = "65.7.*" +version = "67.1.*" requires = ["types-docutils"] diff --git a/stubs/setuptools/pkg_resources/__init__.pyi b/stubs/setuptools/pkg_resources/__init__.pyi index ab404d407..efa7329be 100644 --- a/stubs/setuptools/pkg_resources/__init__.pyi +++ b/stubs/setuptools/pkg_resources/__init__.pyi @@ -7,8 +7,7 @@ from collections.abc import Callable, Generator, Iterable, Sequence from typing import IO, Any, TypeVar, overload from typing_extensions import TypeAlias -_LegacyVersion: TypeAlias = Any # from packaging.version -_Version: TypeAlias = Any # from packaging.version +_Version: TypeAlias = Incomplete # from packaging.version _T = TypeVar("_T") _NestedStr: TypeAlias = str | Iterable[str | Iterable[Any]] @@ -263,7 +262,8 @@ empty_provider: EmptyProvider class FileMetadata(EmptyProvider, IResourceProvider): def __init__(self, path_to_pkg_info: str) -> None: ... -def parse_version(v: str) -> _Version | _LegacyVersion: ... +parse_version = _Version + def yield_lines(iterable: _NestedStr) -> Generator[str, None, None]: ... def split_sections(strs: _NestedStr) -> Generator[tuple[str | None, list[str]], None, None]: ... def safe_name(name: str) -> str: ... diff --git a/stubs/setuptools/setuptools/msvc.pyi b/stubs/setuptools/setuptools/msvc.pyi index f2420e06d..952f11893 100644 --- a/stubs/setuptools/setuptools/msvc.pyi +++ b/stubs/setuptools/setuptools/msvc.pyi @@ -1,14 +1,12 @@ from _typeshed import Incomplete -from typing import Any -PLAT_SPEC_TO_RUNTIME: Any +PLAT_SPEC_TO_RUNTIME: dict[str, str] -def msvc14_get_vc_env(plat_spec): ... -def msvc14_gen_lib_options(*args, **kwargs): ... +def msvc14_get_vc_env(plat_spec: str) -> dict[str, Incomplete]: ... class PlatformInfo: - current_cpu: Any - arch: Any + current_cpu: Incomplete + arch: Incomplete def __init__(self, arch) -> None: ... @property def target_cpu(self): ... @@ -19,8 +17,8 @@ class PlatformInfo: def cross_dir(self, forcex86: bool = ...): ... class RegistryInfo: - HKEYS: Any - pi: Any + HKEYS: Incomplete + pi: Incomplete def __init__(self, platform_info) -> None: ... @property def visualstudio(self): ... @@ -44,13 +42,13 @@ class RegistryInfo: def lookup(self, key, name): ... class SystemInfo: - WinDir: Any - ProgramFiles: Any - ProgramFilesx86: Any - ri: Any - pi: Any - known_vs_paths: Any - vs_ver: Any + WinDir: Incomplete + ProgramFiles: Incomplete + ProgramFilesx86: Incomplete + ri: Incomplete + pi: Incomplete + known_vs_paths: Incomplete + vs_ver: Incomplete def __init__(self, registry_info, vc_ver: Incomplete | None = ...) -> None: ... def find_reg_vs_vers(self): ... def find_programdata_vs_vers(self): ... @@ -86,9 +84,9 @@ class SystemInfo: def FrameworkVersion64(self): ... class EnvironmentInfo: - pi: Any - ri: Any - si: Any + pi: Incomplete + ri: Incomplete + si: Incomplete def __init__(self, arch, vc_ver: Incomplete | None = ..., vc_min_ver: int = ...) -> None: ... @property def vs_ver(self): ...