import directly from wxflow

NOAA-EMC · Jul 8, 2023 · 4d585fc · 4d585fc
1 parent f743d9c
commit 4d585fc
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 18 deletions.
diff --git a/scripts/exgdas_global_marine_analysis_post.py b/scripts/exgdas_global_marine_analysis_post.py
@@ -23,7 +23,7 @@
 import shutil
 import logging
 from datetime import datetime, timedelta
-from wxflow.file_utils import FileHandler
+from wxflow import FileHandler
 
 
 # TODO: Move this somewhere else?

diff --git a/scripts/exgdas_global_marine_analysis_prep.py b/scripts/exgdas_global_marine_analysis_prep.py
@@ -32,10 +32,7 @@
 from netCDF4 import Dataset
 import xarray as xr
 import numpy as np
-from wxflow.attrdict import AttrDict
-from wxflow.template import Template, TemplateConstants
-from wxflow.yaml_file import YAMLFile
-from wxflow.file_utils import FileHandler
+from wxflow import (AttrDict, Template, TemplateConstants, YAMLFile, FileHandler)
 
 # set up logger
 logging.basicConfig(format='%(asctime)s:%(levelname)s:%(message)s', level=logging.INFO, datefmt='%Y-%m-%d %H:%M:%S')

diff --git a/test/aero/genyaml_3dvar.sh b/test/aero/genyaml_3dvar.sh
@@ -27,9 +27,7 @@ mkdir -p $DATA
 
 # run some python code to generate the YAML
 python3 - <<EOF
-from wxflow.attrdict import AttrDict
-from wxflow.template import Template, TemplateConstants
-from wxflow.yaml_file import YAMLFile
+from wxflow import AttrDict, Template, TemplateConstants, YAMLFile
 import datetime
 
 config = YAMLFile(path='$YAMLin')

diff --git a/test/check_valid_yaml.py b/test/check_valid_yaml.py
@@ -4,7 +4,7 @@
 import os
 import pathlib
 import sys
-from wxflow.yaml_file import YAMLFile
+from wxflow import YAMLFile
 
 
 def check_valid_yaml(repodir):

diff --git a/ush/ioda/gen_bufr2ioda_yaml.py b/ush/ioda/gen_bufr2ioda_yaml.py
@@ -5,8 +5,7 @@
 # and certain configuration parameters
 import argparse
 import os
-from wxflow.template import Template, TemplateConstants
-from wxflow.yaml_file import YAMLFile
+from wxflow import Template, TemplateConstants, YAMLFile
 
 
 # list of satellite radiance BUFR files that need split by SatId

diff --git a/ush/run_jedi_exe.py b/ush/run_jedi_exe.py
@@ -8,7 +8,7 @@
 import sys
 import yaml
 import wxflow
-from wxflow.yaml_file import parse_j2yaml, save_as_yaml
+from wxflow import parse_j2yaml, save_as_yaml
 
 
 def export_envar(yamlfile, bashout):

diff --git a/ush/socaincr2mom6.py b/ush/socaincr2mom6.py
@@ -6,7 +6,7 @@
 from netCDF4 import Dataset
 from scipy.interpolate import griddata
 import ufsda
-from wxflow.yaml_file import YAMLFile
+from wxflow import YAMLFile
 
 
 def socaincr2mom6(incr, bkg, grid, incr_out, nsst_yaml=None):

diff --git a/ush/ufsda/archive.py b/ush/ufsda/archive.py
@@ -5,7 +5,7 @@
 import shutil
 import datetime as dt
 import ufsda
-from wxflow.yaml_file import YAMLFile
+from wxflow import YAMLFile
 
 __all__ = ['atm_diags']
 

diff --git a/ush/ufsda/genYAML.py b/ush/ufsda/genYAML.py
@@ -8,8 +8,7 @@
 import os
 import re
 import yaml
-from wxflow.template import Template, TemplateConstants
-from wxflow.yaml_file import YAMLFile
+from wxflow import Template, TemplateConstants, YAMLFile
 
 
 def genYAML(yamlconfig, output=None):

diff --git a/ush/ufsda/stage.py b/ush/ufsda/stage.py
@@ -12,7 +12,7 @@
 import logging
 import glob
 import numpy as np
-from wxflow.yaml_file import YAMLFile, parse_yaml, parse_j2yaml
+from wxflow import YAMLFile, parse_yaml, parse_j2yaml
 import ufsda.soca_utils
 
 __all__ = ['atm_background', 'atm_obs', 'bias_obs', 'background', 'background_ens', 'fv3jedi', 'obs', 'berror', 'gdas_fix', 'gdas_single_cycle']

diff --git a/ush/ufsda/yamltools.py b/ush/ufsda/yamltools.py
@@ -36,7 +36,7 @@ def save_check(config, target, app='var'):
     config['cost function']['observations']['observers'] = cleaned_obs_spaces
 
     # save cleaned yaml
-    wxflow.yaml_file.save_as_yaml(config, target)
+    wxflow.save_as_yaml(config, target)
 
 
 def parse_config(input_config_dict, template=None, clean=True):