Skip to content

Commit 3980c84

Browse files
committed
Deprecate --install-option
1 parent 1880f4a commit 3980c84

File tree

7 files changed

+59
-34
lines changed

7 files changed

+59
-34
lines changed

news/11358.removal.rst

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Deprecate ``--install-options`` which forces pip to use the deprecated ``install``
2+
command of ``setuptools``.

src/pip/_internal/cli/cmdoptions.py

-25
Original file line numberDiff line numberDiff line change
@@ -59,31 +59,6 @@ def make_option_group(group: Dict[str, Any], parser: ConfigOptionParser) -> Opti
5959
return option_group
6060

6161

62-
def check_install_build_global(
63-
options: Values, check_options: Optional[Values] = None
64-
) -> None:
65-
"""Disable wheels if per-setup.py call options are set.
66-
67-
:param options: The OptionParser options to update.
68-
:param check_options: The options to check, if not supplied defaults to
69-
options.
70-
"""
71-
if check_options is None:
72-
check_options = options
73-
74-
def getname(n: str) -> Optional[Any]:
75-
return getattr(check_options, n, None)
76-
77-
names = ["build_options", "global_options", "install_options"]
78-
if any(map(getname, names)):
79-
control = options.format_control
80-
control.disallow_binaries()
81-
logger.warning(
82-
"Disabling all use of wheels due to the use of --build-option "
83-
"/ --global-option / --install-option.",
84-
)
85-
86-
8762
def check_dist_restriction(options: Values, check_target: bool = False) -> None:
8863
"""Function for determining if custom platform options are allowed.
8964

src/pip/_internal/commands/download.py

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from pip._internal.cli.req_command import RequirementCommand, with_cleanup
99
from pip._internal.cli.status_codes import SUCCESS
1010
from pip._internal.operations.build.build_tracker import get_build_tracker
11+
from pip._internal.req.req_install import check_legacy_setup_py_options
1112
from pip._internal.utils.misc import ensure_dir, normalize_path, write_output
1213
from pip._internal.utils.temp_dir import TempDirectory
1314

@@ -105,6 +106,7 @@ def run(self, options: Values, args: List[str]) -> int:
105106
)
106107

107108
reqs = self.get_requirements(args, options, finder, session)
109+
check_legacy_setup_py_options(options, reqs, mode="download")
108110

109111
preparer = self.make_requirement_preparer(
110112
temp_build_dir=directory,

src/pip/_internal/commands/install.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@
2727
from pip._internal.operations.build.build_tracker import get_build_tracker
2828
from pip._internal.operations.check import ConflictDetails, check_install_conflicts
2929
from pip._internal.req import install_given_reqs
30-
from pip._internal.req.req_install import InstallRequirement
30+
from pip._internal.req.req_install import (
31+
InstallRequirement,
32+
check_legacy_setup_py_options,
33+
)
3134
from pip._internal.utils.compat import WINDOWS
3235
from pip._internal.utils.distutils_args import parse_distutils_args
3336
from pip._internal.utils.filesystem import test_writable_dir
@@ -272,7 +275,6 @@ def run(self, options: Values, args: List[str]) -> int:
272275
if options.use_user_site and options.target_dir is not None:
273276
raise CommandError("Can not combine '--user' and '--target'")
274277

275-
cmdoptions.check_install_build_global(options)
276278
upgrade_strategy = "to-satisfy-only"
277279
if options.upgrade:
278280
upgrade_strategy = options.upgrade_strategy
@@ -333,6 +335,7 @@ def run(self, options: Values, args: List[str]) -> int:
333335

334336
try:
335337
reqs = self.get_requirements(args, options, finder, session)
338+
check_legacy_setup_py_options(options, reqs, mode="install")
336339

337340
# Only when installing is it permitted to use PEP 660.
338341
# In other circumstances (pip wheel, pip download) we generate

src/pip/_internal/commands/wheel.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
from pip._internal.cli.status_codes import SUCCESS
1111
from pip._internal.exceptions import CommandError
1212
from pip._internal.operations.build.build_tracker import get_build_tracker
13-
from pip._internal.req.req_install import InstallRequirement
13+
from pip._internal.req.req_install import (
14+
InstallRequirement,
15+
check_legacy_setup_py_options,
16+
)
1417
from pip._internal.utils.misc import ensure_dir, normalize_path
1518
from pip._internal.utils.temp_dir import TempDirectory
1619
from pip._internal.wheel_builder import build, should_build_for_wheel_command
@@ -100,8 +103,6 @@ def add_options(self) -> None:
100103

101104
@with_cleanup
102105
def run(self, options: Values, args: List[str]) -> int:
103-
cmdoptions.check_install_build_global(options)
104-
105106
session = self.get_default_session(options)
106107

107108
finder = self._build_package_finder(options, session)
@@ -119,6 +120,7 @@ def run(self, options: Values, args: List[str]) -> int:
119120
)
120121

121122
reqs = self.get_requirements(args, options, finder, session)
123+
check_legacy_setup_py_options(options, reqs, mode="wheel")
122124

123125
preparer = self.make_requirement_preparer(
124126
temp_build_dir=directory,

src/pip/_internal/req/req_file.py

-4
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,6 @@ def handle_requirement_line(
186186
constraint=line.constraint,
187187
)
188188
else:
189-
if options:
190-
# Disable wheels if the user has specified build options
191-
cmdoptions.check_install_build_global(options, line.opts)
192-
193189
# get the options that apply to requirements
194190
req_options = {}
195191
for dest in SUPPORTED_OPTIONS_REQ_DEST:

src/pip/_internal/req/req_install.py

+45
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import sys
99
import uuid
1010
import zipfile
11+
from optparse import Values
1112
from typing import Any, Collection, Dict, Iterable, List, Optional, Sequence, Union
1213

1314
from pip._vendor.packaging.markers import Marker
@@ -17,6 +18,7 @@
1718
from pip._vendor.packaging.version import Version
1819
from pip._vendor.packaging.version import parse as parse_version
1920
from pip._vendor.pep517.wrappers import Pep517HookCaller
21+
from typing_extensions import Literal # Python 3.7 compatibility
2022

2123
from pip._internal.build_env import BuildEnvironment, NoOpBuildEnvironment
2224
from pip._internal.exceptions import InstallationError, LegacyInstallFailure
@@ -877,3 +879,46 @@ def check_invalid_constraint_type(req: InstallRequirement) -> str:
877879
)
878880

879881
return problem
882+
883+
884+
def _has_option(options: Values, reqs: List[InstallRequirement], option: str) -> bool:
885+
if getattr(options, option, None):
886+
return True
887+
for req in reqs:
888+
if getattr(req, option, None):
889+
return True
890+
return False
891+
892+
893+
def check_legacy_setup_py_options(
894+
options: Values,
895+
reqs: List[InstallRequirement],
896+
mode: Literal["install", "wheel", "download"],
897+
) -> None:
898+
has_install_options = _has_option(options, reqs, "install_options")
899+
has_build_options = _has_option(options, reqs, "build_options")
900+
has_global_options = _has_option(options, reqs, "global_options")
901+
legacy_setup_py_options_present = (
902+
has_install_options or has_build_options or has_global_options
903+
)
904+
if not legacy_setup_py_options_present:
905+
return
906+
907+
control = options.format_control
908+
control.disallow_binaries()
909+
logger.warning(
910+
"Implying --no-binary=:all: due to the presence of "
911+
"--build-option / --global-option / --install-option. "
912+
"Consider using --config-settings for more flexibility.",
913+
)
914+
if mode == "install" and has_install_options:
915+
deprecated(
916+
reason=(
917+
"--install-option is deprecated because "
918+
"it forces pip to use the 'setup.py install' "
919+
"command which is itself deprecated."
920+
),
921+
issue=11358,
922+
replacement="to use --config-settings",
923+
gone_in=None,
924+
)

0 commit comments

Comments
 (0)