From 668431b2d7989f9ed9bd1bd5a05b2046f94534da Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Tue, 16 Feb 2021 10:43:15 -0700 Subject: [PATCH 1/4] Updating for ubuntu 20.04 --- .github/workflows/testing_checks.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/testing_checks.yaml b/.github/workflows/testing_checks.yaml index 6d9fa29..65fa939 100644 --- a/.github/workflows/testing_checks.yaml +++ b/.github/workflows/testing_checks.yaml @@ -33,11 +33,10 @@ jobs: steps: - name: Current python version run: python3 --version || echo python3 not installed - - name: Install Python 3.7 + - name: Install Python 3.8 uses: actions/setup-python@v2 with: - python-version: '3.7' - id: install_python_3_7 + python-version: '3.8' - name: Updated python version run: python3 --version - name: PYTHONPATH environment variable @@ -54,13 +53,13 @@ jobs: run: find . -type f -name "*.py" > action_test_files.txt - name: Install system requirements shell: bash - run: 'sudo apt-get install -y python3-gdal gdal-bin libgdal-dev gcc g++ python3.7-dev' + run: 'sudo apt-get install -y python3-gdal gdal-bin libgdal-dev gcc g++ python3.8-dev' - name: Install Python numpy shell: bash run: 'python3 -m pip install --upgrade --no-cache-dir numpy wheel' - name: Install Python pygdal shell: bash - run: 'python3 -m pip install --no-cache-dir pygdal==2.2.3.5' + run: 'python3 -m pip install --no-cache-dir pygdal==3.0.4.*' - name: Install system requirements from source shell: bash run: 'if [ -s "packages.txt" ]; then (cat packages.txt | sudo xargs apt-get install -y --no-install-recommends) || (echo "Failed to install additional packages" && exit 1); fi' From a1858ced0ab27e90ea8818623717a1f7064008c0 Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Wed, 17 Feb 2021 16:13:52 -0700 Subject: [PATCH 2/4] Actions testing --- .github/workflows/testing_checks.yaml | 3 ++- .github/workflows/testing_docker.yaml | 1 + Dockerfile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing_checks.yaml b/.github/workflows/testing_checks.yaml index 65fa939..b63c8f2 100644 --- a/.github/workflows/testing_checks.yaml +++ b/.github/workflows/testing_checks.yaml @@ -4,6 +4,7 @@ on: branches: - master - develop + - ubuntu20.04 pull_request: branches: - master @@ -17,7 +18,7 @@ on: jobs: testing: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 name: Running testing strategy: matrix: diff --git a/.github/workflows/testing_docker.yaml b/.github/workflows/testing_docker.yaml index 0509c75..0f41c56 100644 --- a/.github/workflows/testing_docker.yaml +++ b/.github/workflows/testing_docker.yaml @@ -4,6 +4,7 @@ on: branches: - master - develop + - ubuntu20.04 pull_request: branches: - master diff --git a/Dockerfile b/Dockerfile index dfa30ad..6f073ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # automatically generated: 2020-05-20T08:40:04.406489 -FROM agdrone/rgb-plot-base-image:latest +FROM agdrone/rgb-plot-base-image:1.8 LABEL maintainer="Jacob van der Leeuw " COPY requirements.txt packages.txt /home/extractor/ From adcbb2966658913b129fb61f0c00656784b1ae77 Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Wed, 17 Feb 2021 16:26:26 -0700 Subject: [PATCH 3/4] Removing testing stuff --- .github/workflows/testing_checks.yaml | 1 - .github/workflows/testing_docker.yaml | 1 - Dockerfile | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/testing_checks.yaml b/.github/workflows/testing_checks.yaml index b63c8f2..560259f 100644 --- a/.github/workflows/testing_checks.yaml +++ b/.github/workflows/testing_checks.yaml @@ -4,7 +4,6 @@ on: branches: - master - develop - - ubuntu20.04 pull_request: branches: - master diff --git a/.github/workflows/testing_docker.yaml b/.github/workflows/testing_docker.yaml index 0f41c56..0509c75 100644 --- a/.github/workflows/testing_docker.yaml +++ b/.github/workflows/testing_docker.yaml @@ -4,7 +4,6 @@ on: branches: - master - develop - - ubuntu20.04 pull_request: branches: - master diff --git a/Dockerfile b/Dockerfile index 6f073ba..dfa30ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # automatically generated: 2020-05-20T08:40:04.406489 -FROM agdrone/rgb-plot-base-image:1.8 +FROM agdrone/rgb-plot-base-image:latest LABEL maintainer="Jacob van der Leeuw " COPY requirements.txt packages.txt /home/extractor/ From 5e2b999e39e89111bce6d73348a7e7c9a4df63f1 Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Thu, 18 Feb 2021 10:09:37 -0700 Subject: [PATCH 4/4] Updated testing data for new gdal --- test_data/rgb_plot.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_data/rgb_plot.csv b/test_data/rgb_plot.csv index 588ca1f..dbf916e 100644 --- a/test_data/rgb_plot.csv +++ b/test_data/rgb_plot.csv @@ -1,2 +1,2 @@ species,site,timestamp,lat,lon,citation_author,citation_year,citation_title,excess greenness index excess_greenness_index ([-510:510]), green leaf index green_leaf_index ( [-1:1]), cive cive ( [-255:255]), normalized difference index normalized_difference_index(pxarray) ( [-127:129]), excess red excess_red ( [-255:255]), exgr exgr ( [-255:332]), combined indices 1 combined_indices_1 ( [-1000:1000]), combined indices 2 combined_indices_2 ( [-1000:1000]), vegetative index vegetative_index ( [-255:255]), normalized green-red difference ngrdi ( [-255:255]), percent green percent_green ( [0:100]) -Sorghum bicolor,,2018-10-11,33.07454704500288,-111.97502671168861,"Clairessa Brown","2020","Woebbecke, D.M. et al",14,0.02,16.2,-1.53,56.5,-42.5,30.2,12.8,1.02,-0.02,0.34 +Sorghum bicolor,,2018-10-11,33.074547045002895,-111.97502671168866,"Clairessa Brown","2020","Woebbecke, D.M. et al",14,0.02,16.2,-1.53,56.5,-42.5,30.2,12.8,1.02,-0.02,0.34