diff --git a/stubs/setuptools/@tests/stubtest_allowlist.txt b/stubs/setuptools/@tests/stubtest_allowlist.txt index 79dcad433a95..0acd265e8cb5 100644 --- a/stubs/setuptools/@tests/stubtest_allowlist.txt +++ b/stubs/setuptools/@tests/stubtest_allowlist.txt @@ -42,6 +42,10 @@ setuptools._distutils.dist.Distribution.get_requires setuptools._distutils.dist.Distribution.get_provides setuptools._distutils.dist.Distribution.get_obsoletes +# Is a functools.partial, so stubtest says "is not a function" +setuptools.dep_util.newer_pairwise_group +setuptools.modified.newer_pairwise_group + # Private modules setuptools.config._validate_pyproject.* setuptools.command.build_py.build_py.existing_egg_info_dir diff --git a/stubs/setuptools/METADATA.toml b/stubs/setuptools/METADATA.toml index d1530b871eb0..a47fec19f6f9 100644 --- a/stubs/setuptools/METADATA.toml +++ b/stubs/setuptools/METADATA.toml @@ -1,6 +1,5 @@ -version = "68.2.*" +version = "69.0.*" upstream_repository = "https://github.com/pypa/setuptools" -partial_stub = true [tool.stubtest] # darwin is equivalent to linux for OS-specific methods diff --git a/stubs/setuptools/pkg_resources/__init__.pyi b/stubs/setuptools/pkg_resources/__init__.pyi index 6dfa2c50fba1..43c21b8a7eb5 100644 --- a/stubs/setuptools/pkg_resources/__init__.pyi +++ b/stubs/setuptools/pkg_resources/__init__.pyi @@ -9,7 +9,7 @@ from re import Pattern from typing import IO, Any, ClassVar, Protocol, TypeVar, overload, type_check_only from typing_extensions import Literal, Self, TypeAlias -from ._vendor.packaging import requirements as packaging_requirements, version as packaging_version +from ._vendored_packaging import requirements as packaging_requirements, version as packaging_version _T = TypeVar("_T") _D = TypeVar("_D", bound=Distribution) diff --git a/stubs/setuptools/pkg_resources/_vendor/packaging/__init__.pyi b/stubs/setuptools/pkg_resources/_vendored_packaging/__init__.pyi similarity index 100% rename from stubs/setuptools/pkg_resources/_vendor/packaging/__init__.pyi rename to stubs/setuptools/pkg_resources/_vendored_packaging/__init__.pyi diff --git a/stubs/setuptools/pkg_resources/_vendor/packaging/markers.pyi b/stubs/setuptools/pkg_resources/_vendored_packaging/markers.pyi similarity index 100% rename from stubs/setuptools/pkg_resources/_vendor/packaging/markers.pyi rename to stubs/setuptools/pkg_resources/_vendored_packaging/markers.pyi diff --git a/stubs/setuptools/pkg_resources/_vendor/packaging/requirements.pyi b/stubs/setuptools/pkg_resources/_vendored_packaging/requirements.pyi similarity index 100% rename from stubs/setuptools/pkg_resources/_vendor/packaging/requirements.pyi rename to stubs/setuptools/pkg_resources/_vendored_packaging/requirements.pyi diff --git a/stubs/setuptools/pkg_resources/_vendor/packaging/specifiers.pyi b/stubs/setuptools/pkg_resources/_vendored_packaging/specifiers.pyi similarity index 100% rename from stubs/setuptools/pkg_resources/_vendor/packaging/specifiers.pyi rename to stubs/setuptools/pkg_resources/_vendored_packaging/specifiers.pyi diff --git a/stubs/setuptools/pkg_resources/_vendor/packaging/version.pyi b/stubs/setuptools/pkg_resources/_vendored_packaging/version.pyi similarity index 100% rename from stubs/setuptools/pkg_resources/_vendor/packaging/version.pyi rename to stubs/setuptools/pkg_resources/_vendored_packaging/version.pyi diff --git a/stubs/setuptools/setuptools/_distutils/_modified.pyi b/stubs/setuptools/setuptools/_distutils/_modified.pyi new file mode 100644 index 000000000000..39b853256ed4 --- /dev/null +++ b/stubs/setuptools/setuptools/_distutils/_modified.pyi @@ -0,0 +1,6 @@ +from typing_extensions import Literal + +def newer(source, target): ... +def newer_pairwise(sources, targets, newer=...): ... +def newer_group(sources, target, missing: Literal["error", "newer", "ignore"] = "error"): ... +def newer_pairwise_group(sources, targets, *, newer=...): ... diff --git a/stubs/setuptools/setuptools/dep_util.pyi b/stubs/setuptools/setuptools/dep_util.pyi index 0ac008029257..0891d9775f47 100644 --- a/stubs/setuptools/setuptools/dep_util.pyi +++ b/stubs/setuptools/setuptools/dep_util.pyi @@ -1 +1 @@ -def newer_pairwise_group(sources_groups, targets): ... +from ._distutils._modified import newer_group as newer_group, newer_pairwise_group as newer_pairwise_group diff --git a/stubs/setuptools/setuptools/errors.pyi b/stubs/setuptools/setuptools/errors.pyi index 003874563c7c..9723a11d514f 100644 --- a/stubs/setuptools/setuptools/errors.pyi +++ b/stubs/setuptools/setuptools/errors.pyi @@ -18,5 +18,7 @@ TemplateError = _distutils_errors.DistutilsTemplateError UnknownFileError = _distutils_errors.UnknownFileError BaseError = _distutils_errors.DistutilsError +class InvalidConfigError(OptionError): ... +class RemovedConfigError(OptionError): ... class RemovedCommandError(BaseError, RuntimeError): ... class PackageDiscoveryError(BaseError, RuntimeError): ... diff --git a/stubs/setuptools/setuptools/modified.pyi b/stubs/setuptools/setuptools/modified.pyi new file mode 100644 index 000000000000..3148cc626dc6 --- /dev/null +++ b/stubs/setuptools/setuptools/modified.pyi @@ -0,0 +1,8 @@ +from ._distutils._modified import ( + newer as newer, + newer_group as newer_group, + newer_pairwise as newer_pairwise, + newer_pairwise_group as newer_pairwise_group, +) + +__all__ = ["newer", "newer_pairwise", "newer_group", "newer_pairwise_group"]