Merge pull request #28 from ehogan/v2.11.0

Updated to v2.11.0
conda-forge · Jul 8, 2024 · 6c7714b · 6c7714b
2 parents e3b57bb + c027a0c
commit 6c7714b
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 34 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -1,5 +1,5 @@
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,13 +1,13 @@
 {% set name = "ESMValTool" %}
-{% set version = "2.10.0" %}
+{% set version = "2.11.0" %}
 
 package:
   name: {{ name|lower }}-suite
   version: {{ version }}
 
 source:
-  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
-  sha256: e67acef48b8e1167360b074485d29f79b18abaeeaab1555894bbe96a6cbf7f7d
+  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name|lower }}-{{ version }}.tar.gz
+  sha256: 099160392048f7ccddb420790e0529ce1ee8b795962be51ebd09e78b8ea38cac
 
 build:
   number: 0
@@ -34,7 +34,7 @@ outputs:
       run:
         - aiohttp
         - cartopy
-        - cdo >=1.9.7
+        - cdo >=2.3.0
         - cdsapi
         - cf-units
         - cftime
@@ -44,33 +44,36 @@ outputs:
         - distributed
         - ecmwf-api-client
         - eofs
-        - esmpy
-        - esmvalcore 2.10.*
+        - esmpy !=8.1.0,<8.6.0  # https://github.com/SciTools-incubator/iris-esmf-regrid/pull/342#issuecomment-2092921514
+        - esmvalcore 2.11.*
         - fiona
         - fire
+        - fsspec
         - gdal
+        - importlib_metadata <8  # required for Python < 3.10
         - iris >=3.6.1
         - iris-esmf-regrid >=0.7.0
         - jinja2
         - joblib
         - lime
         - mapgenerator >=1.0.5
-        - matplotlib-base
+        - matplotlib-base <3.9.0
         - natsort
         - nc-time-axis
         - netCDF4
         - numba
-        - numpy !=1.24.3  # severe masking bug
+        - numpy !=1.24.3,<2.0.0  # severe masking bug, avoid pulling 2.0.0
         - openpyxl
         - packaging
-        - pandas
+        - pandas !=2.2.0,!=2.2.1,!=2.2.2 # github.com/ESMValGroup/ESMValCore/pull/2305
         - progressbar2
         - prov
+        - psyplot
         - psy-maps
         - psy-reg
         - psy-simple
-        - psyplot
         - pyproj >=2.1
+        - pys2index  # only from conda-forge
         - python >=3.9
         - python-cdo
         - python-dateutil
@@ -79,21 +82,22 @@ outputs:
         - requests
         - ruamel.yaml
         - scikit-image
-        - scikit-learn
+        - scikit-learn >=1.4.0  # github.com/ESMValGroup/ESMValTool/issues/3504
         - scipy
         - seaborn
         - seawater
-        - shapely
+        - shapely >=2
         - xarray >=0.12.0
         - xesmf >=0.7.1
-        - xgboost >1.6.1
+        - xgboost >1.6.1  # github.com/ESMValGroup/ESMValTool/issues/2779
         - xlsxwriter
         - zarr
     test:
       source_files:
         - tests
         - setup.cfg
       requires:
+        - flake8
         - pytest >=3.9,!=6.0.0rc1,!=6.0.0
         - pytest-cov
         - pytest-env
@@ -124,16 +128,17 @@ outputs:
       noarch: generic
     requirements:
       run:
-        - cdo >=1.9.7
         - {{ pin_subpackage('esmvaltool-python', exact=True) }}
-        - imagemagick
         - ncl >=6.6
+        - cdo >=2.3.0
+        - imagemagick
         - nco
     test:
       source_files:
         - tests
         - setup.cfg
       requires:
+        - flake8
         - pytest >=3.9,!=6.0.0rc1,!=6.0.0
         - pytest-cov
         - pytest-env
@@ -149,12 +154,12 @@ outputs:
       noarch: generic
     requirements:
       run:
-        - cdo >=1.9.7
         - {{ pin_subpackage('esmvaltool-python', exact=True) }}
         - nco
-        - r-base >=3.5
+        - cdo >=2.3.0
+        - r-base >=3.5,<4.3.0
         - r-abind
-        - r-akima <=0.6-2.3
+        - r-akima
         - r-climdex.pcic
         - r-climprojdiags
         - r-docopt
@@ -184,6 +189,7 @@ outputs:
         - tests
         - setup.cfg
       requires:
+        - flake8
         - pytest >=3.9,!=6.0.0rc1,!=6.0.0
         - pytest-cov
         - pytest-env