Skip to content

Commit

Permalink
Bump to 3.0.0rc1 (#910)
Browse files Browse the repository at this point in the history
* Remove `esmpy` and `shapely` dependencies
* Remove `import shapely` since `esmpy` and `cdms2` are no longer direct dependencies
  • Loading branch information
tomvothecoder authored Jan 17, 2025
1 parent 926724f commit 0a89e8f
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 13 deletions.
2 changes: 0 additions & 2 deletions conda-env/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@ dependencies:
- cartopy_offlinedata
- cf-units
- dask <2024.12.0
- esmpy >=8.4.0
- lxml
- mache >=0.15.0
- matplotlib-base >=3.8.2
- netcdf4
- output_viewer >=1.3.0
- numpy >=2.0.0,<3.0.0
- scipy <1.15
- shapely >=2.0.0,<3.0.0
- xarray >=2024.3.0
- xcdat >=0.7.3,<1.0.0
- xesmf >=0.8.7
Expand Down
2 changes: 0 additions & 2 deletions conda-env/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,13 @@ dependencies:
- cartopy_offlinedata
- cf-units
- dask <2024.12.0
- esmpy >=8.4.0
- lxml
- mache >=0.15.0
- matplotlib-base >=3.8.2
- netcdf4
- output_viewer >=1.3.0
- numpy >=2.0.0,<3.0.0
- scipy <1.15
- shapely >=2.0.0,<3.0.0
- xarray >=2024.3.0
- xcdat >=0.7.3,<1.0.0
- xesmf >=0.8.7
Expand Down
7 changes: 1 addition & 6 deletions e3sm_diags/__init__.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
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__ = "v2.12.1"
__version__ = "v3.0.0rc1"
INSTALL_PATH = os.path.join(sys.prefix, "share/e3sm_diags/")

# Disable MPI in cdms2, which is not currently supported by E3SM-unified
Expand Down
2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,13 @@ dependencies = [
# "cartopy_offlinedata",
"cf-units",
"dask <2024.12.0",
"esmpy >=8.4.0",
"lxml",
"mache >=0.15.0",
"matplotlib >=3.8.2",
"netcdf4",
"output_viewer >=1.3.0",
"numpy >=2.0.0,<3.0.0",
"scipy <1.15",
"shapely >=2.0.0,<3.0.0",
"xarray >=2024.03.0",
"xcdat >=0.7.3,<1.0.0",
"xesmf >=0.8.7",
Expand Down
2 changes: 1 addition & 1 deletion tbump.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
github_url = "https://github.com/E3SM-Project/e3sm_diags"

[version]
current = "2.12.1"
current = "3.0.0rc1"

# Example of a semver regexp.
# Make sure this matches current_version before
Expand Down

0 comments on commit 0a89e8f

Please sign in to comment.