From 99f9e1c90a2bcc25a3e431146ccee0fa23573db1 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Mon, 29 Apr 2019 00:50:32 +0000 Subject: [PATCH] fix compare_versions method --- salt/states/pip_state.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/states/pip_state.py b/salt/states/pip_state.py index b12e6c9ba1e..6ad620d6478 100644 --- a/salt/states/pip_state.py +++ b/salt/states/pip_state.py @@ -61,11 +61,11 @@ except ImportError: del sys_modules_pip if HAS_PIP is True: - if salt.utils.versions.compare(ver1=pip.__version__, + if salt.utils.compare_versions(ver1=pip.__version__, oper='>=', ver2='18.1'): from pip._internal.exceptions import InstallationError # pylint: disable=E0611,E0401 - elif salt.utils.versions.compare(ver1=pip.__version__, + elif salt.utils.compare_versions(ver1=pip.__version__, oper='>=', ver2='10.0'): from pip.exceptions import InstallationError # pylint: disable=E0611,E0401 @@ -83,12 +83,12 @@ __virtualname__ = 'pip' def _from_line(*args, **kwargs): import pip - if salt.utils.versions.compare(ver1=pip.__version__, + if salt.utils.compare_versions(ver1=pip.__version__, oper='>=', ver2='18.1'): import pip._internal.req.constructors # pylint: disable=E0611,E0401 return pip._internal.req.constructors.install_req_from_line(*args, **kwargs) - elif salt.utils.versions.compare(ver1=pip.__version__, + elif salt.utils.compare_versions(ver1=pip.__version__, oper='>=', ver2='10.0'): import pip._internal.req # pylint: disable=E0611,E0401