Merge pull request #72 from bouweandela/v2.10.0

Version 2.10.0
conda-forge · Dec 19, 2023 · b800d7c · b800d7c
2 parents d41ed1a + 96f48e3
commit b800d7c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 23 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/README.md b/README.md
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,13 +1,13 @@
 {% set name = "ESMValCore" %}
-{% set version = "2.9.0" %}
+{% set version = "2.10.0" %}
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
   url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
-  sha256: ed642f5ca66cb1113b5f628edf1e3004d5a7a7f36d624874817f406793469a2c
+  sha256: 1915d0213ca1984253b6c7ffec24ce45f5bb60dfe3e39fad5bf1d24278c97952
 
 build:
   # Increment the build number when building a new conda package of the same
@@ -20,7 +20,7 @@ build:
 requirements:
   host:
     - git
-    - python >=3.9
+    - python >=3.9,<3.12
     - pip !=21.3
     - pytest-runner
     - setuptools_scm
@@ -38,7 +38,8 @@ requirements:
     - fire
     - geopy
     - humanfriendly
-    - iris >=3.4.0
+    - importlib_metadata
+    - iris >=3.6.1
     - iris-esmf-regrid >=0.7.0
     - isodate
     - jinja2
@@ -54,12 +55,12 @@ requirements:
     - psutil
     - py-cordex
     - pybtex
-    - python >=3.9
+    - python >=3.9,<3.12
     - python-stratify >=0.3
     - pyyaml
     - requests
     - scipy >=1.6
-    - shapely
+    - shapely >=2.0.0
     - yamale
 
 test:
@@ -74,18 +75,16 @@ test:
     - pytest
     - pytest-cov
     - pytest-env
-    - pytest-flake8
     - pytest-html
     - pytest-metadata
     - pytest-mock
     - pytest-mypy
     - pytest-xdist
     - r-yaml
     # - types-requests
-    # - types-pkg_resources
     # - types-PyYAML
   commands:
-    - pip install ESMValTool-sample-data types-requests types-pkg_resources types-PyYAML
+    - pip install ESMValTool-sample-data types-requests types-PyYAML
     - pytest -n 2 --ignore=run_test.py --ignore=tests/unit/documentation/
     - esmvaltool -- --help
     - esmvaltool version