fix: upgrade MetPy to 0.12.2 for compatibility with Cartopy 0.18

Close: #145
metwork-framework · Nov 12, 2020 · ac04ac5 · ac04ac5
1 parent 52a51a0
commit ac04ac5
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/.metwork-framework/components.md b/.metwork-framework/components.md
@@ -82,8 +82,8 @@
 | [Magics](https://www.ecmwf.int/en/computing/software) | 4.2.0 | scientific |
 | [matplotlib](http://matplotlib.org) | 2.2.2 | python2_scientific |
 | [matplotlib](https://matplotlib.org) | 3.1.1 | python3_scientific |
-| [MetPy](http://github.com/Unidata/MetPy) | 0.10.2 | python2_scientific |
-| [MetPy](http://github.com/Unidata/MetPy) | 0.10.2 | python3_scientific |
+| [MetPy](http://github.com/Unidata/MetPy) | 0.11.1 | python2_scientific |
+| [MetPy](http://github.com/Unidata/MetPy) | 0.12.2 | python3_scientific |
 | [metview](https://github.com/ecmwf/metview-python) | 1.3.1 | python3_scientific |
 | [Metview](https://www.ecmwf.int/en/computing/software) | 5.7.2.1 | scientific |
 | [monotonic](https://github.com/atdt/monotonic) | 1.5 | python2_scientific |

diff --git a/integration_tests/0003_test_import_python2_scientific/import_python2_scientific.py b/integration_tests/0003_test_import_python2_scientific/import_python2_scientific.py
@@ -26,6 +26,7 @@
 import palettable
 import seaborn
 import metpy
+import metpy.plots
 import cf_units
 import Magics
 import ESMF

diff --git a/integration_tests/0003_test_import_python3_scientific/import_python3_scientific.py b/integration_tests/0003_test_import_python3_scientific/import_python3_scientific.py
@@ -27,6 +27,7 @@
 import palettable
 import seaborn
 import metpy
+import metpy.plots
 import cf_units
 import Magics
 import ESMF

diff --git a/layers/layer4_python2_scientific/0499_extra_packages/requirements-to-freeze.txt b/layers/layer4_python2_scientific/0499_extra_packages/requirements-to-freeze.txt
@@ -10,6 +10,7 @@ pyshp
 shapely
 #We keep scipy<1.2.0 for python2 issue
 scipy<1.2.0
+dask[dataframe]
 dask
 toolz
 #geos is python3 only
@@ -46,5 +47,3 @@ cdo
 GDAL
 Fiona
 msgpack
-#cloudpickle for dask[dataframe]
-cloudpickle
diff --git a/layers/layer4_python2_scientific/0499_extra_packages/requirements2.txt b/layers/layer4_python2_scientific/0499_extra_packages/requirements2.txt
@@ -28,7 +28,7 @@ kiwisolver==1.1.0
 lxml==4.3.4
 Magics==1.0.11
 matplotlib==2.2.2
-MetPy==0.10.2
+MetPy==0.11.1
 monotonic==1.5
 msgpack==1.0.0
 munch==2.3.2

diff --git a/layers/layer4_python3_scientific/0499_extra_packages/requirements-to-freeze.txt b/layers/layer4_python3_scientific/0499_extra_packages/requirements-to-freeze.txt
@@ -11,6 +11,7 @@ shapely
 #to build on centos 6 with version >= 1.2.0, we would need to build
 #atlas in version >= 3.10.0 (and maybe blas and lapack)
 scipy<1.2.0
+dask[dataframe]
 dask
 toolz
 geos
@@ -51,5 +52,3 @@ Fiona
 geopandas
 rasterio
 msgpack
-#cloudpickle for dask[dataframe]
-cloudpickle
diff --git a/layers/layer4_python3_scientific/0499_extra_packages/requirements3.txt b/layers/layer4_python3_scientific/0499_extra_packages/requirements3.txt
@@ -30,7 +30,7 @@ kiwisolver==1.1.0
 lxml==4.3.4
 Magics==1.0.11
 matplotlib==3.1.1
-MetPy==0.10.2
+MetPy==0.12.2
 metview==1.3.1
 monotonic==1.5
 msgpack==1.0.0