Speed up conda installation (#1677)

ESMValGroup · Jun 17, 2020 · f11ae60 · f11ae60
1 parent b31d230
commit f11ae60
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 27 deletions.
diff --git a/environment.yml b/environment.yml
@@ -8,8 +8,8 @@ dependencies:
   # Python packages that cannot be installed from PyPI:
   - gdal
   - esmvalcore>=2.0.0b9,<2.1
+  - esmf
   # Non-Python dependencies
-  - graphviz
   - cdo>=1.9.7
   - imagemagick
   - nco
@@ -18,6 +18,6 @@ dependencies:
   # Multi language support:
   - python>=3.6
   - ncl>=6.5.0  # this should always install 6.6.0 though
-  - r-base
+  - 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/esmvaltool/diag_scripts/autoassess/stratosphere/strat_metrics_1.py b/esmvaltool/diag_scripts/autoassess/stratosphere/strat_metrics_1.py
@@ -167,9 +167,9 @@ def calc_qbo_index(qbo):
     else:
         logger.warning('QBO metric can not be computed; no zero crossings!')
         logger.warning(
-            f"This means the model U(30hPa, around tropics) doesn't oscillate"
-            f"between positive and negative"
-            f"with a period<12 months, QBO can't be computed, set to 0."
+            "This means the model U(30hPa, around tropics) doesn't oscillate"
+            "between positive and negative"
+            "with a period<12 months, QBO can't be computed, set to 0."
         )
         (kup, kdown) = (0, 0)
     # Translate upwards and downwards indices into U wind values

diff --git a/esmvaltool/diag_scripts/ensclus/eof_tool.py b/esmvaltool/diag_scripts/ensclus/eof_tool.py
@@ -54,8 +54,8 @@ def eof_plots(neof, pcs_scal1, eofs_scal2, var, varunits, lat, lon,
     """
     print('_________________________________________________________')
     print('Plotting the EOFs and PCs')
-    print('Variable: {1} Units: {2}'.format(var, varunits))
-    print('Ensemble members: {1}'.format(numens))
+    print('Variable: {0} Units: {1}'.format(var, varunits))
+    print('Ensemble members: {0}'.format(numens))
 
     # ------------------------------------------PCs scaled  (case 1 of scaling)
     figpc_scal1 = plt.figure(figsize=(24, 14))

diff --git a/esmvaltool/utils/color_tables/show_color_tables.py b/esmvaltool/utils/color_tables/show_color_tables.py
@@ -7,7 +7,6 @@
 import tempfile
 
 import matplotlib
-matplotlib.use("Agg")  # noqa
 import matplotlib.pyplot as plt
 import numpy as np
 import yaml

diff --git a/package/meta.yaml b/package/meta.yaml
@@ -36,7 +36,6 @@ test:
     - tests
     - setup.cfg
   requires:
-    - flake8<3.8.0
     - pytest>=3.9
     - pytest-cov
     - pytest-env
@@ -69,36 +68,33 @@ outputs:
         - cdo>=1.9.7
         - cdsapi
         - cf-units
+        - cftime
         - cmocean
-        - cython
-        - dask
+        - dask>=2.12
         - ecmwf-api-client  # in esmvalgroup channel
         - eofs
         - esmpy
         - esmvalcore>=2.0.0b9,<2.1  # in esmvalgroup channel
         - fiona
-        - graphviz
-        - iris
+        - gdal
+        - iris>=2.2.1
         - jinja2
-        - matplotlib
+        - matplotlib>=3
         - nc-time-axis
         - netCDF4
         - numpy
         - pandas
         - pyproj>=2.1
         - python>=3.6
         - python-cdo
-        - python-stratify
         - pyyaml
         - scikit-learn
         - seaborn
         - seawater
         - shapely
         - xarray>=0.12.0
         - xesmf
-        - xlrd
         - xlsxwriter
-        - yamale  # in esmvalgroup channel
 
   - name: esmvaltool-julia
     build:
@@ -113,10 +109,10 @@ outputs:
       noarch: generic
     requirements:
       run:
-        - cdo
+        - cdo>=1.9.7
         - esmvaltool-python
         - imagemagick
-        - ncl>=6.5.0
+        - ncl>=6.6
         - nco
 
   - name: esmvaltool-r
@@ -125,10 +121,10 @@ outputs:
       post-link: install-r-deps
     requirements:
       run:
-        - cdo
+        - cdo>=1.9.7
         - esmvaltool-python
         - nco
-        - r-base
+        - 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/setup.py b/setup.py
@@ -26,12 +26,15 @@
         'cdo',
         'cdsapi',
         'cf-units',
+        'cftime',
         'cmocean',
-        'cython',
+        'dask>=2.12',
         'ecmwf-api-client',
         'eofs',
+        'ESMPy',
         'esmvalcore>=2.0.0b9,<2.1',
         'fiona',
+        'GDAL',
         'jinja2',
         'matplotlib',
         'nc-time-axis',  # needed by iris.plot
@@ -41,20 +44,18 @@
         'pyproj>=2.1'
         'pyyaml',
         'scikit-learn',
-        'scitools-iris>=2.2',
-        'seawater',
+        'scipy',
+        'scitools-iris>=2.2.1',
         'seaborn',
+        'seawater',
         'shapely',
-        'stratify',
         'xarray>=0.12',
         'xesmf',
-        'xlrd',
         'xlsxwriter',
     ],
     # Test dependencies
     # Execute 'python setup.py test' to run tests
     'test': [
-        'flake8<3.8.0',
         'pytest>=3.9',
         'pytest-cov',
         'pytest-env',