diff options
| author | Pradyun Gedam <pradyunsg@gmail.com> | 2022-10-15 11:52:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-15 11:52:39 +0100 |
| commit | e86f27fe4ee3fe45fc0fcd2372f71d39d1d013c1 (patch) | |
| tree | ba6559b7f89b7328147d62d4d41d8a9738183dc1 | |
| parent | 1fcc3ce4b531ac6bc80c1d102d4ef9610074e195 (diff) | |
| parent | 7662593941cf5a3519741b5c99973f0a9c5b50b1 (diff) | |
| download | pip-e86f27fe4ee3fe45fc0fcd2372f71d39d1d013c1.tar.gz | |
Merge pull request #11493 from pradyunsg/remove-2020-resolver-opt-in
| -rw-r--r-- | news/11493.removal.rst | 1 | ||||
| -rw-r--r-- | src/pip/_internal/cli/base_command.py | 7 | ||||
| -rw-r--r-- | src/pip/_internal/cli/cmdoptions.py | 1 | ||||
| -rw-r--r-- | tests/unit/test_req_file.py | 12 |
4 files changed, 11 insertions, 10 deletions
diff --git a/news/11493.removal.rst b/news/11493.removal.rst new file mode 100644 index 000000000..de559e899 --- /dev/null +++ b/news/11493.removal.rst @@ -0,0 +1 @@ +Remove ``--use-feature=2020-resolver`` opt-in flag. This was supposed to be removed in 21.0, but missed during that release cycle. diff --git a/src/pip/_internal/cli/base_command.py b/src/pip/_internal/cli/base_command.py index 0774f2608..5bd7e67e6 100644 --- a/src/pip/_internal/cli/base_command.py +++ b/src/pip/_internal/cli/base_command.py @@ -151,13 +151,6 @@ class Command(CommandContextMixIn): ) options.cache_dir = None - if "2020-resolver" in options.features_enabled: - logger.warning( - "--use-feature=2020-resolver no longer has any effect, " - "since it is now the default dependency resolver in pip. " - "This will become an error in pip 21.0." - ) - def intercepts_unhandled_exc( run_func: Callable[..., int] ) -> Callable[..., int]: diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py index 9ff7a3d07..b4e2560de 100644 --- a/src/pip/_internal/cli/cmdoptions.py +++ b/src/pip/_internal/cli/cmdoptions.py @@ -983,7 +983,6 @@ use_new_feature: Callable[..., Option] = partial( action="append", default=[], choices=[ - "2020-resolver", "fast-deps", "truststore", "no-binary-enable-wheel-cache", diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py index fde0cb2f7..228d0aaa4 100644 --- a/tests/unit/test_req_file.py +++ b/tests/unit/test_req_file.py @@ -459,8 +459,16 @@ class TestProcessLine: self, line_processor: LineProcessor, options: mock.Mock ) -> None: """--use-feature can be set in requirements files.""" - line_processor("--use-feature=2020-resolver", "filename", 1, options=options) - assert "2020-resolver" in options.features_enabled + line_processor("--use-feature=fast-deps", "filename", 1, options=options) + + def test_use_feature_with_error( + self, line_processor: LineProcessor, options: mock.Mock + ) -> None: + """--use-feature triggers error when parsing requirements files.""" + with pytest.raises(RequirementsFileParseError): + line_processor( + "--use-feature=2020-resolver", "filename", 1, options=options + ) def test_relative_local_find_links( self, |