From b600abbecb885fdb2212ba03b236ef543b39c380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=81nis=20Gailis?= Date: Wed, 18 Apr 2018 17:29:13 +0200 Subject: [PATCH 1/4] Fix animation bug We apparently used to use Dask arrays wrapped in xr.DataArrays as scalars in min/max value calculation in animation. This used to work with Matplotlib < 2.2.2, now we use actual ndarray 'scalars' instead. --- cate/ops/animate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cate/ops/animate.py b/cate/ops/animate.py index a917aab22..00cd1bc6f 100644 --- a/cate/ops/animate.py +++ b/cate/ops/animate.py @@ -288,4 +288,4 @@ def _get_min_max(data, monitor=None): with monitor.child(1).observing("find maximum"): data_max = data.max() - return (data_min, data_max) + return (data_min.values, data_max.values) From 4fee5783f504579e09b934408b1fce278fa8d259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=81nis=20Gailis?= Date: Wed, 18 Apr 2018 17:32:08 +0200 Subject: [PATCH 2/4] Bump xarray version A bug with decode_time has been fixed upstream in xarray 0.10.3 --- environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 87797e238..07cdb0686 100644 --- a/environment.yml +++ b/environment.yml @@ -36,8 +36,8 @@ dependencies: - scipy >=0.19,<1.0 - shapely >=1.6,<2.0 - tornado >=5.0,<6.0 - # xarray >= 0.10.1 has an issue with time decoding see #579 - - xarray ==0.10.0 + # Require >= 0.10.3 due to #579 + - xarray >=0.10.3 # # for testing only # From 52d5a72ae45de3939bd260e4ad22fe7559b6c600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=81nis=20Gailis?= Date: Wed, 18 Apr 2018 17:37:44 +0200 Subject: [PATCH 3/4] Update Changes.md Closes #585 Closes #579 --- CHANGES.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 143da6990..540da0fa4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,9 @@ -## Version 2.0.0.dev9 (in dev) +## Version 2.0.0.dev10 (in development) + +* Fixed a bug with animation generation [#585](https://github.com/CCI-Tools/cate/issues/585) +* Upgrade to using newer xarray version after an upstream bugfix []() + +## Version 2.0.0.dev9 * Representative default variables [#590](https://github.com/CCI-Tools/cate/issues/590). * Tasks are no longer executed in parallel [#606](https://github.com/CCI-Tools/cate/issues/606). From 8aa46e1f2afa8ddf64e5a13ca531e6a24138c057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=81nis=20Gailis?= Date: Wed, 18 Apr 2018 17:56:36 +0200 Subject: [PATCH 4/4] Update CHANGES.md --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 540da0fa4..4c2240934 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,7 @@ ## Version 2.0.0.dev10 (in development) * Fixed a bug with animation generation [#585](https://github.com/CCI-Tools/cate/issues/585) -* Upgrade to using newer xarray version after an upstream bugfix []() +* Upgrade to using newer xarray version after an upstream bugfix [#579](https://github.com/CCI-Tools/cate/issues/579) ## Version 2.0.0.dev9