small modifications with config files and unit test

Author: agrouaze

grdwindinversion/data_config.yaml

@@ -1,5 +1,8 @@
-#'ecmwf_0100_1h': '../ecmwf/forecast/hourly/0100deg/netcdf_light_REPRO_tree/%Y/%j/ECMWF_FORECAST_0100_%Y%m%d%H%M_10U_10V.nc'
-#'ecmwf_0125_1h': '../ecmwf/0.125deg/1h/forecasts/%Y/%j/ecmwf_%Y%m%d%H%M.nc'
+'ecmwf_0100_1h': '../ecmwf/forecast/hourly/0100deg/netcdf_light_REPRO_tree/%Y/%j/ECMWF_FORECAST_0100_%Y%m%d%H%M_10U_10V.nc'
+'ecmwf_0125_1h': '../ecmwf/0.125deg/1h/forecasts/%Y/%j/ecmwf_%Y%m%d%H%M.nc'
+
+
+unit_test_s1_product: './sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2021/252/S1A_IW_GRDH_1SDV_20210909T130650_20210909T130715_039605_04AE83_C34F.SAFE'
+unit_test_rcm_product: './l1/rcm/rcm-1/sclnd/2023/273/RCM1_OK2767220_PK2769320_1_SCLND_20230930_214014_VV_VH_GRD'
+unit_test_rs2_product: './L1/VV_VH/2022/247/RS2_OK141302_PK1242223_DK1208537_SCWA_20220904_093402_VV_VH_SGF'
 
-'ecmwf_0100_1h': '/home/datawork-cersat-public/provider/ecmwf/forecast/hourly/0100deg/netcdf_light_REPRO_tree/%Y/%j/ECMWF_FORECAST_0100_%Y%m%d%H%M_10U_10V.nc'
-'ecmwf_0125_1h': '/home/datawork-cersat-intranet/project/ecmwf/0.125deg/1h/forecasts/%Y/%j/ecmwf_%Y%m%d%H%M.nc'

grdwindinversion/load_config.py

@@ -3,11 +3,14 @@
 import os
 import grdwindinversion
 from yaml import CLoader as Loader
-local_config_potential_path = os.path.expanduser(
+local_config_potential_path1 = os.path.expanduser(
     '~/.grdwindinversion/data_config.yaml')
-
-if os.path.exists(local_config_potential_path):
-    config_path = local_config_potential_path
+local_config_potential_path2  = os.path.join(os.path.dirname(
+        grdwindinversion.__file__), 'local_data_config.yaml')
+if os.path.exists(local_config_potential_path1):
+    config_path = local_config_potential_path1
+elif os.path.exists(local_config_potential_path2):
+    config_path = local_config_potential_path2
 else:
     config_path = os.path.join(os.path.dirname(
         grdwindinversion.__file__), 'data_config.yaml')

tests/test_grdwindinversion_ci.py

@@ -2,6 +2,8 @@
 import os
 import urllib.request
 from grdwindinversion.inversion import makeL2
+import xsar
+from grdwindinversion.load_config import getConf
 
 # What must be done by the tests:
 # - Download L1 data
@@ -13,12 +15,15 @@
 # - For recal : download auxiliary files
 #
 
-
+S1_path = getConf()['unit_test_s1_product']
+rcm_path = getConf()['unit_test_rcm_product']
+rs2_path = getConf()['unit_test_rs2_product']
+print('S1_path',S1_path)
 def test_makeL2_generation():
     l1_files = [
-        "./test_data/L1/S1A_IW_GRDH_1SDV_20210909T130650_20210909T130715_039605_04AE83_C34F.SAFE",
-        "./test_data/L1/RCM1_OK2767220_PK2769320_1_SCLND_20230930_214014_VV_VH_GRD",
-        "./test_data/L1/RS2_OK141302_PK1242223_DK1208537_SCWA_20220904_093402_VV_VH_SGF"
+        xsar.get_test_file(S1_path),
+        xsar.get_test_file(rcm_path),
+        xsar.get_test_file(rs2_path)
     ]
 
     # l1_files = [
@@ -52,3 +57,6 @@ def test_makeL2_generation():
         assert (
             "owiWindSpeed" in dataset.variables
         ), "Expected variable 'owiWindSpeed' missing in the dataset"
+
+if __name__ == '__main__':
+    test_makeL2_generation()