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

pip_state: Compare versions using pkg_resources.parse_version

Browse source
This commit is contained in:
Da-Juan 2017-11-21 10:57:14 +01:00
parent 5219ab974c
commit 62252d74d9
No known key found for this signature in database
GPG key ID: 367C23905DE0BD74
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
salt/states/pip_state.py
View file

@ -23,6 +23,7 @@ requisite to a pkg.installed state for the package which provides pip
from __future__ import absolute_import
import re
import logging
from pkg_resources import parse_version
# Import salt libs
import salt.utils
@ -94,7 +95,7 @@ def _fulfills_version_spec(version, version_spec):
for oper, spec in version_spec:
if oper is None:
continue
if not salt.utils.compare_versions(ver1=version, oper=oper, ver2=spec):
if not salt.utils.compare_versions(ver1=version, oper=oper, ver2=spec, cmp_func=_pep440_version_cmp):
return False
return True
@ -216,6 +217,29 @@ def _check_if_installed(prefix, state_pkg_name, version_spec,
return ret
def _pep440_version_cmp(pkg1, pkg2, ignore_epoch=False):
'''
Compares two version strings using pkg_resources.parse_version.
Return -1 if version1 < version2, 0 if version1 ==version2,
and 1 if version1 > version2. Return None if there was a problem
making the comparison.
'''
normalize = lambda x: str(x).split('!', 1)[-1] if ignore_epoch else str(x)
pkg1 = normalize(pkg1)
pkg2 = normalize(pkg2)
try:
if parse_version(pkg1) < parse_version(pkg2):
return -1
if parse_version(pkg1) == parse_version(pkg2):
return 0
if parse_version(pkg1) > parse_version(pkg2):
return 1
except Exception as exc:
logger.exception(exc)
return None
def installed(name,
pkgs=None,
pip_bin=None,