From db3c2cf69d86e4caaed267b2383875d43de7f5c7 Mon Sep 17 00:00:00 2001 From: Ali Hamdan Date: Sun, 22 Dec 2024 21:05:11 +0100 Subject: [PATCH] setuptools: Remove problematic private module compat (#13280) --- stubs/setuptools/@tests/stubtest_allowlist.txt | 1 + stubs/setuptools/setuptools/compat/__init__.pyi | 0 stubs/setuptools/setuptools/compat/py310.pyi | 9 --------- stubs/setuptools/setuptools/compat/py311.pyi | 4 ---- stubs/setuptools/setuptools/compat/py312.pyi | 3 --- stubs/setuptools/setuptools/compat/py39.pyi | 7 ------- 6 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 stubs/setuptools/setuptools/compat/__init__.pyi delete mode 100644 stubs/setuptools/setuptools/compat/py310.pyi delete mode 100644 stubs/setuptools/setuptools/compat/py311.pyi delete mode 100644 stubs/setuptools/setuptools/compat/py312.pyi delete mode 100644 stubs/setuptools/setuptools/compat/py39.pyi diff --git a/stubs/setuptools/@tests/stubtest_allowlist.txt b/stubs/setuptools/@tests/stubtest_allowlist.txt index 9b7880996..f47062da7 100644 --- a/stubs/setuptools/@tests/stubtest_allowlist.txt +++ b/stubs/setuptools/@tests/stubtest_allowlist.txt @@ -109,6 +109,7 @@ distutils\..+ # Private APIs, tests and other vendored code setuptools.config._validate_pyproject.* +setuptools.compat.* setuptools.command.build_py.build_py.existing_egg_info_dir .+?\.tests.* .+?\._vendor.* diff --git a/stubs/setuptools/setuptools/compat/__init__.pyi b/stubs/setuptools/setuptools/compat/__init__.pyi deleted file mode 100644 index e69de29bb..000000000 diff --git a/stubs/setuptools/setuptools/compat/py310.pyi b/stubs/setuptools/setuptools/compat/py310.pyi deleted file mode 100644 index 9e27329c7..000000000 --- a/stubs/setuptools/setuptools/compat/py310.pyi +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -__all__ = ["tomllib"] - -if sys.version_info >= (3, 11): - import tomllib -else: - # This is actually vendored - import tomli as tomllib # type: ignore[import-not-found] # pyright: ignore[reportMissingImports] diff --git a/stubs/setuptools/setuptools/compat/py311.pyi b/stubs/setuptools/setuptools/compat/py311.pyi deleted file mode 100644 index a71f08223..000000000 --- a/stubs/setuptools/setuptools/compat/py311.pyi +++ /dev/null @@ -1,4 +0,0 @@ -from _typeshed import StrOrBytesPath -from shutil import _OnExcCallback - -def shutil_rmtree(path: StrOrBytesPath, ignore_errors: bool = False, onexc: _OnExcCallback | None = None) -> None: ... diff --git a/stubs/setuptools/setuptools/compat/py312.pyi b/stubs/setuptools/setuptools/compat/py312.pyi deleted file mode 100644 index 0b3a66717..000000000 --- a/stubs/setuptools/setuptools/compat/py312.pyi +++ /dev/null @@ -1,3 +0,0 @@ -from typing import Final - -PTH_ENCODING: Final[str | None] diff --git a/stubs/setuptools/setuptools/compat/py39.pyi b/stubs/setuptools/setuptools/compat/py39.pyi deleted file mode 100644 index 06fd40663..000000000 --- a/stubs/setuptools/setuptools/compat/py39.pyi +++ /dev/null @@ -1,7 +0,0 @@ -import sys -from typing import Final - -if sys.version_info >= (3, 10): - LOCALE_ENCODING: Final = "locale" -else: - LOCALE_ENCODING: Final = None