valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #40066 from jeanpralo/dockercompose-remove-max-version-check

Browse Source 
Remove max version check on dockercompose
This commit is contained in:
Mike Place 2017-03-16 15:01:48 -06:00 committed by GitHub
commit cf8dd2ce29
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/modules/dockercompose.py
View File

@ -124,7 +124,6 @@ except ImportError:
USE_FILTERCLASS = False
MIN_DOCKERCOMPOSE = (1, 5, 0)
MAX_DOCKERCOMPOSE = (1, 9, 0)
VERSION_RE = r'([\d.]+)'
log = logging.getLogger(__name__)
@ -139,7 +138,7 @@ def __virtual__():
match = re.match(VERSION_RE, str(compose.__version__))
if match:
version = tuple([int(x) for x in match.group(1).split('.')])
if version >= MIN_DOCKERCOMPOSE and version <= MAX_DOCKERCOMPOSE:
if version >= MIN_DOCKERCOMPOSE:
return __virtualname__
return (False, 'The dockercompose execution module not loaded: '
'compose python library not available.')