From def022731e9f0e38f3b969461282e875b5ce2383 Mon Sep 17 00:00:00 2001 From: peterdudfield Date: Wed, 29 Jun 2022 17:57:42 +0100 Subject: [PATCH 1/2] rename to sheffield_solar_passiv --- nowcasting_datamodel/models/pv.py | 4 ++-- tests/read/test_read_pv.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nowcasting_datamodel/models/pv.py b/nowcasting_datamodel/models/pv.py index e53c1f61..c7c7b78b 100644 --- a/nowcasting_datamodel/models/pv.py +++ b/nowcasting_datamodel/models/pv.py @@ -18,8 +18,8 @@ logger = logging.getLogger(__name__) pv_output = "pvoutput.org" -solar_sheffield_passiv = "solar_sheffield_passiv" -providers = [pv_output, solar_sheffield_passiv] +sheffield_solar_passiv = "sheffield_solar_passiv" +providers = [pv_output, sheffield_solar_passiv] ######## # 7. PV Metadata diff --git a/tests/read/test_read_pv.py b/tests/read/test_read_pv.py index b8ae1d62..6283185a 100644 --- a/tests/read/test_read_pv.py +++ b/tests/read/test_read_pv.py @@ -1,7 +1,7 @@ import logging from datetime import datetime -from nowcasting_datamodel.models import PVSystem, PVSystemSQL, PVYield, pv_output, solar_sheffield_passiv +from nowcasting_datamodel.models import PVSystem, PVSystemSQL, PVYield, pv_output, sheffield_solar_passiv from nowcasting_datamodel.read.read_pv import get_latest_pv_yield, get_pv_systems, get_pv_yield from nowcasting_datamodel.save import save_pv_system @@ -136,7 +136,7 @@ def test_read_pv_yield(db_session_pv, pv_yields_and_systems): def test_read_pv_yield_providers(db_session_pv, pv_yields_and_systems): assert len(get_pv_yield(session=db_session_pv, providers=[pv_output])) == 3 - assert len(get_pv_yield(session=db_session_pv, providers=[solar_sheffield_passiv])) == 0 + assert len(get_pv_yield(session=db_session_pv, providers=[sheffield_solar_passiv])) == 0 def test_read_pv_yield_correct_data(db_session_pv, pv_yields_and_systems): From 8e2202e881489301b1cfbe71b2cfbb27f3cb44ea Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 17:30:34 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- nowcasting_datamodel/models/pv.py | 2 +- tests/read/test_read_pv.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nowcasting_datamodel/models/pv.py b/nowcasting_datamodel/models/pv.py index c7c7b78b..0d5a2834 100644 --- a/nowcasting_datamodel/models/pv.py +++ b/nowcasting_datamodel/models/pv.py @@ -85,7 +85,7 @@ def to_orm(self) -> PVSystemSQL: orientation=self.orientation, status_interval_minutes=self.status_interval_minutes, correct_data=self.correct_data, - installed_capacity_kw=self.installed_capacity_kw + installed_capacity_kw=self.installed_capacity_kw, ) diff --git a/tests/read/test_read_pv.py b/tests/read/test_read_pv.py index 6283185a..e2f9a291 100644 --- a/tests/read/test_read_pv.py +++ b/tests/read/test_read_pv.py @@ -1,7 +1,13 @@ import logging from datetime import datetime -from nowcasting_datamodel.models import PVSystem, PVSystemSQL, PVYield, pv_output, sheffield_solar_passiv +from nowcasting_datamodel.models import ( + PVSystem, + PVSystemSQL, + PVYield, + pv_output, + sheffield_solar_passiv, +) from nowcasting_datamodel.read.read_pv import get_latest_pv_yield, get_pv_systems, get_pv_yield from nowcasting_datamodel.save import save_pv_system