Skip to content

Commit 82f1ff0

Browse files
committed
Fix type of config_settings arguments
1 parent 5ea3581 commit 82f1ff0

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

src/pip/_internal/req/constructors.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ def install_req_from_editable(
209209
constraint: bool = False,
210210
user_supplied: bool = False,
211211
permit_editable_wheels: bool = False,
212-
config_settings: Optional[Dict[str, str]] = None,
212+
config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
213213
) -> InstallRequirement:
214214

215215
parts = parse_req_from_editable(editable_req)
@@ -385,7 +385,7 @@ def install_req_from_line(
385385
constraint: bool = False,
386386
line_source: Optional[str] = None,
387387
user_supplied: bool = False,
388-
config_settings: Optional[Dict[str, str]] = None,
388+
config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
389389
) -> InstallRequirement:
390390
"""Creates an InstallRequirement from a name, which might be a
391391
requirement, directory containing 'setup.py', filename, or URL.
@@ -417,7 +417,7 @@ def install_req_from_req_string(
417417
isolated: bool = False,
418418
use_pep517: Optional[bool] = None,
419419
user_supplied: bool = False,
420-
config_settings: Optional[Dict[str, str]] = None,
420+
config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
421421
) -> InstallRequirement:
422422
try:
423423
req = get_requirement(req_string)

src/pip/_internal/req/req_install.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def __init__(
8585
*,
8686
global_options: Optional[List[str]] = None,
8787
hash_options: Optional[Dict[str, List[str]]] = None,
88-
config_settings: Optional[Dict[str, str]] = None,
88+
config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
8989
constraint: bool = False,
9090
extras: Collection[str] = (),
9191
user_supplied: bool = False,

src/pip/_internal/utils/misc.py

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
Tuple,
3333
Type,
3434
TypeVar,
35+
Union,
3536
cast,
3637
)
3738

@@ -669,7 +670,7 @@ def __init__(
669670
def build_wheel(
670671
self,
671672
wheel_directory: str,
672-
config_settings: Optional[Dict[str, str]] = None,
673+
config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
673674
metadata_directory: Optional[str] = None,
674675
) -> str:
675676
cs = self.config_holder.config_settings
@@ -678,15 +679,17 @@ def build_wheel(
678679
)
679680

680681
def build_sdist(
681-
self, sdist_directory: str, config_settings: Optional[Dict[str, str]] = None
682+
self,
683+
sdist_directory: str,
684+
config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
682685
) -> str:
683686
cs = self.config_holder.config_settings
684687
return super().build_sdist(sdist_directory, config_settings=cs)
685688

686689
def build_editable(
687690
self,
688691
wheel_directory: str,
689-
config_settings: Optional[Dict[str, str]] = None,
692+
config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
690693
metadata_directory: Optional[str] = None,
691694
) -> str:
692695
cs = self.config_holder.config_settings
@@ -695,27 +698,27 @@ def build_editable(
695698
)
696699

697700
def get_requires_for_build_wheel(
698-
self, config_settings: Optional[Dict[str, str]] = None
701+
self, config_settings: Optional[Dict[str, Union[str, List[str]]]] = None
699702
) -> List[str]:
700703
cs = self.config_holder.config_settings
701704
return super().get_requires_for_build_wheel(config_settings=cs)
702705

703706
def get_requires_for_build_sdist(
704-
self, config_settings: Optional[Dict[str, str]] = None
707+
self, config_settings: Optional[Dict[str, Union[str, List[str]]]] = None
705708
) -> List[str]:
706709
cs = self.config_holder.config_settings
707710
return super().get_requires_for_build_sdist(config_settings=cs)
708711

709712
def get_requires_for_build_editable(
710-
self, config_settings: Optional[Dict[str, str]] = None
713+
self, config_settings: Optional[Dict[str, Union[str, List[str]]]] = None
711714
) -> List[str]:
712715
cs = self.config_holder.config_settings
713716
return super().get_requires_for_build_editable(config_settings=cs)
714717

715718
def prepare_metadata_for_build_wheel(
716719
self,
717720
metadata_directory: str,
718-
config_settings: Optional[Dict[str, str]] = None,
721+
config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
719722
_allow_fallback: bool = True,
720723
) -> str:
721724
cs = self.config_holder.config_settings
@@ -728,7 +731,7 @@ def prepare_metadata_for_build_wheel(
728731
def prepare_metadata_for_build_editable(
729732
self,
730733
metadata_directory: str,
731-
config_settings: Optional[Dict[str, str]] = None,
734+
config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
732735
_allow_fallback: bool = True,
733736
) -> str:
734737
cs = self.config_holder.config_settings

0 commit comments

Comments
 (0)