Skip to content

Commit

Permalink
Merge branch 'main' into update-cruft
Browse files Browse the repository at this point in the history
# Conflicts:
#	setup.py
  • Loading branch information
Zeitsperre committed Nov 29, 2023
2 parents 75642c5 + 3b0de37 commit 3eaceda
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies:
- shapely >=2.0
- sparse
- toolz
- xarray
- xarray <2023.11.0
- xclim >=0.46.0
- xesmf >=0.7
- zarr
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies:
- shapely >=2.0
- sparse
- toolz
- xarray
- xarray <2023.11.0
- xclim >=0.46.0
- xesmf >=0.7
- zarr
Expand Down

0 comments on commit 3eaceda

Please sign in to comment.