diff --git a/news/9631.removal.rst b/news/9631.removal.rst new file mode 100644 index 00000000000..dfd36f6d07a --- /dev/null +++ b/news/9631.removal.rst @@ -0,0 +1,2 @@ +Usage of the old resolver via --use-deprecated=legacy-resolver is no longer +available. diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py index 71b1d190691..ec5272bfef2 100644 --- a/src/pip/_internal/cli/cmdoptions.py +++ b/src/pip/_internal/cli/cmdoptions.py @@ -965,7 +965,6 @@ def check_list_path_option(options: Values) -> None: action="append", default=[], choices=[ - "legacy-resolver", "out-of-tree-build", "backtrack-on-build-failures", "html5lib", diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py index ff1b35cb258..c5d9ad750b7 100644 --- a/tests/functional/test_install.py +++ b/tests/functional/test_install.py @@ -495,17 +495,14 @@ def test_vcs_url_urlquote_normalization( ) -@pytest.mark.parametrize("resolver", ["", "--use-deprecated=legacy-resolver"]) @pytest.mark.usefixtures("with_wheel") def test_basic_install_from_local_directory( - script: PipTestEnvironment, data: TestData, resolver: str + script: PipTestEnvironment, data: TestData ) -> None: """ Test installing from a local directory. """ args = ["install"] - if resolver: - args.append(resolver) to_install = data.packages.joinpath("FSPkg") args.append(to_install) result = script.pip(*args)