Merge pull request #65 from esm-tools/feature/general.yaml

general.yaml is correctly read and added to the finished yaml

Author: denizural

esm_parser/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = 'dirk.barbi@awi.de'
-__version__ = "5.1.7"
+__version__ = "5.1.8"
 
 
 from .yaml_to_dict import yaml_file_to_dict

esm_parser/esm_parser.py

@@ -2643,18 +2643,30 @@ def _config_init(self, user_config):
             user_config["defaults"] = {}
 
         default_infos = {}
-        for i in os.listdir(DEFAULTS_DIR):
-            file_contents = yaml_file_to_dict(DEFAULTS_DIR + "/" + i)
-            default_infos.update(file_contents)
 
+        # get the files in the defaults directory and exclude general.yaml 
+        yaml_files = os.listdir(DEFAULTS_DIR)
+        if 'general.yaml' in yaml_files:
+            yaml_files.remove('general.yaml')
+            
+        for yaml_file in yaml_files: 
+            file_contents = yaml_file_to_dict(DEFAULTS_DIR + "/" + yaml_file)
+            default_infos.update(file_contents)
 
+        # construct the `defaults` section of the configuration
         user_config["defaults"].update(default_infos)
 
         computer_file = determine_computer_from_hostname()
         computer_config = yaml_file_to_dict(computer_file)
+        
+        if 'general.yaml' in os.listdir(DEFAULTS_DIR):
+            general_config = yaml_file_to_dict(f"{DEFAULTS_DIR}/general.yaml")
+        else:
+            general_config = {}
+        
         setup_config = {
             "computer": computer_config,
-            "general": {},
+            "general": general_config,
         }
         for attachment in CONFIGS_TO_ALWAYS_ATTACH_AND_REMOVE:
             attach_to_config_and_remove(setup_config["computer"], attachment,

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 5.1.7
+current_version = 5.1.8
 commit = True
 tag = True
 

setup.py

@@ -54,6 +54,6 @@
     test_suite='tests',
     tests_require=test_requirements,
     url='https://gitlab.awi.de/esm_tools/esm_parser',
-    version="5.1.7",
+    version="5.1.8",
     zip_safe=False,
 )