Skip to content

Commit dafc095

Browse files
authored
Upgrade pyproject-hooks to 1.2.0 (#13125)
1 parent d2bb8eb commit dafc095

File tree

11 files changed

+333
-212
lines changed

11 files changed

+333
-212
lines changed

news/pyproject-hooks.vendor.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Upgrade pyproject-hooks to 1.2.0

src/pip/_internal/operations/build/metadata_editable.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,5 @@ def generate_editable_metadata(
3838
except InstallationSubprocessError as error:
3939
raise MetadataGenerationFailed(package_details=details) from error
4040

41+
assert distinfo_dir is not None
4142
return os.path.join(metadata_dir, distinfo_dir)

src/pip/_internal/utils/misc.py

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
Any,
2020
BinaryIO,
2121
Callable,
22-
Dict,
2322
Generator,
2423
Iterable,
2524
Iterator,
2625
List,
26+
Mapping,
2727
Optional,
28+
Sequence,
2829
TextIO,
2930
Tuple,
3031
Type,
@@ -667,7 +668,7 @@ def __init__(
667668
def build_wheel(
668669
self,
669670
wheel_directory: str,
670-
config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
671+
config_settings: Optional[Mapping[str, Any]] = None,
671672
metadata_directory: Optional[str] = None,
672673
) -> str:
673674
cs = self.config_holder.config_settings
@@ -678,15 +679,15 @@ def build_wheel(
678679
def build_sdist(
679680
self,
680681
sdist_directory: str,
681-
config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
682+
config_settings: Optional[Mapping[str, Any]] = None,
682683
) -> str:
683684
cs = self.config_holder.config_settings
684685
return super().build_sdist(sdist_directory, config_settings=cs)
685686

686687
def build_editable(
687688
self,
688689
wheel_directory: str,
689-
config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
690+
config_settings: Optional[Mapping[str, Any]] = None,
690691
metadata_directory: Optional[str] = None,
691692
) -> str:
692693
cs = self.config_holder.config_settings
@@ -695,27 +696,27 @@ def build_editable(
695696
)
696697

697698
def get_requires_for_build_wheel(
698-
self, config_settings: Optional[Dict[str, Union[str, List[str]]]] = None
699-
) -> List[str]:
699+
self, config_settings: Optional[Mapping[str, Any]] = None
700+
) -> Sequence[str]:
700701
cs = self.config_holder.config_settings
701702
return super().get_requires_for_build_wheel(config_settings=cs)
702703

703704
def get_requires_for_build_sdist(
704-
self, config_settings: Optional[Dict[str, Union[str, List[str]]]] = None
705-
) -> List[str]:
705+
self, config_settings: Optional[Mapping[str, Any]] = None
706+
) -> Sequence[str]:
706707
cs = self.config_holder.config_settings
707708
return super().get_requires_for_build_sdist(config_settings=cs)
708709

709710
def get_requires_for_build_editable(
710-
self, config_settings: Optional[Dict[str, Union[str, List[str]]]] = None
711-
) -> List[str]:
711+
self, config_settings: Optional[Mapping[str, Any]] = None
712+
) -> Sequence[str]:
712713
cs = self.config_holder.config_settings
713714
return super().get_requires_for_build_editable(config_settings=cs)
714715

715716
def prepare_metadata_for_build_wheel(
716717
self,
717718
metadata_directory: str,
718-
config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
719+
config_settings: Optional[Mapping[str, Any]] = None,
719720
_allow_fallback: bool = True,
720721
) -> str:
721722
cs = self.config_holder.config_settings
@@ -728,9 +729,9 @@ def prepare_metadata_for_build_wheel(
728729
def prepare_metadata_for_build_editable(
729730
self,
730731
metadata_directory: str,
731-
config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
732+
config_settings: Optional[Mapping[str, Any]] = None,
732733
_allow_fallback: bool = True,
733-
) -> str:
734+
) -> Optional[str]:
734735
cs = self.config_holder.config_settings
735736
return super().prepare_metadata_for_build_editable(
736737
metadata_directory=metadata_directory,

src/pip/_vendor/pyproject_hooks.pyi

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
"""Wrappers to call pyproject.toml-based build backend hooks.
22
"""
33

4+
from typing import TYPE_CHECKING
5+
46
from ._impl import (
5-
BackendInvalid,
67
BackendUnavailable,
78
BuildBackendHookCaller,
89
HookMissing,
@@ -11,13 +12,20 @@
1112
quiet_subprocess_runner,
1213
)
1314

14-
__version__ = '1.0.0'
15+
__version__ = "1.2.0"
1516
__all__ = [
16-
'BackendUnavailable',
17-
'BackendInvalid',
18-
'HookMissing',
19-
'UnsupportedOperation',
20-
'default_subprocess_runner',
21-
'quiet_subprocess_runner',
22-
'BuildBackendHookCaller',
17+
"BackendUnavailable",
18+
"BackendInvalid",
19+
"HookMissing",
20+
"UnsupportedOperation",
21+
"default_subprocess_runner",
22+
"quiet_subprocess_runner",
23+
"BuildBackendHookCaller",
2324
]
25+
26+
BackendInvalid = BackendUnavailable # Deprecated alias, previously a separate exception
27+
28+
if TYPE_CHECKING:
29+
from ._impl import SubprocessRunner
30+
31+
__all__ += ["SubprocessRunner"]

src/pip/_vendor/pyproject_hooks/_compat.py

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)