remove the rest of yamlinclude, including requirement

NREL · Aug 23, 2024 · 809c397 · 809c397
1 parent df879ac
commit 809c397
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 27 deletions.
diff --git a/greenheart/to_organize/hopp_tools_steel.py b/greenheart/to_organize/hopp_tools_steel.py
@@ -7,14 +7,10 @@
 import matplotlib.pyplot as plt
 import yaml
 import re
-from yamlinclude import YamlIncludeConstructor
 from pathlib import Path
 
-PATH = Path(__file__).parent
-YamlIncludeConstructor.add_to_loader_class(loader_class=yaml.FullLoader, base_dir=PATH / 'floris_input_files/')
-
-
 # HOPP functionss
+from hopp.utilities import load_yaml
 from greenheart.to_organize.H2_Analysis.hopp_for_h2 import hopp_for_h2
 from greenheart.to_organize.H2_Analysis.simple_dispatch import SimpleDispatch
 from greenheart.to_organize.H2_Analysis.compressor import Compressor
@@ -305,9 +301,7 @@ def set_turbine_model(hopp_dict, turbine_model, scenario, parent_path, floris_di
             turbine_file = os.path.join(floris_dir, 'floris_input' + '_' + site_number + '_offgrid.yaml')
         else:
             turbine_file = os.path.join(floris_dir, 'floris_input' + '_' + site_number + '_gridconnected.yaml')
-        with open(turbine_file, 'r') as f:
-            floris_config = yaml.load(f, yaml.FullLoader)
-            # floris_config = yaml.load(f, yaml.SafeLoader)
+        floris_config = load_yaml(turbine_file)
         nTurbs = len(floris_config['farm']['layout_x'])
         # turbine_type = floris_config['farm']['turbine_type'][0]
         turbine_type = floris_config['farm']['turbine_type'][0]['turbine_type']

diff --git a/greenheart/to_organize/hopp_tools_steel_EPR_12oct2023.py b/greenheart/to_organize/hopp_tools_steel_EPR_12oct2023.py
@@ -7,14 +7,10 @@
 import matplotlib.pyplot as plt
 import yaml
 import re
-from yamlinclude import YamlIncludeConstructor
 from pathlib import Path
 
-PATH = Path(__file__).parent
-YamlIncludeConstructor.add_to_loader_class(loader_class=yaml.FullLoader, base_dir=PATH / 'floris_input_files/')
-
-
 # HOPP functionss
+from hopp.utilities import load_yaml
 from greenheart.to_organize.H2_Analysis.hopp_for_h2 import hopp_for_h2
 from greenheart.to_organize.H2_Analysis.simple_dispatch import SimpleDispatch
 from greenheart.to_organize.H2_Analysis.compressor import Compressor
@@ -306,9 +302,7 @@ def set_turbine_model(hopp_dict, turbine_model, scenario, parent_path, floris_di
             turbine_file = os.path.join(floris_dir, 'floris_input' + '_' + site_number + '_offgrid.yaml')
         else:
             turbine_file = os.path.join(floris_dir, 'floris_input' + '_' + site_number + '_gridconnected.yaml')
-        with open(turbine_file, 'r') as f:
-            floris_config = yaml.load(f, yaml.FullLoader)
-            # floris_config = yaml.load(f, yaml.SafeLoader)
+        floris_config = load_yaml(turbine_file)
         nTurbs = len(floris_config['farm']['layout_x'])
         # turbine_type = floris_config['farm']['turbine_type'][0]
         turbine_type = floris_config['farm']['turbine_type'][0]['turbine_type']

diff --git a/hopp/tools/hopp_tools.py b/hopp/tools/hopp_tools.py
@@ -7,11 +7,11 @@
 import matplotlib.pyplot as plt
 import yaml
 import re
-# from yamlinclude import YamlIncludeConstructor
 from pathlib import Path
 
 
 # HOPP functionss
+from hopp.utilities import load_yaml
 from hopp.to_organize.H2_Analysis.hopp_for_h2 import hopp_for_h2
 from hopp.simulation.technologies.sites import SiteInfo
 from hopp.to_organize.H2_Analysis.simple_dispatch import SimpleDispatch
@@ -91,9 +91,7 @@ def set_turbine_model(turbine_model, scenario, parent_path, floris_dir, floris):
         ################################
 
         turbine_file = floris_dir + 'floris_input' + turbine_model + '_' + site_number + '.yaml'
-        with open(turbine_file, 'r') as f:
-            floris_config = yaml.load(f, yaml.FullLoader)
-            # floris_config = yaml.load(f, yaml.SafeLoader)
+        floris_config = load_yaml(turbine_file)
         nTurbs = len(floris_config['farm']['layout_x'])
         # turbine_type = floris_config['farm']['turbine_type'][0]
         turbine_type = floris_config['farm']['turbine_type'][0]['turbine_type']

diff --git a/requirements.txt b/requirements.txt
@@ -44,7 +44,6 @@ CoolProp
 attrs
 utm
 orbit-nrel @ git+https://github.com/WISDEM/ORBIT.git@3baed36052d7503de6ea6f2db0b40945d637ea35
-pyyaml-include <= 1.4.1
 electrolyzer @ git+https://github.com/jaredthomas68/electrolyzer.git@smoothing
 ProFAST @ git+https://github.com/NREL/ProFAST.git
 openmdao[all]
diff --git a/tests/greenheart/hopp_tools_test.py b/tests/greenheart/hopp_tools_test.py
@@ -7,11 +7,9 @@
 import matplotlib.pyplot as plt
 import yaml
 import re
-from yamlinclude import YamlIncludeConstructor
-YamlIncludeConstructor.add_to_loader_class(loader_class=yaml.FullLoader, base_dir='/your/conf/dir')
-
 
 # HOPP functionss
+from hopp.utilities import load_yaml
 from greenheart.to_organize.H2_Analysis.hopp_for_h2 import hopp_for_h2
 from hopp.simulation.technologies.sites import SiteInfo
 from greenheart.to_organize.H2_Analysis.simple_dispatch import SimpleDispatch
@@ -88,9 +86,7 @@ def set_turbine_model(turbine_model, scenario, parent_path, floris_dir):
     ################################
 
     turbine_file = floris_dir + 'floris_input' + turbine_model + '_' + site_number + '.yaml'
-    with open(turbine_file, 'r') as f:
-        floris_config = yaml.load(f, yaml.FullLoader)
-        # floris_config = yaml.load(f, yaml.SafeLoader)
+    floris_config = load_yaml(turbine_file)
     nTurbs = len(floris_config['farm']['layout_x'])
     # turbine_type = floris_config['farm']['turbine_type'][0]
     turbine_type = floris_config['farm']['turbine_type'][0]['turbine_type']