diff --git a/salt/modules/pip.py b/salt/modules/pip.py index 9eb1495c3b19..47d22cc3ead2 100644 --- a/salt/modules/pip.py +++ b/salt/modules/pip.py @@ -608,7 +608,7 @@ def install(pkgs=None, # pylint: disable=R0912,R0913,R0914 extra_args pip keyword and positional arguments not yet implemented in salt - + .. code-block:: yaml salt '*' pip.install pandas extra_args="[{'--latest-pip-kwarg':'param'}, '--latest-pip-arg']" @@ -624,7 +624,6 @@ def install(pkgs=None, # pylint: disable=R0912,R0913,R0914 pip install pandas --latest-pip-kwarg param --latest-pip-arg - disable_version_check Pip may periodically check PyPI to determine whether a new version of pip is available to download. Passing True for this option disables diff --git a/salt/states/pip_state.py b/salt/states/pip_state.py index 454dd7c3f239..a855b0c59c9e 100644 --- a/salt/states/pip_state.py +++ b/salt/states/pip_state.py @@ -668,7 +668,7 @@ def installed(name, extra_args pip keyword and positional arguments not yet implemented in salt - + .. code-block:: yaml pandas: diff --git a/tests/unit/modules/test_pip.py b/tests/unit/modules/test_pip.py index 97a56467399c..c951ab6d0324 100644 --- a/tests/unit/modules/test_pip.py +++ b/tests/unit/modules/test_pip.py @@ -802,7 +802,7 @@ def test_install_multiple_requirements_arguments_in_resulting_command(self): use_vt=False, python_shell=False, ) - + def test_install_extra_args_arguments_in_resulting_command(self): pkg = 'pep8' mock = MagicMock(return_value={'retcode': 0, 'stdout': ''}) @@ -838,8 +838,6 @@ def test_install_extra_args_arguments_recursion_error(self): {"--latest-pip-kwarg": [{"--too-deep": dict()}]}, ])) - - def test_uninstall_multiple_requirements_arguments_in_resulting_command(self): with patch('salt.modules.pip._get_cached_requirements') as get_cached_requirements: cached_reqs = [ @@ -1317,8 +1315,7 @@ def test_is_installed_false(self): def test_install_pre_argument_in_resulting_command(self): pkg = 'pep8' - # Lower than 1.4 versions don't end-up with `--pre` in the resulting - # output + # Lower than 1.4 versions don't end up with `--pre` in the resulting output mock = MagicMock(side_effect=[ {'retcode': 0, 'stdout': 'pip 1.2.0 /path/to/site-packages/pip'}, {'retcode': 0, 'stdout': ''}