diff --git a/lib/ts_utils/mypy.py b/lib/ts_utils/mypy.py index 5bfcfc1528c8..17cba6978061 100644 --- a/lib/ts_utils/mypy.py +++ b/lib/ts_utils/mypy.py @@ -22,7 +22,7 @@ class MypyDistConf(NamedTuple): # The configuration section in the metadata file looks like the following, with multiple module sections possible # [mypy-tests] # [mypy-tests.yaml] -# module_name = "yaml" +# module-name = "yaml" # [mypy-tests.yaml.values] # disallow_incomplete_defs = true # disallow_untyped_defs = true @@ -39,9 +39,9 @@ def mypy_configuration_from_distribution(distribution: str) -> list[MypyDistConf def validate_configuration(section_name: str, mypy_section: dict[str, Any]) -> MypyDistConf: assert isinstance(mypy_section, dict), f"{section_name} should be a section" - module_name = mypy_section.get("module_name") + module_name = mypy_section.get("module-name") - assert module_name is not None, f"{section_name} should have a module_name key" + assert module_name is not None, f"{section_name} should have a module-name key" assert isinstance(module_name, str), f"{section_name} should be a key-value pair" assert "values" in mypy_section, f"{section_name} should have a values section" diff --git a/stubs/setuptools/@tests/stubtest_allowlist.txt b/stubs/setuptools/@tests/stubtest_allowlist.txt index 8c90ae0ad483..ec19bc003004 100644 --- a/stubs/setuptools/@tests/stubtest_allowlist.txt +++ b/stubs/setuptools/@tests/stubtest_allowlist.txt @@ -37,6 +37,7 @@ setuptools._distutils.command.install.INSTALL_SCHEMES setuptools._distutils.command.install.SCHEME_KEYS setuptools._distutils.command.install.WINDOWS_SCHEME setuptools._distutils.command.install_lib.PYTHON_SOURCE_EXTENSION +setuptools._distutils.dir_util.SkipRepeatAbsolutePaths.instance setuptools._distutils.dist.fix_help_options setuptools._distutils.extension.read_setup_file setuptools._distutils.filelist.findall @@ -52,7 +53,6 @@ setuptools._distutils.sysconfig.parse_config_h setuptools._distutils.sysconfig.parse_makefile setuptools._distutils.sysconfig.project_base setuptools._distutils.sysconfig.python_build -setuptools._distutils.util.is_freethreaded setuptools._distutils.util.MACOSX_VERSION_VAR # Missing submodules from setuptools._distutils @@ -70,9 +70,7 @@ setuptools._distutils.compat.numpy setuptools._distutils.compat.py39 setuptools._distutils.core setuptools._distutils.debug -setuptools._distutils.dir_util setuptools._distutils.fancy_getopt -setuptools._distutils.file_util setuptools._distutils.log setuptools._distutils.text_file setuptools._distutils.version.Version._cmp # abstract method diff --git a/stubs/setuptools/METADATA.toml b/stubs/setuptools/METADATA.toml index 94860d1f20bf..2354f4fa48e2 100644 --- a/stubs/setuptools/METADATA.toml +++ b/stubs/setuptools/METADATA.toml @@ -1,4 +1,4 @@ -version = "82.0.*" +version = "83.0.*" upstream-repository = "https://github.com/pypa/setuptools" extra-description = """\ Given that `pkg_resources` is typed since `setuptools >= 71.1`, \ @@ -8,4 +8,9 @@ it is no longer included with `types-setuptools`. [tool.stubtest] # darwin is equivalent to linux for OS-specific methods ci-platforms = ["linux", "win32"] -stubtest-dependencies = ["tomli"] +stubtest-dependencies = ["more_itertools", "tomli"] + +# Stubtest fails on trying to run mypy on the source files rather than our stubs +[mypy-tests.distutils] +module-name = "setuptools._distutils.compilers.C.*" +values = { ignore_errors = true } diff --git a/stubs/setuptools/setuptools/_distutils/command/build.pyi b/stubs/setuptools/setuptools/_distutils/command/build.pyi index 90b51a8b8a0a..619b5e059b45 100644 --- a/stubs/setuptools/setuptools/_distutils/command/build.pyi +++ b/stubs/setuptools/setuptools/_distutils/command/build.pyi @@ -24,7 +24,7 @@ class build(Command): def initialize_options(self) -> None: ... def finalize_options(self) -> None: ... def run(self) -> None: ... - def has_pure_modules(self): ... - def has_c_libraries(self): ... - def has_ext_modules(self): ... - def has_scripts(self): ... + def has_pure_modules(self) -> bool: ... + def has_c_libraries(self) -> bool: ... + def has_ext_modules(self) -> bool: ... + def has_scripts(self) -> bool: ... diff --git a/stubs/setuptools/setuptools/_distutils/command/install.pyi b/stubs/setuptools/setuptools/_distutils/command/install.pyi index 4ddd43564efa..77d083545d05 100644 --- a/stubs/setuptools/setuptools/_distutils/command/install.pyi +++ b/stubs/setuptools/setuptools/_distutils/command/install.pyi @@ -16,12 +16,12 @@ class install(Command): install_base: Incomplete install_platbase: Incomplete root: str | None - install_purelib: Incomplete - install_platlib: Incomplete - install_headers: Incomplete + install_purelib: str | None + install_platlib: str | None + install_headers: str | None install_lib: str | None - install_scripts: Incomplete - install_data: Incomplete + install_scripts: str | None + install_data: str | None install_userbase: Incomplete install_usersite: Incomplete compile: Incomplete @@ -54,7 +54,7 @@ class install(Command): def create_path_file(self) -> None: ... def get_outputs(self): ... def get_inputs(self): ... - def has_lib(self): ... - def has_headers(self): ... - def has_scripts(self): ... - def has_data(self): ... + def has_lib(self) -> bool: ... + def has_headers(self) -> bool: ... + def has_scripts(self) -> bool: ... + def has_data(self) -> bool: ... diff --git a/stubs/setuptools/setuptools/_distutils/compilers/C/base.pyi b/stubs/setuptools/setuptools/_distutils/compilers/C/base.pyi index b4256775c4c2..041c2ef772c0 100644 --- a/stubs/setuptools/setuptools/_distutils/compilers/C/base.pyi +++ b/stubs/setuptools/setuptools/_distutils/compilers/C/base.pyi @@ -71,7 +71,7 @@ class Compiler: def library_dir_option(self, dir: str) -> str: ... def library_option(self, lib: str) -> str: ... - def runtime_library_dir_option(self, dir: str) -> str: ... + def runtime_library_dir_option(self, dir: str) -> str | list[str]: ... def set_executables(self, **kwargs: str) -> None: ... def set_executable(self, key: str, value) -> None: ... def compile( diff --git a/stubs/setuptools/setuptools/_distutils/dist.pyi b/stubs/setuptools/setuptools/_distutils/dist.pyi index 4affefed4df1..664c33f71a46 100644 --- a/stubs/setuptools/setuptools/_distutils/dist.pyi +++ b/stubs/setuptools/setuptools/_distutils/dist.pyi @@ -4,6 +4,7 @@ from re import Pattern from typing import IO, ClassVar, Literal, TypeAlias, TypeVar, overload from .cmd import Command +from .extension import Extension command_re: Pattern[str] @@ -78,18 +79,18 @@ class Distribution: script_args: list[str] | None command_options: dict[str, dict[str, tuple[str, str]]] dist_files: list[tuple[str, str, str]] - packages: Incomplete + packages: list[str] | None package_data: dict[str, list[str]] - package_dir: Incomplete - py_modules: Incomplete + package_dir: dict[str, str] | None + py_modules: list[str] | None libraries: Incomplete headers: Incomplete - ext_modules: Incomplete + ext_modules: list[Extension] | None ext_package: Incomplete include_dirs: Incomplete extra_path: Incomplete scripts: Incomplete - data_files: Incomplete + data_files: list[str | tuple[Incomplete, ...]] | None password: str command_obj: dict[str, Command] have_run: dict[str, bool] diff --git a/stubs/setuptools/setuptools/_distutils/util.pyi b/stubs/setuptools/setuptools/_distutils/util.pyi index 37d6692b563f..1f9ef45e5ab8 100644 --- a/stubs/setuptools/setuptools/_distutils/util.pyi +++ b/stubs/setuptools/setuptools/_distutils/util.pyi @@ -31,3 +31,4 @@ def byte_compile( ) -> None: ... def rfc822_escape(header: str) -> str: ... def is_mingw() -> bool: ... +def is_freethreaded() -> bool: ... diff --git a/stubs/setuptools/setuptools/unicode_utils.pyi b/stubs/setuptools/setuptools/unicode_utils.pyi index 6c799c8b8250..4ab4afd02181 100644 --- a/stubs/setuptools/setuptools/unicode_utils.pyi +++ b/stubs/setuptools/setuptools/unicode_utils.pyi @@ -1,3 +1,4 @@ def decompose(path): ... +def normalize(text): ... def filesys_decode(path): ... def try_encode(string, enc): ...