JNIE - More aggresive fix to convert_csv_to_yaml

Author: jtniehof

scripts/convert_product_definition_to_yaml.py

@@ -37,7 +37,8 @@ def convert_csv_to_yaml(file_path):
                 else:
                     required_variables = required_for_data
 
-                if "RECORD_VARYING" in header_to_index and row[header_to_index["RECORD_VARYING"]].lower() == "nrv":
+                if (("RECORD_VARYING" in required_variables or "RECORD_VARYING" in header_to_index)
+                   and row[header_to_index["RECORD_VARYING"]].lower() == "nrv"):
                     required_variables = [variable for variable in required_variables if
                                           variable != "DEPEND_0"]
 

tests/scripts/test_convert_product_definition_to_yaml.py

@@ -25,7 +25,8 @@ def test_parse_required_for_data_with_multiple_depend(self):
             "FILLVAL": ["-1.00E+31", "", ""],
             "LABL_PTR_1": ["energy_label", "", ""],
             "LABL_PTR_2": ["pitch_angle_label", "", ""],
-            "VARIABLE_PURPOSE": ["primary var, summary", "", ""]
+            "VARIABLE_PURPOSE": ["primary var, summary", "", ""],
+            "RECORD_VARYING": ["rv", "nrv", "nrv"]
         }
 
         rows = [
@@ -58,6 +59,7 @@ def test_parse_required_for_data_with_multiple_depend(self):
    LABL_PTR_1: energy_label
    LABL_PTR_2: pitch_angle_label
    VARIABLE_PURPOSE: primary var, summary
+   RECORD_VARYING: rv
 energy_label:
    NAME: energy_label
    DATA_TYPE: str
@@ -160,7 +162,8 @@ def test_parse_required_for_support_data_non_rv(self):
 
     def test_parse_required_for_data_epoch(self):
         required_for_data = ["NAME", "DATA_TYPE", "CATDESC", "VAR_TYPE", "DEPEND_0", "DISPLAY_TYPE",
-                             "FIELDNAM", "FORMAT", "LABLAXIS", "UNITS", "VALIDMIN", "VALIDMAX", "FILLVAL"]
+                             "FIELDNAM", "FORMAT", "LABLAXIS", "UNITS", "VALIDMIN", "VALIDMAX", "FILLVAL",
+                             "RECORD_VARYING"]
 
         test_csv_values = [
             "epoch",
@@ -175,7 +178,8 @@ def test_parse_required_for_data_epoch(self):
             "",
             "",
             "",
-            "-1.00E+31"
+            "-1.00E+31",
+            "rv"
         ]
         filePath = "csv_test_file.csv"
         with open(filePath, "w", newline='') as csvfile:
@@ -193,7 +197,8 @@ def test_parse_required_for_data_epoch(self):
    UNITS: ' '
    VALIDMIN: ' '
    VALIDMAX: ' '
-   FILLVAL: -1.00E+31"""
+   FILLVAL: -1.00E+31
+   RECORD_VARYING: rv"""
         actual_yaml = convert_csv_to_yaml(filePath)
         self.assertEqual(expected_yaml, actual_yaml)