Browse Source

[feature] Update install process when dnaloader checks versions

monf 8 years ago
parent
commit
00028912c3

+ 8 - 1
Tests/test_resources_manager.py

@@ -139,7 +139,14 @@ class TestResourcesmanager(unittest.TestCase):
         self.assertTrue(ResourcesManager._check_supported_version(current_version=current_version,
                                                                   supported_versions=supported_version))
 
-        # version non ok, useer does not confir
+        # version ok
+        current_version = '11.23.0'
+        supported_version = ['11.23', '12.3', '2.23']
+
+        self.assertTrue(ResourcesManager._check_supported_version(current_version=current_version,
+                                                                  supported_versions=supported_version))
+
+        # version non ok, user does not config
         current_version = '0.4.0'
         supported_version = ['0.3', '0.2']
 

+ 1 - 1
kalliope/core/ConfigurationManager/DnaLoader.py

@@ -94,7 +94,7 @@ class DnaLoader(object):
                 else:
                     for supported_version in dna_file["kalliope_supported_version"]:
                         # check if major version is provided
-                        if not len(str(supported_version)) == 3:
+                        if not re.search('^[\d]*[.][\d]*$', str(supported_version)):
                             Utils.print_danger("kalliope_supported_version cannot handle this format of version %s. "
                                                "Only major version should be provided" % supported_version)
                             success_loading = False

+ 1 - 1
kalliope/core/ResourcesManager.py

@@ -259,7 +259,7 @@ class ResourcesManager(object):
 
         supported_version_found = False
         # Extract major version
-        match_current_version = re.search('^[\d][.][\d]', current_version)
+        match_current_version = re.search('^[\d]*[.][\d]*', current_version)
         if match_current_version:
             current_version = match_current_version.group(0)