move filter.yaml to main folder

USEPA · Aug 24, 2021 · 19fb8e8 · 19fb8e8
1 parent d343f35
commit 19fb8e8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/chemicalmatcher/globals.py b/chemicalmatcher/globals.py
@@ -12,7 +12,7 @@
 output_dir = MODULEPATH + 'output/'
 data_dir = MODULEPATH + 'data/'
 
-SRSconfig = config(MODULEPATH + 'config.yaml')['databases']['SRS']
+SRSconfig = config(config_path = MODULEPATH)['databases']['SRS']
 base  = SRSconfig['url']
 
 #Certain characters return errors or missing results but if replaces

diff --git a/facilitymatcher/globals.py b/facilitymatcher/globals.py
@@ -30,7 +30,7 @@
 ext_folder = 'FRS Data Files'
 FRSpath = paths.local_path + '/' + ext_folder
 
-FRS_config = config(MODULEPATH + 'config.yaml')['databases']['FRS']
+FRS_config = config(config_path = MODULEPATH)['databases']['FRS']
 
 inventory_to_FRS_pgm_acronymn = FRS_config['program_dictionary']
 stewi_inventories = list(inventory_to_FRS_pgm_acronymn.keys())

diff --git a/stewi/filter.py b/stewi/filter.py
@@ -8,7 +8,7 @@
 import pandas as pd
 from stewi.globals import data_dir, import_table, config, read_inventory
 
-filter_config = config(data_dir + 'filter.yaml')
+filter_config = config(file = 'filter.yaml')
 
 def apply_filter_to_inventory(inventory, inventory_acronym, year, filter_list):
     # Apply filters if present

diff --git a/stewi/data/filter.yaml → stewi/filter.yaml b/stewi/data/filter.yaml → stewi/filter.yaml
diff --git a/stewi/globals.py b/stewi/globals.py
@@ -116,10 +116,11 @@ def set_stewi_meta(file_name, inventory_format = ''):
     return stewi_meta
 
 
-def config(config_path=MODULEPATH + 'config.yaml'):
+def config(config_path=MODULEPATH, file='config.yaml'):
     """Read and return stewi configuration file"""
     configfile = None
-    with open(config_path, mode='r') as f:
+    path = config_path + file
+    with open(path, mode='r') as f:
         configfile = yaml.load(f,Loader=yaml.FullLoader)
     return configfile