Merge branch 'master' into docs-in-progress

# Conflicts:
#	environment-rtd.yml

CHANGES.md

@@ -1,6 +1,7 @@
 ## Changes in 0.2.0.dev2 (in dev)
 
 * Reorganisation of the Documentation and Examples Section (partly addressing #106)
+* Loosened python conda environment to satisfy conda-forge requirements
 
 ### New
 

environment.yml

@@ -4,34 +4,34 @@ channels:
   - defaults
 dependencies:
   # Python
-  - python =3.7
+  - python >=3.6
   # Required
-  - affine =2.2
+  - affine >=2.2
   - blas =*=mkl
-  - click =7.0
-  - cmocean =2.0
-  - dask =1.2
-  - fiona =1.8
-  - gdal =2.4
-  - matplotlib =3.0
-  - netcdf4 =1.5.0
-  - numba =0.43
-  - numpy =1.16
-  - pandas =0.24
-  - pillow =6.0
-  - proj4 =5.2
-  - pyyaml =5.1
-  - rasterio =1.0
-  - s3fs =0.2
-  - scipy =1.2
-  - setuptools =41.0
-  - shapely =1.6
-  - tornado =6.0
-  - xarray =0.12.3
-  - zarr =2.3.2
-  - sphinx =2.0.1
+  - click >=7.0
+  - cmocean >=2.0
+  - dask >=1.2
+  - fiona >=1.8
+  - gdal >=2.4
+  - matplotlib >=3.0
+  - netcdf4 >=1.5.0
+  - numba >=0.43
+  - numpy >=1.16
+  - pandas >=0.24
+  - pillow >=6.0
+  - proj4 >=5.2
+  - pyyaml >=5.1
+  - rasterio >=1.0
+  - s3fs >=0.2
+  - scipy >=1.2
+  - setuptools >=41.0
+  - shapely >=1.6
+  - tornado >=6.0
+  - xarray >=0.12.3
+  - zarr >=2.3.2
+  - sphinx >=2.0.1
   # Testing
-  - flake8 =3.7
-  - pytest =4.4
-  - pytest-cov =2.6
+  - flake8 >=3.7
+  - pytest >=4.4
+  - pytest-cov >=2.6
 

test/util/test_genindex.py

@@ -10,7 +10,7 @@
 
 
 class GenIndexTest(unittest.TestCase):
-
+    @unittest.skip("index store needs to be finalised. Not a production element at this stage.")
     def test_strict_cf_convention(self):
         index_var = gen_index_var(shape=(4, 8, 16), chunks=(2, 4, 8), dims=('time', 'lat', 'lon'))
         self.assertIsNotNone(index_var)

xcube/webapi/controllers/time_series.py

@@ -83,8 +83,6 @@ def get_time_series_for_point(ctx: ServiceContext,
     :param lat: The point's latitude in decimal degrees.
     :param start_date: An optional start date.
     :param end_date: An optional end date.
-    :param include_count: Whether to include the valid number of observations in the result.
-    :param include_stdev: Whether to include the standard deviation in the result.
     :param max_valids: Optional number of valid points.
            If it is None (default), also missing values are returned as NaN;
            if it is -1 only valid values are returned;
@@ -339,7 +337,7 @@ def _collect_ts_result(ts_ds: xr.Dataset,
                 statistics['uncertainty'] = float(value)
 
         time_series.append(dict(result=statistics,
-                                date=timestamp_to_iso_string(var.time[time_index].data)))
+                                date=timestamp_to_iso_string(var.time[time_index].values)))
 
     if pos_max_valids:
         return {'results': time_series[::-1]}