Merge pull request #210 from NOAA-GFDL/rename-split

Use fre-cli rename-split

Author: ceblanton

.github/workflows/create_test_conda_env.yml

@@ -92,38 +92,6 @@ jobs:
         run: |
           pylint -v --rcfile ./pylintrc --fail-under 10.0 ./app/combine-statics
 
-      - name: rename-split-to-pp pytest
-        run: |
-          pytest -vv -rx app/rename-split-to-pp/tests
-
-      - name: rename-split-to-pp pylint
-        run: |
-          pylint -v --rcfile ./pylintrc --fail-under 3.2 ./app/rename-split-to-pp
-
-      - name: combine-timeavgs pytest (STEP CONTINUES ON FAILURE)
-        continue-on-error: true
-        run: |
-          echo "i have no tests yet"
-          pytest -vv -rx app/combine-timeavgs/tests
-
-      - name: combine-timeavgs pylint (STEP CONTINUES ON FAILURE)
-        continue-on-error: true
-        run: |
-          echo "i am not python in any part yet"
-          pylint -v --rcfile ./pylintrc --fail-under 0.0 ./app/combine-timeavgs
-
-      - name: make-timeavgs pytest (STEP CONTINUES ON FAILURE)
-        continue-on-error: true
-        run: |
-          echo "i have no tests yet"
-          pytest -vv -rx app/make-timeavgs/tests
-
-      - name: make-timeavgs pylint (STEP CONTINUES ON FAILURE)
-        continue-on-error: true
-        run: |
-          echo "i am not python in any part yet"
-          pylint -v --rcfile ./pylintrc --fail-under 0.0 ./app/make-timeavgs
-
       - name: analysis pytest (STEP CONTINUES ON FAILURE)
         continue-on-error: true
         run: |

.github/workflows/test_cloud_runner.yml

@@ -297,38 +297,6 @@ jobs:
               exit 2
           fi
 
-      - name: Print rename-split-to-pp successes or failures (FAILURE-GUARDED)
-        continue-on-error: true
-        run: |
-          set +e
-          # Successes 
-          success=$(grep -E "CYLC_JOB_EXIT=SUCCEEDED" /contrib-efs/container-test/ppp-setup/cylc-run/test_pp__ptest__ttest/log/job/*/rename-split-to-pp*/0[1-3]/job.status)
-          exit_status_1=$? 
-
-          # Failures
-          failure=$(grep -E "CYLC_JOB_EXIT=ERR" /contrib-efs/container-test/ppp-setup/cylc-run/test_pp__ptest__ttest/log/job/*/rename-split-to-pp*/0[1-3]/job.status)
-          exit_status_2=$?
-
-          if [ $exit_status_1 -eq 0 ]; then
-              echo $success | sed 's/ /\n/g' #split string by spaces
-          elif [ $exit_status_1 -eq 1 ]; then
-              echo "No succeeded tasks found"
-          else
-              echo "WARNING: error with grep execution"
-              exit 2
-          fi
-
-          if [ $exit_status_2 -eq 0 ]; then
-              echo "Failures found"
-              echo $failure | sed 's/ /\n/g' #split string by spaces
-              exit 1   #exit with error
-          elif [ $exit_status_2 -eq 1 ]; then
-              echo "No task failures found."
-          else
-              echo "WARNING: error with grep execution"
-              exit 2
-          fi
-
       - name: Print split-netcdf successes or failures
         run: |
           set +e

Jinja2Filters/form_remap_dep.py

@@ -63,7 +63,7 @@ def form_remap_dep(grid_type: str,
     # and omitted for secondary chunk generation.
     if output_type == "ts":
         if str(history_segment) == str(chunk):
-            prereq_task = "rename-split-to-pp"
+            prereq_task = "split-netcdf"
         else:
             prereq_task = "make-timeseries"
     elif output_type== "av":
@@ -151,13 +151,13 @@ def form_remap_dep(grid_type: str,
             for src in value:
                 if makets_stmt != '':
                 # make-timeseries and make-timeavgs tasks have the chunksize in the task name,
-                # but rename-split-to-pp does not
-                    if prereq_task == 'rename-split-to-pp':
+                # but split-netcdf does not
+                    if prereq_task == 'split-netcdf':
                         makets_stmt = f"{makets_stmt} & {prereq_task}-{grid}_{src}"
                     else:
                         makets_stmt = f"{makets_stmt} & {prereq_task}-{grid}-{chunk}_{src}"
                 else:
-                    if prereq_task == 'rename-split-to-pp':
+                    if prereq_task == 'split-netcdf':
                         makets_stmt = f"{prereq_task}-{grid}_{src}"
                     else:
                         makets_stmt = f"{prereq_task}-{grid}-{chunk}_{src}"

Jinja2Filters/get_climatology_info.py

@@ -80,13 +80,13 @@ def graph(self, history_segment, clean_work):
                     connector = " & "
                 if count == 0:
                     if self.pp_chunk == history_segment:
-                        graph += f"{connector}rename-split-to-pp-{grid}_{source}"
+                        graph += f"{connector}split-netcdf-{grid}_{source}"
                     else:
                         graph += f"{connector}make-timeseries-{grid}-{self.pp_chunk}_{source}"
                 else:
                     offset = count * self.pp_chunk
                     if self.pp_chunk == history_segment:
-                        graph += f" & rename-split-to-pp-{grid}_{source}[{offset}]"
+                        graph += f" & split-netcdf-{grid}_{source}[{offset}]"
                     else:
                         graph += f" & make-timeseries-{grid}-{self.pp_chunk}_{source}[{offset}]"
                 count += 1

Jinja2Filters/tests/form_remap_dep_test.py

@@ -40,7 +40,7 @@ def sample_yaml(tmp_path):
 
 def test_regrid_one_one(sample_yaml):
     """atmos regrid 1-year history to 1-year timeseries"""
-    result = "rename-split-to-pp-regrid_atmos_daily & rename-split-to-pp-regrid_atmos_month => remap-pp-components-ts-P1Y_atmos\n"
+    result = "split-netcdf-regrid_atmos_daily & split-netcdf-regrid_atmos_month => remap-pp-components-ts-P1Y_atmos\n"
     assert result == form_remap_dep.form_remap_dep(grid_type='regrid-xy',
                                                    temporal_type='temporal',
                                                    chunk='P1Y',
@@ -74,7 +74,7 @@ def test_regrid_two_one(sample_yaml):
 
 def test_native_one_one(sample_yaml):
     """land native 1-year history to 1-year timeseries"""
-    result = "rename-split-to-pp-native_land_daily & rename-split-to-pp-native_land_month & rename-split-to-pp-native_river => remap-pp-components-ts-P1Y_land_cubic\n"
+    result = "split-netcdf-native_land_daily & split-netcdf-native_land_month & split-netcdf-native_river => remap-pp-components-ts-P1Y_land_cubic\n"
     assert result == form_remap_dep.form_remap_dep(grid_type='native',
                                                    temporal_type='temporal',
                                                    chunk='P1Y',