Merge pull request #268 from openclimatefix/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

Author: peterdudfield

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ default_language_version:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       # list of supported hooks: https://pre-commit.com/hooks.html
       - id: trailing-whitespace
@@ -14,12 +14,12 @@ repos:
   # python code formatting/linting
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: "v0.1.13"
+    rev: "v0.4.8"
     hooks:
       - id: ruff
         args: [--fix]
   - repo: https://github.com/psf/black
-    rev: 23.12.1
+    rev: 24.4.2
     hooks:
       - id: black
         args: [--line-length, "100"]

ocf_datapipes/__init__.py

@@ -1,4 +1,5 @@
 """OCF Datapipes"""
+
 import ocf_datapipes.batch
 import ocf_datapipes.convert
 import ocf_datapipes.experimental

ocf_datapipes/batch/__init__.py

@@ -1,4 +1,5 @@
 """Datapipes for batching together data"""
+
 from .batches import BatchKey, NumpyBatch, NWPBatchKey, NWPNumpyBatch, TensorBatch, XarrayBatch
 from .merge_numpy_examples_to_batch import (
     MergeNumpyBatchIterDataPipe as MergeNumpyBatch,

ocf_datapipes/batch/fake/fake_batch.py

@@ -1,4 +1,5 @@
 """ Make fake batch """
+
 from datetime import datetime, timezone
 from typing import Optional, Union
 

ocf_datapipes/batch/fake/gsp.py

@@ -1,4 +1,5 @@
 """ Make fake GSP data """
+
 from datetime import datetime
 
 import numpy as np

ocf_datapipes/batch/fake/nwp.py

@@ -1,4 +1,5 @@
 """ Make fake NWP data """
+
 from datetime import datetime
 
 import numpy as np
@@ -49,12 +50,12 @@ def make_fake_nwp_data(
 
         # main nwp components
 
-        source_batch[
-            NWPBatchKey.nwp_init_time_utc
-        ] = time_utc  # Seconds since UNIX epoch (1970-01-01).
-        source_batch[
-            NWPBatchKey.nwp_target_time_utc
-        ] = time_utc  # Seconds since UNIX epoch (1970-01-01).
+        source_batch[NWPBatchKey.nwp_init_time_utc] = (
+            time_utc  # Seconds since UNIX epoch (1970-01-01).
+        )
+        source_batch[NWPBatchKey.nwp_target_time_utc] = (
+            time_utc  # Seconds since UNIX epoch (1970-01-01).
+        )
         source_batch[NWPBatchKey.nwp] = np.random.random(
             (batch_size, n_times, n_channels, n_y_osgb, n_x_osgb)
         )

ocf_datapipes/batch/fake/pv.py

@@ -1,4 +1,5 @@
 """ Make fake PV data """
+
 from datetime import datetime
 
 import numpy as np

ocf_datapipes/batch/fake/satellite.py

@@ -1,4 +1,5 @@
 """ Make fake Satellite data """
+
 from datetime import datetime
 
 import numpy as np
@@ -80,9 +81,9 @@ def make_fake_satellite_data(
         0, 100, (batch_size, width)
     )
 
-    batch[
-        getattr(BatchKey, f"{variable}_time_utc")
-    ] = time_utc  # Seconds since UNIX epoch (1970-01-01).
+    batch[getattr(BatchKey, f"{variable}_time_utc")] = (
+        time_utc  # Seconds since UNIX epoch (1970-01-01).
+    )
     # Added by np_batch_processor.Topography:
     batch[getattr(BatchKey, f"{variable}_surface_height")] = np.random.randint(
         0, 100, (batch_size, height, width)

ocf_datapipes/batch/fake/sun.py

@@ -1,4 +1,5 @@
 """ Make fake Sun data """
+
 import numpy as np
 
 from ocf_datapipes.batch import BatchKey, NWPBatchKey
@@ -62,11 +63,11 @@ def make_fake_sun_data(configuration: Configuration, batch_size: int = 8):
             batch[BatchKey.nwp][nwp_source] = {}
 
             n_nwp_timesteps = get_n_time_steps_from_config(configuration.input_data.nwp[nwp_source])
-            batch[BatchKey.nwp][nwp_source][
-                NWPBatchKey.nwp_target_time_solar_azimuth
-            ] = np.random.random((batch_size, n_nwp_timesteps))
-            batch[BatchKey.nwp][nwp_source][
-                NWPBatchKey.nwp_target_time_solar_elevation
-            ] = np.random.random((batch_size, n_nwp_timesteps))
+            batch[BatchKey.nwp][nwp_source][NWPBatchKey.nwp_target_time_solar_azimuth] = (
+                np.random.random((batch_size, n_nwp_timesteps))
+            )
+            batch[BatchKey.nwp][nwp_source][NWPBatchKey.nwp_target_time_solar_elevation] = (
+                np.random.random((batch_size, n_nwp_timesteps))
+            )
 
     return batch

ocf_datapipes/batch/fake/utils.py

@@ -1,4 +1,5 @@
 """ Utils Functions to for fake data """
+
 from datetime import timedelta
 
 import numpy as np