Skip to content

Commit

Permalink
Merge pull request #47 from AgPipeline/develop
Browse files Browse the repository at this point in the history
Merging cleanup in recipes - no review
  • Loading branch information
Chris-Schnaufer authored Jun 8, 2021
2 parents fa97f12 + e63d545 commit ed0c55f
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
test
test*

3 changes: 3 additions & 0 deletions .github/workflows/testing_checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion scif_app_recipes/canopycover_v0.0.1_ubuntu20.04.scif
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scif_app_recipes/greenness_v0.0.1_ubuntu20.04.scif
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions scif_app_recipes/plotclip_v0.0.1_ubuntu20.04.scif
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scif_app_recipes/soilmask_ratio_v0.0.1_ubuntu20.04.scif
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scif_app_recipes/soilmask_v0.0.1_ubuntu20.04.scif
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ed0c55f

Please sign in to comment.