Merge branch 'develop'

Author: b8raoult

ecml_tools/__init__.py

@@ -5,4 +5,4 @@
 # granted to it by virtue of its status as an intergovernmental organisation
 # nor does it submit to any jurisdiction.
 
-__version__ = "0.4.2"
+__version__ = "0.4.5"

ecml_tools/data.py

@@ -69,8 +69,9 @@ def _make_slice_or_index_from_list_or_tuple(indices):
     """
     Convert a list or tuple of indices to a slice or an index, if possible.
     """
-    if len(indices) == 1:
-        return indices[0]
+
+    if len(indices) < 2:
+        return indices
 
     step = indices[1] - indices[0]
 
@@ -660,10 +661,10 @@ def __len__(self):
     @expand_list_indexing
     def _get_tuple(self, index):
         index, changes = index_to_slices(index, self.shape)
-        print(index, changes)
+        # print(index, changes)
         lengths = [d.shape[0] for d in self.datasets]
         slices = length_to_slices(index[0], lengths)
-        print("slies", slices)
+        # print("slies", slices)
         result = [
             d[update_tuple(index, 0, i)[0]]
             for (d, i) in zip(self.datasets, slices)
@@ -942,12 +943,12 @@ def _get_slice(self, s):
     @expand_list_indexing
     def _get_tuple(self, n):
         index, changes = index_to_slices(n, self.shape)
+        # print('INDEX', index, changes)
         indices = [self.indices[i] for i in range(*index[0].indices(self._len))]
-        index, previous = update_tuple(
-            index, 0, _make_slice_or_index_from_list_or_tuple(indices)
-        )
+        indices = _make_slice_or_index_from_list_or_tuple(indices)
+        # print('INDICES', indices)
+        index, _ = update_tuple(index, 0, indices)
         result = self.dataset[index]
-        result = result[previous]
         result = apply_index_to_slices_changes(result, changes)
         return result
 

tests/test_data.py

@@ -639,7 +639,7 @@ def test_rename():
         ),
         start_date=datetime.datetime(2021, 1, 1),
         time_increment=datetime.timedelta(hours=6),
-        statistics_reference_dataset="test-2021-2021-6h-o96-abcd",
+        statistics_reference_dataset=None,
         statistics_reference_variables=None,
     )
 
@@ -1144,4 +1144,4 @@ def test_statistics():
 
 
 if __name__ == "__main__":
-    test_ensemble_1()
+    test_subset_1()