Skip to content

Commit 0a89e8f

Browse files
Bump to 3.0.0rc1 (#910)
* Remove `esmpy` and `shapely` dependencies * Remove `import shapely` since `esmpy` and `cdms2` are no longer direct dependencies
1 parent 926724f commit 0a89e8f

File tree

5 files changed

+2
-13
lines changed

5 files changed

+2
-13
lines changed

conda-env/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@ dependencies:
1616
- cartopy_offlinedata
1717
- cf-units
1818
- dask <2024.12.0
19-
- esmpy >=8.4.0
2019
- lxml
2120
- mache >=0.15.0
2221
- matplotlib-base >=3.8.2
2322
- netcdf4
2423
- output_viewer >=1.3.0
2524
- numpy >=2.0.0,<3.0.0
2625
- scipy <1.15
27-
- shapely >=2.0.0,<3.0.0
2826
- xarray >=2024.3.0
2927
- xcdat >=0.7.3,<1.0.0
3028
- xesmf >=0.8.7

conda-env/dev.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@ dependencies:
1414
- cartopy_offlinedata
1515
- cf-units
1616
- dask <2024.12.0
17-
- esmpy >=8.4.0
1817
- lxml
1918
- mache >=0.15.0
2019
- matplotlib-base >=3.8.2
2120
- netcdf4
2221
- output_viewer >=1.3.0
2322
- numpy >=2.0.0,<3.0.0
2423
- scipy <1.15
25-
- shapely >=2.0.0,<3.0.0
2624
- xarray >=2024.3.0
2725
- xcdat >=0.7.3,<1.0.0
2826
- xesmf >=0.8.7

e3sm_diags/__init__.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
import os
22
import sys
33

4-
# import shapely here (before any esmpy imports via cdms2) to prevent a
5-
# segfault related to multiprocessing. Do not import esmpy here to prevent
6-
# issue with dask when using ESMF with system compilers.
7-
import shapely
8-
9-
__version__ = "v2.12.1"
4+
__version__ = "v3.0.0rc1"
105
INSTALL_PATH = os.path.join(sys.prefix, "share/e3sm_diags/")
116

127
# Disable MPI in cdms2, which is not currently supported by E3SM-unified

pyproject.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,13 @@ dependencies = [
3434
# "cartopy_offlinedata",
3535
"cf-units",
3636
"dask <2024.12.0",
37-
"esmpy >=8.4.0",
3837
"lxml",
3938
"mache >=0.15.0",
4039
"matplotlib >=3.8.2",
4140
"netcdf4",
4241
"output_viewer >=1.3.0",
4342
"numpy >=2.0.0,<3.0.0",
4443
"scipy <1.15",
45-
"shapely >=2.0.0,<3.0.0",
4644
"xarray >=2024.03.0",
4745
"xcdat >=0.7.3,<1.0.0",
4846
"xesmf >=0.8.7",

tbump.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
github_url = "https://github.com/E3SM-Project/e3sm_diags"
33

44
[version]
5-
current = "2.12.1"
5+
current = "3.0.0rc1"
66

77
# Example of a semver regexp.
88
# Make sure this matches current_version before

0 commit comments

Comments
 (0)