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

Jump to bottom

Update environment: pin iris>=3.11, unpin cartopy and allow for numpy >=2 #3811

Merged
merged 8 commits into from
Nov 14, 2024
Merged

Update environment: pin iris>=3.11, unpin cartopy and allow for numpy >=2 #3811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b51b5bc
update environment
valeriupredoi Nov 13, 2024
b1d0eb8
update environment
valeriupredoi Nov 13, 2024
530d16d
run a GA test
valeriupredoi Nov 13, 2024
a46d410
pin iris
valeriupredoi Nov 14, 2024
9784721
pin iris
valeriupredoi Nov 14, 2024
1180afa
unrun GA
valeriupredoi Nov 14, 2024
5b8ca82
Update environment.yml
valeriupredoi Nov 14, 2024
8d1deaf
remove comment as suggested by Manu
valeriupredoi Nov 14, 2024
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
10 changes: 5 additions & 5 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@ channels:

dependencies:
- aiohttp
- cartopy <0.24 # https://github.com/ESMValGroup/ESMValTool/issues/3767
- cartopy
- cdo >=2.3.0
- cdsapi
- cf-units
- cfgrib
- cftime
- cmocean
- curl <8.10
- curl <8.10 # https://github.com/ESMValGroup/ESMValTool/issues/3758
schlunma marked this conversation as resolved.
Show resolved Hide resolved
- cython
- dask !=2024.8.0 # https://github.com/dask/dask/issues/11296
- distributed
- ecmwf-api-client
- eofs
- esmpy # <8.6 safe https://github.com/SciTools/iris-esmf-regrid/issues/415
- esmpy
- esmvalcore 2.11.*
- fiona
- fire
- fsspec
- gdal >=3.9.0
- importlib_metadata <8 # https://github.com/ESMValGroup/ESMValTool/issues/3699 only for Python 3.10/11 and esmpy<8.6
- iris >=3.6.1
- iris >=3.11
- iris-esmf-regrid >=0.10.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342
- jinja2
- joblib
Expand All @@ -41,7 +41,7 @@ dependencies:
- nc-time-axis
- netCDF4
- numba
- numpy !=1.24.3,<2.0 # severe masking bug
- numpy !=1.24.3 # severe masking bug
- openpyxl
- packaging
- pandas==2.1.4 # unpin when ESMValCore released with https://github.com/ESMValGroup/ESMValCore/pull/2529
Expand Down
8 changes: 4 additions & 4 deletions environment_osx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ channels:

dependencies:
- aiohttp
- cartopy <0.24 # https://github.com/ESMValGroup/ESMValTool/issues/3767
- cartopy
- cdo >=2.3.0
- cdsapi
- cf-units
schlunma marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -22,14 +22,14 @@ dependencies:
- distributed
- ecmwf-api-client
- eofs
- esmpy # <8.6 safe https://github.com/SciTools/iris-esmf-regrid/issues/415
- esmpy
- esmvalcore 2.11.*
- fiona
- fire
- fsspec
- gdal >=3.9.0
- importlib_metadata <8 # https://github.com/ESMValGroup/ESMValTool/issues/3699 only for Python 3.10/11 and esmpy<8.6
- iris >=3.6.1
- iris >=3.11
- iris-esmf-regrid >=0.10.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342
- jinja2
- joblib
Expand All @@ -40,7 +40,7 @@ dependencies:
- nc-time-axis
- netCDF4
- numba
- numpy !=1.24.3,<2.0 # severe masking bug
- numpy !=1.24.3 # severe masking bug
- openpyxl
- packaging
- pandas==2.1.4 # unpin when ESMValCore released with https://github.com/ESMValGroup/ESMValCore/pull/2529
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# Use with pip install . to install from source
'install': [
'aiohttp',
'cartopy<0.24', # github.com/ESMValGroup/ESMValTool/issues/3767
'cartopy',
'cdo',
'cdsapi',
'cf-units',
Expand Down Expand Up @@ -67,7 +67,7 @@
'scikit-image',
'scikit-learn>=1.4.0', # github.com/ESMValGroup/ESMValTool/issues/3504
'scipy',
'scitools-iris>=3.6.1',
'scitools-iris>=3.11',
'seaborn',
'seawater',
'shapely>=2',
Expand Down