Pin matplotlib to <3.3 and add compilers (#1898)

ESMValGroup · Nov 4, 2020 · 9c79cbb · valeriupredoi · Nov 4, 2020 · valeriupredoi
1 parent 6fa4b19
commit 9c79cbb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/environment.yml b/environment.yml
@@ -6,10 +6,12 @@ channels:
 
 dependencies:
   # Python packages that cannot be installed from PyPI:
+  - compilers
   - gdal
   - esmpy
   - esmvalcore>=2.1.0,<2.2
   - iris>=2.2.1,<3
+  - matplotlib>=3,<3.3
   # Non-Python dependencies
   - cdo>=1.9.7
   - eccodes!=2.19.0  # cdo dependency; something messed up with libeccodes.so
@@ -21,5 +23,3 @@ dependencies:
   # Multi language support:
   - ncl>=6.5.0  # this should always install 6.6.0 though
   - r-base>=3.5
-  - r-curl  # Dependency of lintr, but fails to compile because it cannot find libcurl installed from conda.
-  - r-udunits2  # Fails to compile because it cannot find udunits2 installed from conda.
diff --git a/package/meta.yaml b/package/meta.yaml
@@ -84,7 +84,7 @@ outputs:
         - jinja2
         - joblib
         - lime
-        - matplotlib>=3
+        - matplotlib>=3,<3.3
         - natsort
         - nc-time-axis
         - netCDF4
@@ -131,11 +131,10 @@ outputs:
     requirements:
       run:
         - cdo>=1.9.7
+        - compilers
         - esmvaltool-python
         - nco
         - r-base>=3.5
-        - r-curl  # Dependency of lintr, but fails to compile because it cannot find libcurl installed from conda.
-        - r-udunits2  # Fails to compile because it cannot find udunits2 installed from conda.
 
 about:
   home: https://www.esmvaltool.org

diff --git a/setup.py b/setup.py
@@ -39,7 +39,7 @@
         'jinja2',
         'joblib',
         'lime',
-        'matplotlib',
+        'matplotlib>=3,<3.3',
         'natsort',
         'nc-time-axis',  # needed by iris.plot
         'netCDF4',