Commit 67872ba9 authored by Donald Stufft's avatar Donald Stufft

Merge the fix for #24267

parents b952ab43 71a8589d
...@@ -137,7 +137,7 @@ def _uninstall_helper(*, verbosity=0): ...@@ -137,7 +137,7 @@ def _uninstall_helper(*, verbosity=0):
_disable_pip_configuration_settings() _disable_pip_configuration_settings()
# Construct the arguments to be passed to the pip command # Construct the arguments to be passed to the pip command
args = ["uninstall", "-y"] args = ["uninstall", "-y", "--disable-pip-version-check"]
if verbosity: if verbosity:
args += ["-" + "v" * verbosity] args += ["-" + "v" * verbosity]
......
...@@ -211,7 +211,10 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase): ...@@ -211,7 +211,10 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
ensurepip._uninstall_helper() ensurepip._uninstall_helper()
self.run_pip.assert_called_once_with( self.run_pip.assert_called_once_with(
["uninstall", "-y", "pip", "setuptools"] [
"uninstall", "-y", "--disable-pip-version-check", "pip",
"setuptools",
]
) )
@requires_usable_pip @requires_usable_pip
...@@ -220,7 +223,10 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase): ...@@ -220,7 +223,10 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
ensurepip._uninstall_helper(verbosity=1) ensurepip._uninstall_helper(verbosity=1)
self.run_pip.assert_called_once_with( self.run_pip.assert_called_once_with(
["uninstall", "-y", "-v", "pip", "setuptools"] [
"uninstall", "-y", "--disable-pip-version-check", "-v", "pip",
"setuptools",
]
) )
@requires_usable_pip @requires_usable_pip
...@@ -229,7 +235,10 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase): ...@@ -229,7 +235,10 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
ensurepip._uninstall_helper(verbosity=2) ensurepip._uninstall_helper(verbosity=2)
self.run_pip.assert_called_once_with( self.run_pip.assert_called_once_with(
["uninstall", "-y", "-vv", "pip", "setuptools"] [
"uninstall", "-y", "--disable-pip-version-check", "-vv", "pip",
"setuptools",
]
) )
@requires_usable_pip @requires_usable_pip
...@@ -238,7 +247,10 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase): ...@@ -238,7 +247,10 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
ensurepip._uninstall_helper(verbosity=3) ensurepip._uninstall_helper(verbosity=3)
self.run_pip.assert_called_once_with( self.run_pip.assert_called_once_with(
["uninstall", "-y", "-vvv", "pip", "setuptools"] [
"uninstall", "-y", "--disable-pip-version-check", "-vvv",
"pip", "setuptools",
]
) )
@requires_usable_pip @requires_usable_pip
...@@ -336,7 +348,10 @@ class TestUninstallationMainFunction(EnsurepipMixin, unittest.TestCase): ...@@ -336,7 +348,10 @@ class TestUninstallationMainFunction(EnsurepipMixin, unittest.TestCase):
ensurepip._uninstall._main([]) ensurepip._uninstall._main([])
self.run_pip.assert_called_once_with( self.run_pip.assert_called_once_with(
["uninstall", "-y", "pip", "setuptools"] [
"uninstall", "-y", "--disable-pip-version-check", "pip",
"setuptools",
]
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment