second pass resolve sat-stac/pandas conflict over python-dateutil

crim-ca · Dec 6, 2023 · e36d4dd · e36d4dd
1 parent 67f8997
commit e36d4dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/eo/environment.yml b/eo/environment.yml
@@ -9,8 +9,11 @@ dependencies:
   - intake-stac
   - pyproj
   - rasterio
+  # avoid conda conflict with python-dateutil 2.8 between unreleased sat-stac and newer pandas
+  # (see https://github.com/sat-utils/sat-stac/issues/73 and https://github.com/pdm-project/pdm/issues/2193)
   - sat-search==0.3.0
   - sat-stac>=0.4.1
+  - pandas<2
   - python-dateutil>=2.8
   - shapely
 

diff --git a/nlp/environment.yml b/nlp/environment.yml
@@ -7,15 +7,18 @@ channels:
 dependencies:
   - intake-esm
   - intake-stac==0.3.0
+  # avoid conda conflict with python-dateutil 2.8 between unreleased sat-stac and newer pandas
+  # (see https://github.com/sat-utils/sat-stac/issues/73 and https://github.com/pdm-project/pdm/issues/2193)
   - sat-search==0.3.0
   - sat-stac>=0.4.1
+  - pandas<2
+  - python-dateutil
   - threddsclient==0.4.2
   - openjdk==8.0.152
   - python-flair
   - numpy
   - spacy>=3.5,<4
   - pydantic<2
-  - python-dateutil>=2.8
   - python-levenshtein
   - requests
   - pip>=22