ocf-data-sampler 0.0.22__py3-none-any.whl → 0.0.23__py3-none-any.whl

{ocf_data_sampler-0.0.22.dist-info → ocf_data_sampler-0.0.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocf_data_sampler
-Version: 0.0.22
+Version: 0.0.23
 Summary: Sample from weather data for renewable energy prediction
 Author: James Fulton, Peter Dudfield, and the Open Climate Fix team
 Author-email: info@openclimatefix.org

{ocf_data_sampler-0.0.22.dist-info → ocf_data_sampler-0.0.23.dist-info}/RECORD

@@ -37,7 +37,7 @@ tests/load/test_load_gsp.py,sha256=aT_nqaSXmUTcdHzuTT7AmXJr3R31k4OEN-Fv3eLxlQE,4
 tests/load/test_load_nwp.py,sha256=3qyyDkB1q9t3tyAwogfotNrxqUOpXXimco1CImoEWGg,753
 tests/load/test_load_satellite.py,sha256=STX5AqqmOAgUgE9R1xyq_sM3P1b8NKdGjO-hDhayfxM,524
 tests/numpy_batch/test_gsp.py,sha256=ke4CsFn9ZKRgrciT5-OHS8jmd8nu9gGKKr0T2WzZK6M,592
-tests/numpy_batch/test_nwp.py,sha256=yk77jZfba-dd5ImjOTWNTMNnjJR8SF0kSpZ-513vPTw,1490
+tests/numpy_batch/test_nwp.py,sha256=7ELnpQc6kAWPTQoPejTnXIxCPgjFVmzmdsa8E0ZEBGY,1490
 tests/numpy_batch/test_satellite.py,sha256=DIVnVq7JYgoC6Y6xMtLCNUnk3ADzakCi0bZ44QTdPgQ,1230
 tests/numpy_batch/test_sun_position.py,sha256=zw7ErTKARkW8NrpXJ9MeGp-dkNBJsCscxQx0dnZHg2c,2513
 tests/select/test_dropout.py,sha256=kiycl7RxAQYMCZJlokmx6Da5h_oBpSs8Is8pmSW4gOU,2413
@@ -45,10 +45,10 @@ tests/select/test_fill_time_periods.py,sha256=o59f2YRe5b0vJrG3B0aYZkYeHnpNk4s6EJ
 tests/select/test_find_contiguous_time_periods.py,sha256=G6tJRJd0DMfH9EdfzlKWsmfTbtMwOf3w-2filjJzuIQ,5998
 tests/select/test_location.py,sha256=_WZk2FPYeJ-nIfCJS6Sp_yaVEEo7m31DmMFoZzgyCts,2712
 tests/select/test_select_spatial_slice.py,sha256=7EX9b6g-pMdACQx3yefjs5do2s-Rho2UmKevV4oglsU,5147
-tests/select/test_select_time_slice.py,sha256=rH4h90HdQCoWE7vV7ivMEKhiCStQDEcMBCPamiDuO0k,10147
+tests/select/test_select_time_slice.py,sha256=XC1J3DBBDnt81jcba5u-Hnd0yKv8GIQErLm-OECV6rs,10147
 tests/torch_datasets/test_pvnet_uk_regional.py,sha256=r1SHtwaXQrOYU3EOH1OEp_Bamo338IMv-9Q_gKsUOa4,2789
-ocf_data_sampler-0.0.22.dist-info/LICENSE,sha256=F-Q3UFCR-BECSocV55BFDpn4YKxve9PKrm-lTt6o_Tg,1073
-ocf_data_sampler-0.0.22.dist-info/METADATA,sha256=iB2KIy-7AQjWsOQzQoINItbAlKFWv_3TIRcOJ1-f_Uw,5269
-ocf_data_sampler-0.0.22.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-ocf_data_sampler-0.0.22.dist-info/top_level.txt,sha256=KaQn5qzkJGJP6hKWqsVAc9t0cMLjVvSTk8-kTrW79SA,23
-ocf_data_sampler-0.0.22.dist-info/RECORD,,
+ocf_data_sampler-0.0.23.dist-info/LICENSE,sha256=F-Q3UFCR-BECSocV55BFDpn4YKxve9PKrm-lTt6o_Tg,1073
+ocf_data_sampler-0.0.23.dist-info/METADATA,sha256=mQrWfafPPHVh3Bq40lCEq2_qNcmCj2_8piukA2yqLAg,5269
+ocf_data_sampler-0.0.23.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+ocf_data_sampler-0.0.23.dist-info/top_level.txt,sha256=KaQn5qzkJGJP6hKWqsVAc9t0cMLjVvSTk8-kTrW79SA,23
+ocf_data_sampler-0.0.23.dist-info/RECORD,,

tests/numpy_batch/test_nwp.py

@@ -16,7 +16,7 @@ def da_nwp_like():
 
     x = np.arange(-100, 100, 10)
     y = np.arange(-100, 100, 10)
-    steps = pd.timedelta_range("0H", "8H", freq="1H")
+    steps = pd.timedelta_range("0h", "8h", freq="1h")
     target_times = t0 + steps
 
     channels = ["t", "dswrf"]

tests/select/test_select_time_slice.py

@@ -6,7 +6,7 @@ import xarray as xr
 import pytest
 
 
-NWP_FREQ = pd.Timedelta("3H")
+NWP_FREQ = pd.Timedelta("3h")
 
 @pytest.fixture(scope="module")
 def da_sat_like():
@@ -33,7 +33,7 @@ def da_nwp_like():
     x = np.arange(-100, 100)
     y = np.arange(-100, 100)
     datetimes = pd.date_range("2024-01-02 00:00", "2024-01-03 00:00", freq=NWP_FREQ)
-    steps = pd.timedelta_range("0H", "16H", freq="1H")
+    steps = pd.timedelta_range("0h", "16h", freq="1h")
     channels = ["t", "dswrf"]
 
     da_nwp = xr.DataArray(
@@ -138,9 +138,9 @@ def test_select_time_slice_nwp_basic(da_nwp_like, t0_str):
 
     # Slice parameters
     t0 = pd.Timestamp(f"2024-01-02 {t0_str}")
-    forecast_duration = pd.Timedelta("6H")
-    history_duration = pd.Timedelta("3H")
-    freq = pd.Timedelta("1H")
+    forecast_duration = pd.Timedelta("6h")
+    history_duration = pd.Timedelta("3h")
+    freq = pd.Timedelta("1h")
 
     # Make the selection
     da_slice = select_time_slice_nwp(
@@ -172,10 +172,10 @@ def test_select_time_slice_nwp_with_dropout(da_nwp_like, dropout_hours):
     """Test the functionality of select_time_slice_nwp with dropout"""
 
     t0 = pd.Timestamp("2024-01-02 12:00")
-    forecast_duration = pd.Timedelta("6H")
-    history_duration = pd.Timedelta("3H")
-    freq = pd.Timedelta("1H")
-    dropout_timedelta = pd.Timedelta(f"-{dropout_hours}H")
+    forecast_duration = pd.Timedelta("6h")
+    history_duration = pd.Timedelta("3h")
+    freq = pd.Timedelta("1h")
+    dropout_timedelta = pd.Timedelta(f"-{dropout_hours}h")
 
     da_slice = select_time_slice_nwp(
         da_nwp_like,
@@ -207,10 +207,10 @@ def test_select_time_slice_nwp_with_dropout_and_accum(da_nwp_like, t0_str):
 
     # Slice parameters
     t0 = pd.Timestamp(f"2024-01-02 {t0_str}")
-    forecast_duration = pd.Timedelta("6H")
-    history_duration = pd.Timedelta("3H")
-    freq = pd.Timedelta("1H")
-    dropout_timedelta = pd.Timedelta("-2H")
+    forecast_duration = pd.Timedelta("6h")
+    history_duration = pd.Timedelta("3h")
+    freq = pd.Timedelta("1h")
+    dropout_timedelta = pd.Timedelta("-2h")
 
     t0_delayed = (t0 + dropout_timedelta).floor(NWP_FREQ)