diff --git a/stubs/setuptools/@tests/stubtest_allowlist.txt b/stubs/setuptools/@tests/stubtest_allowlist.txt index 5a89cfe5a..f829d404c 100644 --- a/stubs/setuptools/@tests/stubtest_allowlist.txt +++ b/stubs/setuptools/@tests/stubtest_allowlist.txt @@ -103,6 +103,7 @@ setuptools._distutils.command.install_data setuptools._distutils.command.install_egg_info setuptools._distutils.command.install_headers setuptools._distutils.compat.py38 +setuptools._distutils.compat.py39 setuptools._distutils.core setuptools._distutils.cygwinccompiler setuptools._distutils.debug @@ -112,8 +113,6 @@ setuptools._distutils.file_util setuptools._distutils.log setuptools._distutils.msvc9compiler setuptools._distutils.msvccompiler -setuptools._distutils.py38compat -setuptools._distutils.py39compat setuptools._distutils.spawn setuptools._distutils.text_file setuptools._distutils.unixccompiler @@ -125,9 +124,10 @@ setuptools._distutils.zosccompiler distutils\..+ # Private APIs -setuptools.config._validate_pyproject.* +setuptools\.config\._validate_pyproject.* setuptools.command.build_py.build_py.existing_egg_info_dir # Other vendored code -setuptools._vendor.* -pkg_resources._vendor.* +pkg_resources\._vendor.* +setuptools\._distutils\._vendor.* +setuptools\._vendor.* diff --git a/stubs/setuptools/METADATA.toml b/stubs/setuptools/METADATA.toml index ba9bae6d6..913ffb97e 100644 --- a/stubs/setuptools/METADATA.toml +++ b/stubs/setuptools/METADATA.toml @@ -1,4 +1,4 @@ -version = "70.1.*" +version = "70.2.*" upstream_repository = "https://github.com/pypa/setuptools" [tool.stubtest] diff --git a/stubs/setuptools/setuptools/_distutils/archive_util.pyi b/stubs/setuptools/setuptools/_distutils/archive_util.pyi index 4138c864f..0c47c381c 100644 --- a/stubs/setuptools/setuptools/_distutils/archive_util.pyi +++ b/stubs/setuptools/setuptools/_distutils/archive_util.pyi @@ -1,5 +1,5 @@ from _typeshed import StrOrBytesPath, StrPath -from typing import Literal, overload +from typing import overload @overload def make_archive( @@ -7,8 +7,8 @@ def make_archive( format: str, root_dir: StrOrBytesPath | None = None, base_dir: str | None = None, - verbose: bool | Literal[0, 1] = 0, - dry_run: bool | Literal[0, 1] = 0, + verbose: bool = False, + dry_run: bool = False, owner: str | None = None, group: str | None = None, ) -> str: ... @@ -18,8 +18,8 @@ def make_archive( format: str, root_dir: StrOrBytesPath, base_dir: str | None = None, - verbose: bool | Literal[0, 1] = 0, - dry_run: bool | Literal[0, 1] = 0, + verbose: bool = False, + dry_run: bool = False, owner: str | None = None, group: str | None = None, ) -> str: ... @@ -27,9 +27,9 @@ def make_tarball( base_name: str, base_dir: StrPath, compress: str | None = ..., - verbose: bool | Literal[0, 1] = 0, - dry_run: bool | Literal[0, 1] = 0, + verbose: bool = False, + dry_run: bool = False, owner: str | None = ..., group: str | None = ..., ) -> str: ... -def make_zipfile(base_name: str, base_dir: str, verbose: bool | Literal[0, 1] = 0, dry_run: bool | Literal[0, 1] = 0) -> str: ... +def make_zipfile(base_name: str, base_dir: str, verbose: bool = False, dry_run: bool = False) -> str: ... diff --git a/stubs/setuptools/setuptools/_distutils/ccompiler.pyi b/stubs/setuptools/setuptools/_distutils/ccompiler.pyi index 21ecc75e5..bf7eff41e 100644 --- a/stubs/setuptools/setuptools/_distutils/ccompiler.pyi +++ b/stubs/setuptools/setuptools/_distutils/ccompiler.pyi @@ -13,11 +13,7 @@ def gen_lib_options( def gen_preprocess_options(macros: list[_Macro], include_dirs: list[str]) -> list[str]: ... def get_default_compiler(osname: str | None = ..., platform: str | None = ...) -> str: ... def new_compiler( - plat: str | None = ..., - compiler: str | None = ..., - verbose: bool | Literal[0, 1] = 0, - dry_run: bool | Literal[0, 1] = 0, - force: bool | Literal[0, 1] = 0, + plat: str | None = ..., compiler: str | None = ..., verbose: bool = False, dry_run: bool = False, force: bool = False ) -> CCompiler: ... def show_compilers() -> None: ... @@ -41,9 +37,7 @@ class CCompiler: library_dirs: list[str] runtime_library_dirs: list[str] objects: list[str] - def __init__( - self, verbose: bool | Literal[0, 1] = 0, dry_run: bool | Literal[0, 1] = 0, force: bool | Literal[0, 1] = 0 - ) -> None: ... + def __init__(self, verbose: bool = False, dry_run: bool = False, force: bool = False) -> None: ... def add_include_dir(self, dir: str) -> None: ... def set_include_dirs(self, dirs: list[str]) -> None: ... def add_library(self, libname: str) -> None: ... @@ -57,7 +51,7 @@ class CCompiler: def add_link_object(self, object: str) -> None: ... def set_link_objects(self, objects: list[str]) -> None: ... def detect_language(self, sources: str | list[str]) -> str | None: ... - def find_library_file(self, dirs: list[str], lib: str, debug: bool | Literal[0, 1] = 0) -> str | None: ... + def find_library_file(self, dirs: list[str], lib: str, debug: bool = False) -> str | None: ... def has_function( self, funcname: str, @@ -76,7 +70,7 @@ class CCompiler: output_dir: str | None = ..., macros: list[_Macro] | None = ..., include_dirs: list[str] | None = ..., - debug: bool | Literal[0, 1] = 0, + debug: bool = False, extra_preargs: list[str] | None = ..., extra_postargs: list[str] | None = ..., depends: list[str] | None = ..., @@ -86,7 +80,7 @@ class CCompiler: objects: list[str], output_libname: str, output_dir: str | None = ..., - debug: bool | Literal[0, 1] = 0, + debug: bool = False, target_lang: str | None = ..., ) -> None: ... def link( @@ -99,7 +93,7 @@ class CCompiler: library_dirs: list[str] | None = ..., runtime_library_dirs: list[str] | None = ..., export_symbols: list[str] | None = ..., - debug: bool | Literal[0, 1] = 0, + debug: bool = False, extra_preargs: list[str] | None = ..., extra_postargs: list[str] | None = ..., build_temp: str | None = ..., @@ -113,7 +107,7 @@ class CCompiler: libraries: list[str] | None = ..., library_dirs: list[str] | None = ..., runtime_library_dirs: list[str] | None = ..., - debug: bool | Literal[0, 1] = 0, + debug: bool = False, extra_preargs: list[str] | None = ..., extra_postargs: list[str] | None = ..., target_lang: str | None = ..., @@ -127,7 +121,7 @@ class CCompiler: library_dirs: list[str] | None = ..., runtime_library_dirs: list[str] | None = ..., export_symbols: list[str] | None = ..., - debug: bool | Literal[0, 1] = 0, + debug: bool = False, extra_preargs: list[str] | None = ..., extra_postargs: list[str] | None = ..., build_temp: str | None = ..., @@ -142,7 +136,7 @@ class CCompiler: library_dirs: list[str] | None = ..., runtime_library_dirs: list[str] | None = ..., export_symbols: list[str] | None = ..., - debug: bool | Literal[0, 1] = 0, + debug: bool = False, extra_preargs: list[str] | None = ..., extra_postargs: list[str] | None = ..., build_temp: str | None = ..., @@ -162,10 +156,10 @@ class CCompiler: @overload def executable_filename(self, basename: StrPath, strip_dir: Literal[1, True], output_dir: StrPath = ...) -> str: ... def library_filename( - self, libname: str, lib_type: str = "static", strip_dir: bool | Literal[0, 1] = 0, output_dir: StrPath = "" + self, libname: str, lib_type: str = "static", strip_dir: bool = False, output_dir: StrPath = "" ) -> str: ... def object_filenames( - self, source_filenames: Iterable[StrPath], strip_dir: bool | Literal[0, 1] = 0, output_dir: StrPath | None = ... + self, source_filenames: Iterable[StrPath], strip_dir: bool = False, output_dir: StrPath | None = ... ) -> list[str]: ... @overload def shared_object_filename(self, basename: str, strip_dir: Literal[0, False] = 0, output_dir: StrPath = ...) -> str: ... diff --git a/stubs/setuptools/setuptools/_distutils/cmd.pyi b/stubs/setuptools/setuptools/_distutils/cmd.pyi index fe309ed24..ee95d23c9 100644 --- a/stubs/setuptools/setuptools/_distutils/cmd.pyi +++ b/stubs/setuptools/setuptools/_distutils/cmd.pyi @@ -1,7 +1,7 @@ from _typeshed import BytesPath, Incomplete, StrOrBytesPath, StrPath, Unused from abc import abstractmethod from collections.abc import Callable, Iterable -from typing import Any, ClassVar, Literal, TypeVar, overload +from typing import Any, ClassVar, TypeVar, overload from .dist import Distribution @@ -28,8 +28,8 @@ class Command: def ensure_dirname(self, option: str) -> None: ... def get_command_name(self) -> str: ... def set_undefined_options(self, src_cmd: str, *option_pairs: tuple[str, str]) -> None: ... - def get_finalized_command(self, command: str, create: bool | Literal[0, 1] = 1) -> Command: ... - def reinitialize_command(self, command: Command | str, reinit_subcommands: bool | Literal[0, 1] = 0) -> Command: ... + def get_finalized_command(self, command: str, create: bool = True) -> Command: ... + def reinitialize_command(self, command: Command | str, reinit_subcommands: bool = False) -> Command: ... def run_command(self, command: str) -> None: ... def get_sub_commands(self) -> list[str]: ... def warn(self, msg: str) -> None: ... @@ -42,8 +42,8 @@ class Command: self, infile: StrPath, outfile: _StrPathT, - preserve_mode: bool | Literal[0, 1] = 1, - preserve_times: bool | Literal[0, 1] = 1, + preserve_mode: bool = True, + preserve_times: bool = True, link: str | None = None, level: Unused = 1, ) -> tuple[_StrPathT | str, bool]: ... @@ -52,8 +52,8 @@ class Command: self, infile: BytesPath, outfile: _BytesPathT, - preserve_mode: bool | Literal[0, 1] = 1, - preserve_times: bool | Literal[0, 1] = 1, + preserve_mode: bool = True, + preserve_times: bool = True, link: str | None = None, level: Unused = 1, ) -> tuple[_BytesPathT | bytes, bool]: ... @@ -61,16 +61,16 @@ class Command: self, infile: StrPath, outfile: str, - preserve_mode: bool | Literal[0, 1] = 1, - preserve_times: bool | Literal[0, 1] = 1, - preserve_symlinks: bool | Literal[0, 1] = 0, + preserve_mode: bool = True, + preserve_times: bool = True, + preserve_symlinks: bool = False, level: Unused = 1, ) -> list[str]: ... @overload def move_file(self, src: StrPath, dst: _StrPathT, level: Unused = 1) -> _StrPathT | str: ... @overload def move_file(self, src: BytesPath, dst: _BytesPathT, level: Unused = 1) -> _BytesPathT | bytes: ... - def spawn(self, cmd: Iterable[str], search_path: bool | Literal[0, 1] = 1, level: Unused = 1) -> None: ... + def spawn(self, cmd: Iterable[str], search_path: bool = True, level: Unused = 1) -> None: ... @overload def make_archive( self, diff --git a/stubs/setuptools/setuptools/_distutils/command/build_py.pyi b/stubs/setuptools/setuptools/_distutils/command/build_py.pyi index d40c00e6c..314d97ff3 100644 --- a/stubs/setuptools/setuptools/_distutils/command/build_py.pyi +++ b/stubs/setuptools/setuptools/_distutils/command/build_py.pyi @@ -1,5 +1,4 @@ from _typeshed import Incomplete -from typing import Literal from ..cmd import Command @@ -32,7 +31,7 @@ class build_py(Command): def find_all_modules(self): ... def get_source_files(self): ... def get_module_outfile(self, build_dir, package, module): ... - def get_outputs(self, include_bytecode: bool | Literal[0, 1] = 1): ... + def get_outputs(self, include_bytecode: bool = True): ... def build_module(self, module, module_file, package): ... def build_modules(self) -> None: ... def build_packages(self) -> None: ... diff --git a/stubs/setuptools/setuptools/_distutils/filelist.pyi b/stubs/setuptools/setuptools/_distutils/filelist.pyi index a20a471ff..4a74932e1 100644 --- a/stubs/setuptools/setuptools/_distutils/filelist.pyi +++ b/stubs/setuptools/setuptools/_distutils/filelist.pyi @@ -17,29 +17,21 @@ class FileList: def process_template_line(self, line: str) -> None: ... @overload def include_pattern( - self, pattern: str, anchor: bool | Literal[0, 1] = 1, prefix: str | None = ..., is_regex: Literal[0, False] = 0 + self, pattern: str, anchor: bool = True, prefix: str | None = ..., is_regex: Literal[0, False] = 0 ) -> bool: ... @overload def include_pattern(self, pattern: str | Pattern[str], *, is_regex: Literal[True, 1]) -> bool: ... @overload def include_pattern( - self, - pattern: str | Pattern[str], - anchor: bool | Literal[0, 1] = 1, - prefix: str | None = ..., - is_regex: bool | Literal[0, 1] = 0, + self, pattern: str | Pattern[str], anchor: bool = True, prefix: str | None = ..., is_regex: bool = False ) -> bool: ... @overload def exclude_pattern( - self, pattern: str, anchor: bool | Literal[0, 1] = 1, prefix: str | None = ..., is_regex: Literal[0, False] = 0 + self, pattern: str, anchor: bool = True, prefix: str | None = ..., is_regex: Literal[0, False] = 0 ) -> bool: ... @overload def exclude_pattern(self, pattern: str | Pattern[str], *, is_regex: Literal[True, 1]) -> bool: ... @overload def exclude_pattern( - self, - pattern: str | Pattern[str], - anchor: bool | Literal[0, 1] = 1, - prefix: str | None = ..., - is_regex: bool | Literal[0, 1] = 0, + self, pattern: str | Pattern[str], anchor: bool = True, prefix: str | None = ..., is_regex: bool = False ) -> bool: ... diff --git a/stubs/setuptools/setuptools/_distutils/sysconfig.pyi b/stubs/setuptools/setuptools/_distutils/sysconfig.pyi index 4a90dc202..0848e593e 100644 --- a/stubs/setuptools/setuptools/_distutils/sysconfig.pyi +++ b/stubs/setuptools/setuptools/_distutils/sysconfig.pyi @@ -17,8 +17,6 @@ def get_config_vars() -> dict[str, str | int]: ... def get_config_vars(arg: str, /, *args: str) -> list[str | int]: ... def get_config_h_filename() -> str: ... def get_makefile_filename() -> str: ... -def get_python_inc(plat_specific: bool | Literal[0, 1] = 0, prefix: str | None = ...) -> str: ... -def get_python_lib( - plat_specific: bool | Literal[0, 1] = 0, standard_lib: bool | Literal[0, 1] = 0, prefix: str | None = ... -) -> str: ... +def get_python_inc(plat_specific: bool = False, prefix: str | None = ...) -> str: ... +def get_python_lib(plat_specific: bool = False, standard_lib: bool = False, prefix: str | None = ...) -> str: ... def customize_compiler(compiler: CCompiler) -> None: ... diff --git a/stubs/setuptools/setuptools/_distutils/util.pyi b/stubs/setuptools/setuptools/_distutils/util.pyi index 0896bf77b..e57db280a 100644 --- a/stubs/setuptools/setuptools/_distutils/util.pyi +++ b/stubs/setuptools/setuptools/_distutils/util.pyi @@ -13,21 +13,18 @@ def subst_vars(s: str, local_vars: Mapping[str, str]) -> None: ... def grok_environment_error(exc: object, prefix: str = ...) -> str: ... def split_quoted(s: str) -> list[str]: ... def execute( - func: Callable[..., object], - args: tuple[Any, ...], - msg: str | None = ..., - verbose: bool | Literal[0, 1] = 0, - dry_run: bool | Literal[0, 1] = 0, + func: Callable[..., object], args: tuple[Any, ...], msg: str | None = ..., verbose: bool = False, dry_run: bool = False ) -> None: ... def strtobool(val: str) -> Literal[0, 1]: ... def byte_compile( py_files: list[str], optimize: int = ..., - force: bool | Literal[0, 1] = 0, + force: bool = False, prefix: str | None = ..., base_dir: str | None = ..., - verbose: bool | Literal[0, 1] = 1, - dry_run: bool | Literal[0, 1] = 0, + verbose: bool = True, + dry_run: bool = False, direct: bool | None = ..., ) -> None: ... def rfc822_escape(header: str) -> str: ... +def is_mingw() -> bool: ...