Merge pull request #21 from xcube-dev/konstntokas-xxx-fix_CI

Fix CI

Author: konstntokas

CHANGES.md

@@ -1,3 +1,7 @@
+## Changes in 0.2.5 (under development)
+
+
+
 ## Changes in 0.2.4
 
 - Improved performance when creating `GridMapping` from 2D coordinates.

tests/test_temporal.py

@@ -25,7 +25,6 @@
 import pandas as pd
 import xarray as xr
 
-from tests.sampledata import create_nx8x6_dataset_with_regular_coords
 from xcube_resampling.temporal import (
     _get_agg_method_kwargs,
     _get_temporal_agg_method,
@@ -34,6 +33,8 @@
     resample_in_time,
 )
 
+from .sampledata import create_nx8x6_dataset_with_regular_coords
+
 
 class ResampleInTimeTest(unittest.TestCase):
     def setUp(self):
@@ -140,7 +141,7 @@ def test_resample_in_time_all(self):
 
     def test_resample_in_time_nearest_interpolation(self):
         input_cube = create_nx8x6_dataset_with_regular_coords(4)
-        resampled_cube = resample_in_time(input_cube, "6H", interp_methods="nearest")
+        resampled_cube = resample_in_time(input_cube, "6h", interp_methods="nearest")
         self.assertIn("time", resampled_cube)
         self.assertIn("refl", resampled_cube)
         self.assertIn("ndvi", resampled_cube)
@@ -152,7 +153,7 @@ def test_resample_in_time_nearest_interpolation(self):
 
     def test_resample_in_time_linear_interpolation(self):
         input_cube = create_nx8x6_dataset_with_regular_coords(4)
-        resampled_cube = resample_in_time(input_cube, "6H", interp_methods="linear")
+        resampled_cube = resample_in_time(input_cube, "6h", interp_methods="linear")
         self.assertIn("time", resampled_cube)
         self.assertIn("refl", resampled_cube)
         self.assertIn("ndvi", resampled_cube)
@@ -167,7 +168,7 @@ def test_resample_in_time_linear_interpolation(self):
     def test_resample_in_time_list_interpolation(self):
         input_cube = create_nx8x6_dataset_with_regular_coords(4)
         resampled_cube = resample_in_time(
-            input_cube, "6H", interp_methods=["linear", "nearest"]
+            input_cube, "6h", interp_methods=["linear", "nearest"]
         )
         self.assertIn("time", resampled_cube)
         self.assertIn("refl_linear", resampled_cube)
@@ -185,7 +186,7 @@ def test_resample_in_time_list_interpolation(self):
     def test_resample_in_time_variable_selection(self):
         input_cube = create_nx8x6_dataset_with_regular_coords(4)
         resampled_cube = resample_in_time(
-            input_cube, "6H", interp_methods="linear", variables="refl"
+            input_cube, "6h", interp_methods="linear", variables="refl"
         )
         self.assertIn("time", resampled_cube)
         self.assertIn("refl", resampled_cube)
@@ -199,7 +200,7 @@ def test_resample_in_time_variable_selection(self):
         )
 
         resampled_cube = resample_in_time(
-            input_cube, "6H", interp_methods="linear", variables="ndvi"
+            input_cube, "6h", interp_methods="linear", variables="ndvi"
         )
         self.assertIn("time", resampled_cube)
         self.assertNotIn("refl", resampled_cube)
@@ -216,7 +217,7 @@ def test_resample_in_time_different_interp_method_per_variable(self):
         input_cube = create_nx8x6_dataset_with_regular_coords(4)
         resampled_cube = resample_in_time(
             input_cube,
-            "6H",
+            "6h",
             interp_methods={"refl": "linear", "ndvi": "nearest"},
         )
         self.assertIn("refl_linear", resampled_cube)
@@ -316,13 +317,13 @@ def test_regular_time_series_downsample_returns_agg(self):
         self.assertEqual(result, "agg")
 
     def test_regular_time_series_upsample_returns_interp(self):
-        result = _guess_resampling_operation(self.ds_regular, "12H")
+        result = _guess_resampling_operation(self.ds_regular, "12h")
         self.assertEqual(result, "interp")
 
     def test_resample_in_time_invalid_method(self):
         input_cube = create_nx8x6_dataset_with_regular_coords(4)
         with self.assertRaises(ValueError):
-            resample_in_time(input_cube, "6H", interp_methods=["nonlinear", "nearest"])
+            resample_in_time(input_cube, "6h", interp_methods=["nonlinear", "nearest"])
 
     def test_get_agg_method_kwargs(self):
         expected = {"tolerance": "1h"}
@@ -342,7 +343,7 @@ def test_get_agg_method_kwargs(self):
         self.assertEqual(expected, result)
 
         with self.assertRaises(ValueError):
-            _get_agg_method_kwargs("bla", "6H")
+            _get_agg_method_kwargs("bla", "6h")
 
     def test_get_temporal_interp_method(self):
         expected = ["nearest"]

xcube_resampling/version.py

@@ -19,4 +19,4 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-__version__ = "0.2.4"
+__version__ = "0.2.5.dev0"