Merge branch 'develop' into transaction_api

# Conflicts: # docs/about/whats_new.rst
opendatacube · Sep 29, 2022 · 6701dad · 6701dad
2 parents de53382 + 5f1af9b
commit 6701dad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/conda-environment.yml b/conda-environment.yml
@@ -22,14 +22,15 @@ dependencies:
   - pyproj
   - shapely
   - jsonschema
-  - lark-parser
+  - lark
   - netcdf4
   - numpy
   - pandas
   - psycopg2
   - python-dateutil
   - pyyaml
-  - rasterio >=1.0.2
+  - rasterio >=1.3.2
   - sqlalchemy
-  - xarray >=0.9
+  - GeoAlchemy2
+  - xarray >=0.9,!=2022.6.0
   - toolz
diff --git a/docs/about/whats_new.rst b/docs/about/whats_new.rst
@@ -39,6 +39,7 @@ v1.8.next
   implementation. Only works for direct loading.  More work required for deferred (i.e. Dask) loading. (:pull: `1317`)
 - Implement public-facing index-driver-independent API for managing database transactions, as per Enhancement Proposal
   EP07 (:pull: `1318`)
+- Update Conda environment to match dependencies in setup.py (:pull: `1319`)
 
 
 v1.8.7 (7 June 2022)