From a57190b8acdf1cf753b5794e400fcd39c8dda940 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 17:19:53 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks: v4.6.0 → v5.0.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.6.0...v5.0.0) - [github.com/astral-sh/ruff-pre-commit: v0.4.8 → v0.11.10](https://github.com/astral-sh/ruff-pre-commit/compare/v0.4.8...v0.11.10) - [github.com/psf/black: 24.4.2 → 25.1.0](https://github.com/psf/black/compare/24.4.2...25.1.0) --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6771ad529..7256590b4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ default_language_version: repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.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.4.8" + rev: "v0.11.10" hooks: - id: ruff args: [--fix] - repo: https://github.com/psf/black - rev: 24.4.2 + rev: 25.1.0 hooks: - id: black args: [--line-length, "100"] From 5bc05969f1e3d5f74a80357c84dcb33aad3c1ab1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 17:20:54 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- ocf_datapipes/batch/fake/__init__.py | 2 +- ocf_datapipes/batch/fake/fake_batch.py | 2 +- ocf_datapipes/batch/fake/gsp.py | 2 +- ocf_datapipes/batch/fake/nwp.py | 2 +- ocf_datapipes/batch/fake/pv.py | 2 +- ocf_datapipes/batch/fake/satellite.py | 2 +- ocf_datapipes/batch/fake/sun.py | 2 +- ocf_datapipes/batch/fake/utils.py | 2 +- ocf_datapipes/config/load.py | 2 +- ocf_datapipes/config/model.py | 2 +- ocf_datapipes/config/save.py | 2 +- ocf_datapipes/load/gsp/__init__.py | 2 +- ocf_datapipes/load/gsp/database.py | 2 +- ocf_datapipes/load/gsp/utils.py | 2 +- ocf_datapipes/load/pv/database.py | 2 +- ocf_datapipes/load/pv/utils.py | 2 +- ocf_datapipes/load/wind/utils.py | 2 +- ocf_datapipes/transform/xarray/pv/__init__.py | 2 +- ocf_datapipes/transform/xarray/pv/remove_pv_zero_examples.py | 2 +- ocf_datapipes/utils/pvlive.py | 2 +- ocf_datapipes/utils/split/__init__.py | 2 +- ocf_datapipes/utils/split/method.py | 2 +- ocf_datapipes/utils/split/model.py | 2 +- ocf_datapipes/utils/split/split.py | 2 +- ocf_datapipes/visualisation/batch.py | 2 +- setup.py | 2 +- tests/load/gsp/test_gsp_live.py | 2 +- tests/load/pv/test_pv_database.py | 2 +- tests/load/test_load_satellite.py | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ocf_datapipes/batch/fake/__init__.py b/ocf_datapipes/batch/fake/__init__.py index 435dcf93d..00d293a9a 100644 --- a/ocf_datapipes/batch/fake/__init__.py +++ b/ocf_datapipes/batch/fake/__init__.py @@ -1 +1 @@ -""" init """ +"""init""" diff --git a/ocf_datapipes/batch/fake/fake_batch.py b/ocf_datapipes/batch/fake/fake_batch.py index b908f6374..dd711e901 100644 --- a/ocf_datapipes/batch/fake/fake_batch.py +++ b/ocf_datapipes/batch/fake/fake_batch.py @@ -1,4 +1,4 @@ -""" Make fake batch """ +"""Make fake batch""" from datetime import datetime, timezone from typing import Optional, Union diff --git a/ocf_datapipes/batch/fake/gsp.py b/ocf_datapipes/batch/fake/gsp.py index 9b0aa4383..c8e404581 100644 --- a/ocf_datapipes/batch/fake/gsp.py +++ b/ocf_datapipes/batch/fake/gsp.py @@ -1,4 +1,4 @@ -""" Make fake GSP data """ +"""Make fake GSP data""" from datetime import datetime diff --git a/ocf_datapipes/batch/fake/nwp.py b/ocf_datapipes/batch/fake/nwp.py index 1bbcc3fe7..0658b48ff 100644 --- a/ocf_datapipes/batch/fake/nwp.py +++ b/ocf_datapipes/batch/fake/nwp.py @@ -1,4 +1,4 @@ -""" Make fake NWP data """ +"""Make fake NWP data""" from datetime import datetime diff --git a/ocf_datapipes/batch/fake/pv.py b/ocf_datapipes/batch/fake/pv.py index 616f58c7d..7dda3f636 100644 --- a/ocf_datapipes/batch/fake/pv.py +++ b/ocf_datapipes/batch/fake/pv.py @@ -1,4 +1,4 @@ -""" Make fake PV data """ +"""Make fake PV data""" from datetime import datetime diff --git a/ocf_datapipes/batch/fake/satellite.py b/ocf_datapipes/batch/fake/satellite.py index 2b8dbb19d..37f18896a 100644 --- a/ocf_datapipes/batch/fake/satellite.py +++ b/ocf_datapipes/batch/fake/satellite.py @@ -1,4 +1,4 @@ -""" Make fake Satellite data """ +"""Make fake Satellite data""" from datetime import datetime diff --git a/ocf_datapipes/batch/fake/sun.py b/ocf_datapipes/batch/fake/sun.py index 8dfc6b3bc..549360027 100644 --- a/ocf_datapipes/batch/fake/sun.py +++ b/ocf_datapipes/batch/fake/sun.py @@ -1,4 +1,4 @@ -""" Make fake Sun data """ +"""Make fake Sun data""" import numpy as np diff --git a/ocf_datapipes/batch/fake/utils.py b/ocf_datapipes/batch/fake/utils.py index 7f82dc848..da3022839 100644 --- a/ocf_datapipes/batch/fake/utils.py +++ b/ocf_datapipes/batch/fake/utils.py @@ -1,4 +1,4 @@ -""" Utils Functions to for fake data """ +"""Utils Functions to for fake data""" from datetime import timedelta diff --git a/ocf_datapipes/config/load.py b/ocf_datapipes/config/load.py index 5f422b819..77661fe33 100644 --- a/ocf_datapipes/config/load.py +++ b/ocf_datapipes/config/load.py @@ -1,4 +1,4 @@ -""" Loading configuration functions """ +"""Loading configuration functions""" import logging from typing import Union diff --git a/ocf_datapipes/config/model.py b/ocf_datapipes/config/model.py index 9fd89c8b4..c62976873 100644 --- a/ocf_datapipes/config/model.py +++ b/ocf_datapipes/config/model.py @@ -1,4 +1,4 @@ -""" Configuration model for the dataset. +"""Configuration model for the dataset. All paths must include the protocol prefix. For local files, it's sufficient to just start with a '/'. For aws, start with 's3://', diff --git a/ocf_datapipes/config/save.py b/ocf_datapipes/config/save.py index 757feff55..72f2feef1 100644 --- a/ocf_datapipes/config/save.py +++ b/ocf_datapipes/config/save.py @@ -1,4 +1,4 @@ -""" Save functions for the configuration model""" +"""Save functions for the configuration model""" import json import logging diff --git a/ocf_datapipes/load/gsp/__init__.py b/ocf_datapipes/load/gsp/__init__.py index cee1bccbd..b20d8614d 100644 --- a/ocf_datapipes/load/gsp/__init__.py +++ b/ocf_datapipes/load/gsp/__init__.py @@ -1 +1 @@ -""" Load GSP data from file or database """ +"""Load GSP data from file or database""" diff --git a/ocf_datapipes/load/gsp/database.py b/ocf_datapipes/load/gsp/database.py index 8910f0590..1d51f3166 100644 --- a/ocf_datapipes/load/gsp/database.py +++ b/ocf_datapipes/load/gsp/database.py @@ -1,4 +1,4 @@ -""" Function to get data from live database """ +"""Function to get data from live database""" import logging import os diff --git a/ocf_datapipes/load/gsp/utils.py b/ocf_datapipes/load/gsp/utils.py index bbbbaf3a0..ac59ba43d 100644 --- a/ocf_datapipes/load/gsp/utils.py +++ b/ocf_datapipes/load/gsp/utils.py @@ -1,4 +1,4 @@ -""" Utils for GSP loading""" +"""Utils for GSP loading""" from typing import Optional diff --git a/ocf_datapipes/load/pv/database.py b/ocf_datapipes/load/pv/database.py index f315729c7..f05e71beb 100644 --- a/ocf_datapipes/load/pv/database.py +++ b/ocf_datapipes/load/pv/database.py @@ -1,4 +1,4 @@ -""" Data pipes and utils for getting PV data from database""" +"""Data pipes and utils for getting PV data from database""" import logging import os diff --git a/ocf_datapipes/load/pv/utils.py b/ocf_datapipes/load/pv/utils.py index a442232ef..53115c597 100644 --- a/ocf_datapipes/load/pv/utils.py +++ b/ocf_datapipes/load/pv/utils.py @@ -1,4 +1,4 @@ -""" Util functions for PV data source""" +"""Util functions for PV data source""" from typing import Optional diff --git a/ocf_datapipes/load/wind/utils.py b/ocf_datapipes/load/wind/utils.py index 74d81a900..458fbfe1f 100644 --- a/ocf_datapipes/load/wind/utils.py +++ b/ocf_datapipes/load/wind/utils.py @@ -1,4 +1,4 @@ -""" Util functions for Wind data source""" +"""Util functions for Wind data source""" import numpy as np import pandas as pd diff --git a/ocf_datapipes/transform/xarray/pv/__init__.py b/ocf_datapipes/transform/xarray/pv/__init__.py index a9d06114a..9910d9a62 100644 --- a/ocf_datapipes/transform/xarray/pv/__init__.py +++ b/ocf_datapipes/transform/xarray/pv/__init__.py @@ -1 +1 @@ -""" PV xarray functions """ +"""PV xarray functions""" diff --git a/ocf_datapipes/transform/xarray/pv/remove_pv_zero_examples.py b/ocf_datapipes/transform/xarray/pv/remove_pv_zero_examples.py index 44f2def0d..a265e321c 100644 --- a/ocf_datapipes/transform/xarray/pv/remove_pv_zero_examples.py +++ b/ocf_datapipes/transform/xarray/pv/remove_pv_zero_examples.py @@ -1,4 +1,4 @@ -"""Remove PV data """ +"""Remove PV data""" import logging from datetime import timedelta diff --git a/ocf_datapipes/utils/pvlive.py b/ocf_datapipes/utils/pvlive.py index e50d4a0c4..584c0d008 100644 --- a/ocf_datapipes/utils/pvlive.py +++ b/ocf_datapipes/utils/pvlive.py @@ -1,4 +1,4 @@ -""" Functions used to query the PVlive api """ +"""Functions used to query the PVlive api""" import logging from concurrent import futures diff --git a/ocf_datapipes/utils/split/__init__.py b/ocf_datapipes/utils/split/__init__.py index c7eb89d13..6796d9dd3 100644 --- a/ocf_datapipes/utils/split/__init__.py +++ b/ocf_datapipes/utils/split/__init__.py @@ -1 +1 @@ -""" split functions """ +"""split functions""" diff --git a/ocf_datapipes/utils/split/method.py b/ocf_datapipes/utils/split/method.py index 589be84a1..5392b3eeb 100644 --- a/ocf_datapipes/utils/split/method.py +++ b/ocf_datapipes/utils/split/method.py @@ -1,4 +1,4 @@ -""" Methods for splitting data into train, validation and test """ +"""Methods for splitting data into train, validation and test""" from typing import List, Tuple diff --git a/ocf_datapipes/utils/split/model.py b/ocf_datapipes/utils/split/model.py index 0a83e1210..7ed4df505 100644 --- a/ocf_datapipes/utils/split/model.py +++ b/ocf_datapipes/utils/split/model.py @@ -1,4 +1,4 @@ -""" Model for splitting data """ +"""Model for splitting data""" from typing import List diff --git a/ocf_datapipes/utils/split/split.py b/ocf_datapipes/utils/split/split.py index e289a9a69..4d724298a 100644 --- a/ocf_datapipes/utils/split/split.py +++ b/ocf_datapipes/utils/split/split.py @@ -1,4 +1,4 @@ -""" Function to split datasets up """ +"""Function to split datasets up""" import logging from collections import namedtuple diff --git a/ocf_datapipes/visualisation/batch.py b/ocf_datapipes/visualisation/batch.py index e449a4f83..4a4a5ef7d 100644 --- a/ocf_datapipes/visualisation/batch.py +++ b/ocf_datapipes/visualisation/batch.py @@ -1,4 +1,4 @@ -""" The idea is visualise one of the batches +"""The idea is visualise one of the batches This is a bit of a work in progress, but the idea is to visualise the batch in a markdown file. """ diff --git a/setup.py b/setup.py index d08129638..c6522bf89 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -""" Usual setup file for package """ +"""Usual setup file for package""" # read the contents of your README file from pathlib import Path diff --git a/tests/load/gsp/test_gsp_live.py b/tests/load/gsp/test_gsp_live.py index 59fb1ba60..433b9c6b6 100644 --- a/tests/load/gsp/test_gsp_live.py +++ b/tests/load/gsp/test_gsp_live.py @@ -1,4 +1,4 @@ -""" Test for loading pv data from database """ +"""Test for loading pv data from database""" from datetime import datetime, timedelta, timezone diff --git a/tests/load/pv/test_pv_database.py b/tests/load/pv/test_pv_database.py index a4db871f9..62052ea8d 100644 --- a/tests/load/pv/test_pv_database.py +++ b/tests/load/pv/test_pv_database.py @@ -1,4 +1,4 @@ -""" Test for loading pv data from database """ +"""Test for loading pv data from database""" from datetime import timedelta diff --git a/tests/load/test_load_satellite.py b/tests/load/test_load_satellite.py index 52c1b5056..a24e52286 100644 --- a/tests/load/test_load_satellite.py +++ b/tests/load/test_load_satellite.py @@ -1,4 +1,4 @@ -""" Loading satellite tests +"""Loading satellite tests 1. Open HRV data 2. Open data