attempt 3 to resolve deps

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

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/eo/environment.yml b/eo/environment.yml
@@ -9,12 +9,6 @@ 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
 
   # TODO: These next packages could possibly be added to a more generic 'vision' image, from which 'eo' would be built
@@ -47,3 +41,10 @@ dependencies:
     - orion
     - torch
     - torchvision>=0.6
+
+    # 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
+    - python-dateutil
diff --git a/nlp/environment.yml b/nlp/environment.yml
@@ -7,12 +7,6 @@ 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
@@ -32,3 +26,9 @@ dependencies:
     - ipywidgets
     - nltk
     - pystac_client
+
+    # 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
+    - python-dateutil