From 4639969a1fcfb4a3cc8475555427f518da382bc6 Mon Sep 17 00:00:00 2001 From: tomvothecoder Date: Thu, 16 Jan 2025 17:56:57 -0600 Subject: [PATCH] Remove `esmpy` dependency - Remove `import shapely` since `esmpy` and `cdms2` are no longer direct dependencies --- conda-env/ci.yml | 1 - conda-env/dev.yml | 1 - e3sm_diags/__init__.py | 5 ----- pyproject.toml | 1 - 4 files changed, 8 deletions(-) diff --git a/conda-env/ci.yml b/conda-env/ci.yml index 511df6df5..ea20dc46e 100644 --- a/conda-env/ci.yml +++ b/conda-env/ci.yml @@ -16,7 +16,6 @@ dependencies: - cartopy_offlinedata - cf-units - dask <2024.12.0 - - esmpy >=8.4.0 - lxml - mache >=0.15.0 - matplotlib-base >=3.8.2 diff --git a/conda-env/dev.yml b/conda-env/dev.yml index 9c75f377a..27e5e9b0d 100644 --- a/conda-env/dev.yml +++ b/conda-env/dev.yml @@ -14,7 +14,6 @@ dependencies: - cartopy_offlinedata - cf-units - dask <2024.12.0 - - esmpy >=8.4.0 - lxml - mache >=0.15.0 - matplotlib-base >=3.8.2 diff --git a/e3sm_diags/__init__.py b/e3sm_diags/__init__.py index 6d5ec7adb..416b72542 100644 --- a/e3sm_diags/__init__.py +++ b/e3sm_diags/__init__.py @@ -1,11 +1,6 @@ import os import sys -# import shapely here (before any esmpy imports via cdms2) to prevent a -# segfault related to multiprocessing. Do not import esmpy here to prevent -# issue with dask when using ESMF with system compilers. -import shapely - __version__ = "v3.0.0rc1" INSTALL_PATH = os.path.join(sys.prefix, "share/e3sm_diags/") diff --git a/pyproject.toml b/pyproject.toml index df177d55d..3eb035e5a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,6 @@ dependencies = [ # "cartopy_offlinedata", "cf-units", "dask <2024.12.0", - "esmpy >=8.4.0", "lxml", "mache >=0.15.0", "matplotlib >=3.8.2",