summaryrefslogtreecommitdiffstats
path: root/dovetail/utils/dovetail_config.py
diff options
context:
space:
mode:
Diffstat (limited to 'dovetail/utils/dovetail_config.py')
-rw-r--r--dovetail/utils/dovetail_config.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/dovetail/utils/dovetail_config.py b/dovetail/utils/dovetail_config.py
index 5e100d69..d3b54192 100644
--- a/dovetail/utils/dovetail_config.py
+++ b/dovetail/utils/dovetail_config.py
@@ -16,18 +16,16 @@ class DovetailConfig(object):
dovetail_config = {}
@classmethod
- def load_config_files(cls):
- curr_path = os.path.dirname(os.path.abspath(__file__))
- config_path = os.path.join(os.path.dirname(curr_path), 'conf')
- with open(os.path.join(config_path, 'dovetail_config.yml')) as f:
+ def load_config_files(cls, conf_path):
+ with open(os.path.join(conf_path, 'dovetail_config.yml')) as f:
cls.dovetail_config = yaml.safe_load(f)
for extra_config_file in cls.dovetail_config['include_config']:
- with open(os.path.join(config_path, extra_config_file)) as f:
+ with open(os.path.join(conf_path, extra_config_file)) as f:
extra_config = yaml.safe_load(f)
cls.dovetail_config.update(extra_config)
- path = os.path.join(config_path, cls.dovetail_config['cli_file_name'])
+ path = os.path.join(conf_path, cls.dovetail_config['cli_file_name'])
with open(path) as f:
cmd_yml = yaml.safe_load(f)
cls.dovetail_config['cli'] = cmd_yml[cmd_yml.keys()[0]]