saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "fix compare_versions method"

Browse source 
This reverts commit 99f9e1c90a.
This commit is contained in:
Pedro Algarvio 2019-05-09 14:30:24 +01:00
parent 0e139bf1cb
commit 3e43c87c44
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/states/pip_state.py
View file

@ -61,11 +61,11 @@ except ImportError:
del sys_modules_pip
if HAS_PIP is True:
if salt.utils.compare_versions(ver1=pip.__version__,
if salt.utils.versions.compare(ver1=pip.__version__,
oper='>=',
ver2='18.1'):
from pip._internal.exceptions import InstallationError # pylint: disable=E0611,E0401
elif salt.utils.compare_versions(ver1=pip.__version__,
elif salt.utils.versions.compare(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.compare_versions(ver1=pip.__version__,
if salt.utils.versions.compare(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.compare_versions(ver1=pip.__version__,
elif salt.utils.versions.compare(ver1=pip.__version__,
oper='>=',
ver2='10.0'):
import pip._internal.req # pylint: disable=E0611,E0401