Merge pull request #32 from AgPipeline/develop

Merging develop to main branch - 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: "3"
+              clean_leftover_output_count: "1"
               clean_leftover_makeflow_count: "2"
     steps:
       - name: Fetch source code

.github/workflows/short_workflow_check.sh

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

README.md

@@ -215,7 +215,7 @@ Please refer to the [Docker](https://www.docker.com/) documentation for more inf
 
 ```bash
 cp jx-args.json.example jx-args.json
-docker build --progress=plain -t agdrone/canopycover-workflow:latest .
+docker build -t agdrone/canopycover-workflow:latest .
 ```
 
 ## Monitoring the Workflow <a name="monitoring" />

scif_app_recipes/canopycover_v0.0.1_ubuntu16.04.scif

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