From f86e4ab6c27f9ccb3b6e360f4602ace86c5f94c3 Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Tue, 15 Sep 2020 11:53:16 -0700 Subject: [PATCH 1/3] Updated to use latest plotclip --- scif_app_recipes/plotclip_v0.0.1_ubuntu16.04.scif | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scif_app_recipes/plotclip_v0.0.1_ubuntu16.04.scif b/scif_app_recipes/plotclip_v0.0.1_ubuntu16.04.scif index 0d9f2b1..6b8cbeb 100644 --- a/scif_app_recipes/plotclip_v0.0.1_ubuntu16.04.scif +++ b/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 From 34643aabad7e7c26c9c2f8e572f0a8e1f4c26db6 Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Tue, 15 Sep 2020 12:23:29 -0700 Subject: [PATCH 2/3] Adjusting clip count --- .github/workflows/short_workflow_check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/short_workflow_check.sh b/.github/workflows/short_workflow_check.sh index 2d70617..e45b1e0 100755 --- a/.github/workflows/short_workflow_check.sh +++ b/.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)) From 26b2f47e1b6685dc16f9ad46b749e0ef04b302aa Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Tue, 15 Sep 2020 12:57:05 -0700 Subject: [PATCH 3/3] More count adjustments --- .github/workflows/docker_build_test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker_build_test.yaml b/.github/workflows/docker_build_test.yaml index 257b1b5..6c9beff 100644 --- a/.github/workflows/docker_build_test.yaml +++ b/.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