From 19aa22be57aa9594b7c236bacfd7ec66d5a87598 Mon Sep 17 00:00:00 2001 From: amnona Date: Fri, 9 Apr 2021 04:11:27 +0300 Subject: [PATCH] Dbbact version (#252) * add semantic version support to database version check * update minimal dbbact version in config file to semantic version --- calour/calour.config | 2 +- calour/database.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/calour/calour.config b/calour/calour.config index ee611e2b..4a21226b 100644 --- a/calour/calour.config +++ b/calour/calour.config @@ -4,7 +4,7 @@ class_name = DBBact website = www.dbbact.org installation = pip install git+git://github.com/amnona/dbbact-calour description = manual annotations about bacterial amplicon sequences -min_version = 1.1.0 +min_version = 1.4 [sponge] module_name = spongeworld_calour diff --git a/calour/database.py b/calour/database.py index 6f953793..12c1e5be 100644 --- a/calour/database.py +++ b/calour/database.py @@ -28,6 +28,7 @@ from .util import get_config_value, get_config_file, get_config_sections from .experiment import Experiment +from packaging import version logger = getLogger(__name__) @@ -57,7 +58,7 @@ def _get_database_class(dbname, exp=None, config_file_name=None): ''' class_name = get_config_value('class_name', section=dbname, config_file_name=config_file_name) module_name = get_config_value('module_name', section=dbname, config_file_name=config_file_name) - min_version = get_config_value('min_version', section=dbname, config_file_name=config_file_name, fallback='0.0') + min_version = version.parse(get_config_value('min_version', section=dbname, config_file_name=config_file_name, fallback='0.0')) module_website = get_config_value('website', section=dbname, config_file_name=config_file_name, fallback='NA') if class_name is not None and module_name is not None: