Merge remote-tracking branch 'origin/main' into jacob/positional-dataloader

Author: jacobbieker

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 1.0.0
+current_version = 1.1.0
 
 [bumpversion:file:setup.py]
 search = version="{current_version}"

.github/workflows/test-dataset.yaml

@@ -5,7 +5,7 @@ name: Test against Nowcasting Dataset
 
 on:
   repository_dispatch:
-    types: [my-event]
+    types: [nowcasting-dataset-update]
 
 jobs:
   build:

nowcasting_dataloader/data_sources/pv/pv_model.py

@@ -13,7 +13,7 @@
     PV_SYSTEM_ROW_NUMBER,
     PV_SYSTEM_ID,
 )
-from nowcasting_dataset.data_sources.datasource_output import (
+from nowcasting_dataloader.data_sources.datasource_output import (
     DataSourceOutputML,
 )
 from nowcasting_dataset.time import make_random_time_vectors

nowcasting_dataloader/data_sources/satellite/satellite_model.py

@@ -8,7 +8,7 @@
 from pydantic import Field
 
 from nowcasting_dataset.consts import Array
-from nowcasting_dataset.data_sources.datasource_output import (
+from nowcasting_dataloader.data_sources.datasource_output import (
     DataSourceOutputML,
 )
 from nowcasting_dataset.time import make_random_time_vectors

nowcasting_dataloader/data_sources/sun/sun_model.py

@@ -5,7 +5,7 @@
 from pydantic import Field, validator
 
 from nowcasting_dataset.consts import Array, SUN_AZIMUTH_ANGLE, SUN_ELEVATION_ANGLE
-from nowcasting_dataset.data_sources.datasource_output import (
+from nowcasting_dataloader.data_sources.datasource_output import (
     DataSourceOutputML,
 )
 from nowcasting_dataset.time import make_random_time_vectors

scripts/generate_data_for_tests/get_test_data.py

@@ -0,0 +1,20 @@
+import os
+from pathlib import Path
+import nowcasting_dataloader
+from nowcasting_dataset.config.model import Configuration
+from nowcasting_dataset.dataset.batch import Batch
+
+# set up
+local_path = os.path.dirname(nowcasting_dataloader.__file__) + "/.."
+
+########
+# batch0.nc
+########
+
+c = Configuration()
+c.process.batch_size = 4
+c.process.nwp_channels = c.process.nwp_channels[0:1]
+c.process.sat_channels = c.process.sat_channels[0:1]
+
+f = Batch.fake(configuration=c)
+f.save_netcdf(batch_i=0, path=Path(f"{local_path}/tests/data/batch"))

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name="nowcasting_dataloader",
-    version="1.0.0",
+    version="1.1.0",
     license="MIT",
     description="Nowcasting Dataloader",
     author="Jack Kelly, Peter Dudfield, Jacob Bieker",