From a1c8f1db06fad4f64df15f5605397fb848563a50 Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Thu, 1 Apr 2021 10:33:11 -0700 Subject: [PATCH 1/2] Removing source code archives --- .dockerignore | 2 +- scif_app_recipes/canopycover_v0.0.1_ubuntu20.04.scif | 2 +- scif_app_recipes/greenness_v0.0.1_ubuntu20.04.scif | 2 +- scif_app_recipes/plotclip_v0.0.1_ubuntu20.04.scif | 3 +-- scif_app_recipes/soilmask_ratio_v0.0.1_ubuntu20.04.scif | 2 +- scif_app_recipes/soilmask_v0.0.1_ubuntu20.04.scif | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.dockerignore b/.dockerignore index 76e579a..f8c1341 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,2 @@ -test +test* diff --git a/scif_app_recipes/canopycover_v0.0.1_ubuntu20.04.scif b/scif_app_recipes/canopycover_v0.0.1_ubuntu20.04.scif index 2fe6b35..57f0e20 100644 --- a/scif_app_recipes/canopycover_v0.0.1_ubuntu20.04.scif +++ b/scif_app_recipes/canopycover_v0.0.1_ubuntu20.04.scif @@ -4,7 +4,7 @@ tar xvf canopycover.tar.gz mv transformer-canopycover-1.7 src echo "Removing unneeded files" - rm -rf --verbose src/test_data src/tests src/.github + rm -rf --verbose src/test_data src/tests src/.github canopycover.tar.gz # Install Makeflow and other dependencies python3.8 -m venv --system-site-packages .venv diff --git a/scif_app_recipes/greenness_v0.0.1_ubuntu20.04.scif b/scif_app_recipes/greenness_v0.0.1_ubuntu20.04.scif index 797c257..2af1bf9 100644 --- a/scif_app_recipes/greenness_v0.0.1_ubuntu20.04.scif +++ b/scif_app_recipes/greenness_v0.0.1_ubuntu20.04.scif @@ -16,7 +16,7 @@ rm -r transformer-rgb-indices-1.3 .venv/bin/python3 -m pip install --upgrade --no-cache-dir -r "${PWD}/src/requirements.txt" echo "Removing unneeded files" - rm -rf --verbose src/test_data src/tests src/.github + rm -rf --verbose src/test_data src/tests src/.github plot_base_rgb.tar.gz greenness_indices.tar.gz # Add example Docker command to SCIF app help section if [ -n $DOCKER_IMAGE ]; then diff --git a/scif_app_recipes/plotclip_v0.0.1_ubuntu20.04.scif b/scif_app_recipes/plotclip_v0.0.1_ubuntu20.04.scif index b5ea9f4..9cec12b 100644 --- a/scif_app_recipes/plotclip_v0.0.1_ubuntu20.04.scif +++ b/scif_app_recipes/plotclip_v0.0.1_ubuntu20.04.scif @@ -4,8 +4,7 @@ tar xvf plotclip.tar.gz mv transformer-plotclip-2.7 src echo "Removing unneeded files" - rm -rf --verbose src/test_data src/tests src/.github - rm plotclip.tar.gz + rm -rf --verbose src/test_data src/tests src/.github plotclip.tar.gz # Install Makeflow and other dependencies python3.8 -m venv --system-site-packages .venv diff --git a/scif_app_recipes/soilmask_ratio_v0.0.1_ubuntu20.04.scif b/scif_app_recipes/soilmask_ratio_v0.0.1_ubuntu20.04.scif index 6659bb9..22a04dd 100644 --- a/scif_app_recipes/soilmask_ratio_v0.0.1_ubuntu20.04.scif +++ b/scif_app_recipes/soilmask_ratio_v0.0.1_ubuntu20.04.scif @@ -4,7 +4,7 @@ tar xvzf soilmask_ratio.tar.gz mv transformer-soilmask-by-ratio-1.1 src echo "Removing unneeded files" - rm -rf --verbose src/test_data src/tests src/.github src/figures + rm -rf --verbose src/test_data src/tests src/.github src/figures soilmask_ratio.tar.gz # Install Makeflow and other dependencies python3.8 -m venv --system-site-packages .venv diff --git a/scif_app_recipes/soilmask_v0.0.1_ubuntu20.04.scif b/scif_app_recipes/soilmask_v0.0.1_ubuntu20.04.scif index db51eb1..1f31c39 100644 --- a/scif_app_recipes/soilmask_v0.0.1_ubuntu20.04.scif +++ b/scif_app_recipes/soilmask_v0.0.1_ubuntu20.04.scif @@ -4,7 +4,7 @@ tar xvzf soilmask.tar.gz mv transformer-soilmask-2.3 src echo "Removing unneeded files" - rm -rf --verbose src/test_data src/tests src/.github src/figures + rm -rf --verbose src/test_data src/tests src/.github src/figures soilmask.tar.gz # Install Makeflow and other dependencies python3.8 -m venv --system-site-packages .venv From b5cc66d3f220f6c348b3959b697a59ac08a2be7f Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Mon, 5 Apr 2021 10:14:18 -0700 Subject: [PATCH 2/2] Update due to Actions environment change --- .github/workflows/testing_checks.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/testing_checks.yaml b/.github/workflows/testing_checks.yaml index 1574d93..1029611 100644 --- a/.github/workflows/testing_checks.yaml +++ b/.github/workflows/testing_checks.yaml @@ -53,6 +53,9 @@ jobs: uses: actions/checkout@v2 - name: Finding files run: find . -type f -name "*.py" | grep -v 'tests/' > action_pylint_files.txt + - name: Update apt databases + shell: bash + run: 'sudo apt-get update' - name: Install system requirements shell: bash run: 'sudo apt-get install -y python3-gdal gdal-bin libgdal-dev gcc g++ python3.8-dev'