From b0074c7f44b5bdc97b01b93ebb9ab55e36e944fc Mon Sep 17 00:00:00 2001 From: Robbi Bishop-Taylor Date: Tue, 2 Jul 2024 14:00:00 +1000 Subject: [PATCH 1/6] Update packages --- docker/env.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/env.yaml b/docker/env.yaml index 18db878..56f6c50 100644 --- a/docker/env.yaml +++ b/docker/env.yaml @@ -63,7 +63,7 @@ dependencies: - frozenlist - fsspec - GeoAlchemy2 - - geopandas + - geopandas<1.0.0 - greenlet - HeapDict - icu @@ -109,7 +109,7 @@ dependencies: - pyproj - pyrsistent - pystac - - pystac-client + - pystac-client>=0.8.2 - pytest!=8.1.0 - python-dateutil - python-rapidjson @@ -183,6 +183,7 @@ dependencies: - seaborn - pygeos - cmocean + - gcsfs - geohash2 - geojson - geopy From 0df26e3abd115beae77119a58db72d6f36947da8 Mon Sep 17 00:00:00 2001 From: Robbi Bishop-Taylor Date: Tue, 2 Jul 2024 14:42:58 +1000 Subject: [PATCH 2/6] Update env.yaml --- docker/env.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/env.yaml b/docker/env.yaml index 56f6c50..5e008d5 100644 --- a/docker/env.yaml +++ b/docker/env.yaml @@ -109,7 +109,7 @@ dependencies: - pyproj - pyrsistent - pystac - - pystac-client>=0.8.2 + - pystac-client>=0.8.1 - pytest!=8.1.0 - python-dateutil - python-rapidjson From 3641f7b330b5aa13244f7afb976e34315931ced3 Mon Sep 17 00:00:00 2001 From: Robbi Bishop-Taylor Date: Tue, 2 Jul 2024 17:25:19 +1000 Subject: [PATCH 3/6] Update requirements.txt --- docker/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/requirements.txt b/docker/requirements.txt index 964995e..cc82e74 100644 --- a/docker/requirements.txt +++ b/docker/requirements.txt @@ -21,7 +21,7 @@ s2cloudmask opencv-python-headless opencv-contrib-python-headless -datacube[performance,s3] >= 1.8.17 +datacube[performance,s3] >= 1.8.19 odc-algo @ git+https://github.com/opendatacube/odc-algo@b8dcfce odc-cloud[ASYNC] odc-dscache From 0b642bd3118886a702fa8f7b17934c710a2601dc Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Wed, 3 Jul 2024 09:14:37 +0000 Subject: [PATCH 4/6] remove pygeos for compatibility --- docker/env.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/env.yaml b/docker/env.yaml index 5e008d5..3cf2e28 100644 --- a/docker/env.yaml +++ b/docker/env.yaml @@ -13,6 +13,7 @@ dependencies: - libpq - git - wget + - curl - unzip - htop - tmux @@ -66,7 +67,7 @@ dependencies: - geopandas<1.0.0 - greenlet - HeapDict - - icu + - icu>=73.2 - idna - imageio - importlib-metadata @@ -174,14 +175,14 @@ dependencies: - dask-ml - pathos - scikit-learn - - tensorflow>=2.10 + - tensorflow>=2.16 - xgboost - zarr - bokeh=3.2.2 - descartes - matplotlib - seaborn - - pygeos + # - pygeos - cmocean - gcsfs - geohash2 From 02037149d73309ffd7152f7e331b7fdb37df189a Mon Sep 17 00:00:00 2001 From: Emma Ai Date: Wed, 3 Jul 2024 09:24:44 +0000 Subject: [PATCH 5/6] update dive action --- .github/workflows/dive.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dive.yml b/.github/workflows/dive.yml index 6d7863a..83372dc 100644 --- a/.github/workflows/dive.yml +++ b/.github/workflows/dive.yml @@ -17,6 +17,8 @@ on: env: ORG: dea IMAGE: dea-sandbox + DIVE: wagoodman/dive:v0.12.0 + DOCKER_API: 1.37 jobs: dive: @@ -81,11 +83,11 @@ jobs: sudo rm -rf ${GITHUB_WORKSPACE}/.git - name: Dive - uses: yuichielectric/dive-action@0.0.3 - with: - image: ${{ env.ORG }}/${{ env.IMAGE}}:_build - config-file: ${{ github.workspace }}/dive-ci.yml - github-token: ${{ secrets.GITHUB_TOKEN }} + run: | + docker pull ${DIVE} + docker run -e CI=true -e DOCKER_API_VERSION=${DOCKER_API} --rm -v /var/run/docker.sock:/var/run/docker.sock \ + --mount type=bind,source=${{ github.workspace }}/dive-ci.yml,target=/.dive-ci \ + ${DIVE} --ci-config /.dive-ci ${ORG}/${IMAGE}:_build - name: Docker image size check uses: wemake-services/docker-image-size-limit@master From 235afd007171d2b9bd4bde720413b76b69d8a6c6 Mon Sep 17 00:00:00 2001 From: Robbi Bishop-Taylor Date: Mon, 8 Jul 2024 13:19:30 +1000 Subject: [PATCH 6/6] Add xarray-spatial --- docker/env.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/env.yaml b/docker/env.yaml index 3cf2e28..182be01 100644 --- a/docker/env.yaml +++ b/docker/env.yaml @@ -205,6 +205,7 @@ dependencies: - urbanaccess - contextily - pyTMD<=2.1.0 + - xarray-spatial # jupyter things - autopep8 - black