Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to 3.0.0rc1 #910

Merged
merged 3 commits into from
Jan 17, 2025
Merged

Bump to 3.0.0rc1 #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c697cbf
Bump to 3.0.0rc1
tomvothecoder Jan 10, 2025
4639969
Remove `esmpy` dependency
tomvothecoder Jan 16, 2025
0df5b35
Remove `shapely` remove dependencies
tomvothecoder Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions conda-env/ci.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Comment on lines -4 to -7
Copy link
Collaborator Author

@tomvothecoder tomvothecoder Jan 16, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI @xylar I don't think this is needed anymore because cdms2 and esmpy are no longer direct dependencies. Correct me if I'm wrong though. This is related to #715.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds reasonable.


__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
View file
Open in desktop
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
View file
Open in desktop
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
Loading