Merged
Conversation
Also re-export missing distutils command `install_data` and remove duplicate stublist allow entries
Collaborator
Author
|
Closes: #13732 |
This comment has been minimized.
This comment has been minimized.
Collaborator
Closing keywords have to be in the original post (you can see the bot's PR didn't get linked) |
Avasam
requested changes
Mar 28, 2025
Collaborator
There was a problem hiding this comment.
From what I can see, here's the only public typing related changes:
setuptools/_distutils/command/install.py'sinstall.config_varsis now aChainMapsetuptools/_distutils/compilers/C/msvc.pyadded back the accidentally removedshared_lib_formatpropertywarn_dash_deprecationandmake_option_lowercasehave been removed fromsetuptools/dist.py
So this patch should still be applied (at least setuptools/setuptools/_distutils/compilers/C/msvc.pyi)
diff --git a/stubs/setuptools/setuptools/_distutils/command/install.pyi b/stubs/setuptools/setuptools/_distutils/command/install.pyi
index 059116834..67502f9d0 100644
--- a/stubs/setuptools/setuptools/_distutils/command/install.pyi
+++ b/stubs/setuptools/setuptools/_distutils/command/install.pyi
@@ -1,5 +1,6 @@
from _typeshed import Incomplete
-from typing import ClassVar
+from collections import ChainMap
+from typing import Any, ClassVar
from ..cmd import Command
@@ -34,7 +35,7 @@ class install(Command):
build_lib: Incomplete
record: Incomplete
def initialize_options(self) -> None: ...
- config_vars: Incomplete
+ config_vars: ChainMap[str, Any] # Any: Same as sysconfig.get_config_vars
install_libbase: Incomplete
def finalize_options(self) -> None: ...
def dump_dirs(self, msg) -> None: ...
diff --git a/stubs/setuptools/setuptools/_distutils/compilers/C/msvc.pyi b/stubs/setuptools/setuptools/_distutils/compilers/C/msvc.pyi
index 99d107c63..44f5c85b8 100644
--- a/stubs/setuptools/setuptools/_distutils/compilers/C/msvc.pyi
+++ b/stubs/setuptools/setuptools/_distutils/compilers/C/msvc.pyi
@@ -10,10 +10,8 @@ class Compiler(base.Compiler):
obj_extension: ClassVar[str]
static_lib_extension: ClassVar[str]
shared_lib_extension: ClassVar[str]
- # This was accidentally removed upstream and should be back pretty soon.
- # shared_lib_format: ClassVar[str]
- # static_lib_format = shared_lib_format
- static_lib_format: ClassVar[str]
+ shared_lib_format: ClassVar[str]
+ static_lib_format = shared_lib_format
exe_extension: ClassVar[str]
initialized: bool
def initialize(self, plat_name: str | None = None) -> None: ...
Contributor
|
According to mypy_primer, this change has no effect on the checked open source code. 🤖🎉 |
Avasam
approved these changes
Mar 28, 2025
mmingyu
pushed a commit
to mmingyu/typeshed
that referenced
this pull request
May 16, 2025
--------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Also re-export missing distutils command
install_dataand remove duplicate stublist allow entries