From 551e7beb740ca5df31f0de6b47e8165701cc427e Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Fri, 27 Feb 2026 18:20:51 +0000 Subject: [PATCH] added pytest-postgresql to dev container --- .devcontainer/backend/requirements.txt | 1 + recommendations/optimiser/funding_optimiser.py | 2 +- sfr/principal_pitch/2_export_data.py | 9 ++++----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.devcontainer/backend/requirements.txt b/.devcontainer/backend/requirements.txt index 8fbb6120..d0c493b0 100644 --- a/.devcontainer/backend/requirements.txt +++ b/.devcontainer/backend/requirements.txt @@ -20,5 +20,6 @@ pytest-cov==7.0.0 ipykernel>=6.25,<7 dotenv psycopg[binary] +pytest-postgresql # Formatting black==26.1.0 \ No newline at end of file diff --git a/recommendations/optimiser/funding_optimiser.py b/recommendations/optimiser/funding_optimiser.py index 69a6bc48..48c3cf03 100644 --- a/recommendations/optimiser/funding_optimiser.py +++ b/recommendations/optimiser/funding_optimiser.py @@ -754,7 +754,7 @@ def optimise_with_scenarios( # Wall measures could be IWI or EWI remaining_wall_measures = [ x for x in all_measure_types if x in WALL_INSULATION_MEASURES + [ - "internal_wall_insulation+mechanical_ventilation", "external_wall_insulation+mechanical_ventilation" + "internal_wall_insulation+mechanical_ventilation", "external_wall_insulation+mechanical_ventilation", ] ] remaining_roof_measures = [x for x in all_measure_types if x in ROOF_INSULATION_MEASURES] diff --git a/sfr/principal_pitch/2_export_data.py b/sfr/principal_pitch/2_export_data.py index 8c701bb3..374ed16d 100644 --- a/sfr/principal_pitch/2_export_data.py +++ b/sfr/principal_pitch/2_export_data.py @@ -28,16 +28,15 @@ from sqlalchemy import func # PORTFOLIO_ID = 206 # SCENARIOS = [389] -PORTFOLIO_ID = 581 +PORTFOLIO_ID = 597 SCENARIOS = [ - 1074, 1075 + 1099 ] scenario_names = { - 1074: "EPC C", - 1075: "EPC C Again", + 1099: "£10k cost capped - no solid wall or floor", } -project_name = "???" +project_name = "Livespace Rentals" def get_data(portfolio_id, scenario_ids):