From 2953bd08ebea80dac2946620d3d4f10369395993 Mon Sep 17 00:00:00 2001
From: Robbi Bishop-Taylor <Robbi.BishopTaylor@ga.gov.au>
Date: Fri, 19 Jul 2024 15:58:49 +1000
Subject: [PATCH] Add minimum package versions for ESRI/GDAL nodata fix (#288)

* Add minimum package versions for ESRI/GDAL nodata fix

* Use latest versions of odc-geo and eodatasets

* Download only subset of tide models

* install awscliv2 from conda

* fix indentation of workflow yaml

* output python package version

* Remove pyTMD restriction

---------

Co-authored-by: Emma Ai <emma.ai@ga.gov.au>
---
 .github/workflows/integration-test.yml |  4 +++-
 docker/Dockerfile                      | 11 ++---------
 docker/env.yaml                        |  3 ++-
 docker/requirements.txt                |  6 +++---
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index a83426b3..fb9191d2 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -46,7 +46,9 @@ jobs:
           aws-region: ap-southeast-2
 
       - name: Copy tide modelling files with the AWS CLI
-        run: aws s3 sync s3://dea-non-public-data/tide_models/tide_models tide_models
+        run: |
+          aws s3 sync s3://dea-non-public-data/tide_models/tide_models/fes2014 tide_models/fes2014
+          aws s3 sync s3://dea-non-public-data/tide_models/tide_models/hamtide tide_models/hamtide
 
       - name: Start docker-compose
         run: |
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d1d613ce..0a7ac525 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -48,18 +48,11 @@ RUN echo "Enable server extensions" \
    && jupyter server extension list \
    && echo "...done"
 
-RUN echo "Install AWS CLI v2" \
-   && curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "/tmp/awscliv2.zip" \
-   && unzip /tmp/awscliv2.zip -d /tmp \
-   && /tmp/aws/install -i /env/bin/aws-cli -b /env/bin \
-   && aws --version \
-   && rm -f /tmp/awscliv2.zip \
-   && rm -fr /tmp/aws \
-   && echo "...done"
-
 COPY assets/sync_repo assets/jupyterhub-singleuser /usr/local/bin/
 COPY assets/overrides.json /env/share/jupyter/lab/settings/
 
+RUN pip list --format=freeze 
+
 WORKDIR "/home/$nb_user"
 ENTRYPOINT ["/env/bin/tini", "--"]
 CMD ["jupyter", "lab", \
diff --git a/docker/env.yaml b/docker/env.yaml
index 182be01e..2570e42d 100644
--- a/docker/env.yaml
+++ b/docker/env.yaml
@@ -21,6 +21,7 @@ dependencies:
   - rio-cogeo
   - access
   - aiobotocore
+  - awscliv2
   - boto3
   - s5cmd
   - affine
@@ -204,7 +205,7 @@ dependencies:
   - spyndex
   - urbanaccess
   - contextily
-  - pyTMD<=2.1.0
+  - pyTMD
   - xarray-spatial
 # jupyter things
   - autopep8
diff --git a/docker/requirements.txt b/docker/requirements.txt
index cc82e74b..348af0e6 100644
--- a/docker/requirements.txt
+++ b/docker/requirements.txt
@@ -12,7 +12,7 @@ jupyterlab-logout==0.5.0
 
 # ODC/DEA: these are installed in builder stage
 otps
-eodatasets3
+eodatasets3 >= 0.30.6  # min version required for ESRI/GDAL nodata fix
 
 # Dale's s2cloudmask
 #  https://github.com/daleroberts/s2cloudmask
@@ -21,7 +21,7 @@ s2cloudmask
 opencv-python-headless
 opencv-contrib-python-headless
 
-datacube[performance,s3] >= 1.8.19
+datacube[performance,s3] >= 1.8.19  # min version required for ESRI/GDAL nodata fix
 odc-algo @ git+https://github.com/opendatacube/odc-algo@b8dcfce
 odc-cloud[ASYNC]
 odc-dscache
@@ -29,7 +29,7 @@ odc-io
 odc-stac
 odc-stats[ows]
 odc-ui
-odc-geo
+odc-geo >= 0.4.8  # min version required for ESRI/GDAL nodata fix
 dea-tools
 
 thredds-crawler