Merge branch 'develop' into merge_nci_modules

.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:

docker/env.yaml

@@ -13,6 +13,7 @@ dependencies:
   - libpq
   - git
   - wget
+  - curl
   - unzip
   - htop
   - tmux
@@ -64,10 +65,10 @@ dependencies:
   - frozenlist
   - fsspec
   - GeoAlchemy2
-  - geopandas
+  - geopandas<1.0.0
   - greenlet
   - HeapDict
-  - icu
+  - icu>=73.2
   - idna
   - imageio
   - importlib-metadata
@@ -114,8 +115,8 @@ dependencies:
   - pyproj
   - pyrsistent
   - pystac
-  - pystac-client
-  - pytest=8.1.1
+  - pystac-client>=0.8.1
+  - pytest!=8.1.0
   - python-dateutil
   - python-rapidjson
   - python-slugify
@@ -179,15 +180,16 @@ 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
   - geojson
   - geopy
@@ -208,6 +210,7 @@ dependencies:
   - urbanaccess
   - contextily
   - pyTMD<=2.1.0
+  - xarray-spatial
 # jupyter things
   - autopep8
   - black

docker/requirements.txt

@@ -20,7 +20,7 @@ s2cloudmask
 opencv-python-headless
 opencv-contrib-python-headless
 
-datacube[performance,s3] >= 1.8.18
+datacube[performance,s3] >= 1.8.19
 odc-algo @ git+https://github.com/opendatacube/odc-algo@b8dcfce
 odc-cloud[ASYNC]
 odc-stats[ows]