remove ommit imagehash pin shapely and numpy

ESMValGroup · Jun 5, 2024 · 48a2609 · 48a2609
1 parent c1ddba3
commit 48a2609
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/environment.yml b/environment.yml
@@ -38,7 +38,7 @@ dependencies:
   - nc-time-axis
   - netCDF4
   - numba
-  - numpy !=1.24.3  # severe masking bug
+  - numpy !=1.24.3,<2.0  # severe masking bug
   - openpyxl
   - packaging
   - pandas !=2.2.0,!=2.2.1,!=2.2.2 # github.com/ESMValGroup/ESMValCore/pull/2305
@@ -63,7 +63,7 @@ dependencies:
   - scipy
   - seaborn
   - seawater
-  - shapely >=2
+  - shapely >=2.0.4
   - xarray >=0.12.0
   - xesmf >=0.7.1
   - xgboost >1.6.1  # github.com/ESMValGroup/ESMValTool/issues/2779
@@ -86,7 +86,7 @@ dependencies:
   # Python packages needed for development
   - codespell
   - docformatter
-  # - imagehash  # confluct with esmpy >=8.6.0 via libtiff
+  - imagehash
   - isort
   - pre-commit
   # - prospector  # needs support for Python 3.12

diff --git a/environment_osx.yml b/environment_osx.yml
@@ -38,7 +38,7 @@ dependencies:
   - nc-time-axis
   - netCDF4
   - numba
-  - numpy !=1.24.3  # severe masking bug
+  - numpy !=1.24.3,<2.0  # severe masking bug
   - openpyxl
   - packaging
   - pandas !=2.2.0,!=2.2.1,!=2.2.2 # github.com/ESMValGroup/ESMValCore/pull/2305
@@ -63,7 +63,7 @@ dependencies:
   - scipy
   - seaborn
   - seawater
-  - shapely >=2
+  - shapely >=2.0.4
   - xarray >=0.12.0
   - xesmf >=0.7.1
   - xgboost >1.6.1  # github.com/ESMValGroup/ESMValTool/issues/2779
@@ -86,7 +86,7 @@ dependencies:
   # Python packages needed for development
   - codespell
   - docformatter
-  # - imagehash  # confluct with esmpy >=8.6.0 via libtiff
+  - imagehash
   - isort
   - pre-commit
   # - prospector  # needs support for Python 3.12