Merge remote-tracking branch 'vlab/master' into develop

Add support for PyYAML5.1
NOAA-EMC · Aug 6, 2019 · 3632dc7 · 3632dc7
2 parents cb3385a + 9f74410
commit 3632dc7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/crow/config/__init__.py b/crow/config/__init__.py
@@ -39,7 +39,7 @@ def expand_text(text,scope):
 
 def from_string(s,evaluate_immediates=True,validation_stage=None):
     if not s: raise TypeError('Cannot parse null string')
-    c=ConvertFromYAML(yaml.load(s),CONFIG_TOOLS,ENV)
+    c=ConvertFromYAML(yaml.load(s, Loader=yaml.Loader),CONFIG_TOOLS,ENV)
     result=c.convert(validation_stage=validation_stage,
                      evaluate_immediates=evaluate_immediates)
     return result

diff --git a/rocoto_main.py b/rocoto_main.py
@@ -10,4 +10,4 @@
 
 import worktools ; 
 if __name__ == '__main__':
-    worktools.make_rocoto_xml_for('/Users/jiankuang/Documents/expdir/expdir/test3')
+    worktools.make_rocoto_xml_for('/export/emc-lw-jkuang/jkuang/expdir/expdir/manual_dev')
diff --git a/tests/regression/compare_GFS_comdirs.py b/tests/regression/compare_GFS_comdirs.py
@@ -34,7 +34,7 @@ def get_args():
         if Path(args.cmp_dirs_with_joblevel_file[0]).is_file():
             yaml_file_open =  open(args.cmp_dirs_with_joblevel_file[0], 'r')
             try:
-                file_dic_list = yaml.load( yaml_file_open )
+                file_dic_list = yaml.load( yaml_file_open, Loader=yaml.Loader )
                 using_file_list = True
             except yaml.YAMLError as exc:
                 logger.critical(logger_hdr+'argument %s is not a valid YAML file')
@@ -485,7 +485,7 @@ def get_logger():
         yaml_files_filename_Path = Path(yaml_files_filename)
         if yaml_files_filename_Path.is_file():
             yaml_files_fptr = open(  yaml_files_filename )
-            file_dic_list = yaml.load( yaml_files_fptr  )
+            file_dic_list = yaml.full_load( yaml_files_fptr  )
             yaml_files_fptr.close()
 
         if 'prior_ROTDIR' in file_dic_list: