diff --git a/conda-env/ci.yml b/conda-env/ci.yml index 78d5280e2..cfb172672 100644 --- a/conda-env/ci.yml +++ b/conda-env/ci.yml @@ -17,12 +17,14 @@ dependencies: - cdms2 3.1.5 - cdutil 8.2.1 - dask + - esmpy >=8.4.0 - genutil 8.2.1 - lxml - mache >=0.15.0 - matplotlib-base - netcdf4 - numpy >=1.23.0 + - shapely >=2.0.0,<3.0.0 - xarray >=2023.02.0 # Testing # ================== diff --git a/conda-env/dev.yml b/conda-env/dev.yml index f5bffacba..002b858df 100644 --- a/conda-env/dev.yml +++ b/conda-env/dev.yml @@ -15,12 +15,14 @@ dependencies: - cdms2 3.1.5 - cdutil 8.2.1 - dask + - esmpy >=8.4.0 - genutil 8.2.1 - lxml - mache >=0.15.0 - matplotlib-base - netcdf4 - numpy >=1.23.0 + - shapely >=2.0.0,<3.0.0 - xarray >=2023.02.0 # Testing # ================== diff --git a/e3sm_diags/__init__.py b/e3sm_diags/__init__.py index 524b97ba2..7b6460b6a 100644 --- a/e3sm_diags/__init__.py +++ b/e3sm_diags/__init__.py @@ -1,6 +1,10 @@ import os import sys +# import shapely before esmpy to prevent a segfault related to multiprocessing +import shapely # isort: skip +import esmpy # isort: skip + __version__ = "v2.9.0rc2" INSTALL_PATH = os.path.join(sys.prefix, "share/e3sm_diags/")