Merge pull request #20 from AgPipeline/plotclip_update

Updated to use latest plotclip - no review

.github/workflows/docker_build_test.yaml

@@ -81,7 +81,7 @@ jobs:
               docker_params: -v "${PWD}/inputs:/scif/data/odm_workflow/images" -v "${PWD}/outputs:/output" -v "${PWD}/checkpoints:/scif/data/short_workflow"
               parameters: orthomosaic plot_shapes.shp
               result_check_script: "short_workflow_check.sh"
-              clean_leftover_output_count: "10"
+              clean_leftover_output_count: "3"
               clean_leftover_makeflow_count: "2"
     steps:
       - name: Fetch source code

.github/workflows/short_workflow_check.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Define some counts that we expect (the number of sub-folders plus the top folder)
-EXPECTED_NUM_FOLDERS=65
+EXPECTED_NUM_FOLDERS=58
 EXPECTED_NUM_CANOPYCOVER_CSV=56
 # The same number of CSV files + original, un-clipped mask file
 EXPECTED_NUM_MASK_TIF=$((EXPECTED_NUM_CANOPYCOVER_CSV + 1))

scif_app_recipes/plotclip_v0.0.1_ubuntu16.04.scif

@@ -1,8 +1,8 @@
 %appinstall plotclip
     # Download plotclip code. In the future use pip/conda install.
-    wget -O plotclip.tar.gz https://github.com/AgPipeline/transformer-plotclip/archive/v2.2.tar.gz
+    wget -O plotclip.tar.gz https://github.com/AgPipeline/transformer-plotclip/archive/v2.3.tar.gz
     tar xvf plotclip.tar.gz
-    mv transformer-plotclip-2.2 src
+    mv transformer-plotclip-2.3 src
 
     # Install packages needed
     python3 -m venv --system-site-packages .venv