From 5d3e89a483e0e095955d12ab63af82ae819b00f8 Mon Sep 17 00:00:00 2001
From: Davide Fioriti <67809479+davide-f@users.noreply.github.com>
Date: Thu, 16 Jan 2025 17:55:05 +0100
Subject: [PATCH] Fix copy-minimal for windows (#1301)
* Add abs path for overrides with copy-minimal
* Update release note
---
Snakefile | 9 +++++----
doc/release_notes.rst | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Snakefile b/Snakefile
index 6653014a3..814a5d4b1 100644
--- a/Snakefile
+++ b/Snakefile
@@ -16,6 +16,7 @@ from _helpers import (
get_last_commit_message,
check_config_version,
copy_default_files,
+ BASE_DIR,
)
from build_demand_profiles import get_load_paths_gegis
from retrieve_databundle_light import datafiles_retrivedatabundle
@@ -809,7 +810,7 @@ if config["monte_carlo"]["options"].get("add_to_snakefile", False) == False:
solving=config["solving"],
augmented_line_connection=config["augmented_line_connection"],
input:
- overrides="data/override_component_attrs",
+ overrides=BASE_DIR + "/data/override_component_attrs",
network="networks/" + RDIR + "elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc",
output:
"results/" + RDIR + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc",
@@ -876,7 +877,7 @@ if config["monte_carlo"]["options"].get("add_to_snakefile", False) == True:
solving=config["solving"],
augmented_line_connection=config["augmented_line_connection"],
input:
- overrides="data/override_component_attrs",
+ overrides=BASE_DIR + "/data/override_component_attrs",
network="networks/"
+ RDIR
+ "elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_{unc}.nc",
@@ -1620,7 +1621,7 @@ if config["foresight"] == "overnight":
solving=config["solving"],
augmented_line_connection=config["augmented_line_connection"],
input:
- overrides="data/override_component_attrs",
+ overrides=BASE_DIR + "/data/override_component_attrs",
# network=RESDIR
# + "prenetworks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_{sopts}_{planning_horizons}_{discountrate}.nc",
network=RESDIR
@@ -2086,7 +2087,7 @@ if config["foresight"] == "myopic":
"co2_sequestration_potential", 200
),
input:
- overrides="data/override_component_attrs",
+ overrides=BASE_DIR + "/data/override_component_attrs",
network=RESDIR
+ "prenetworks-brownfield/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sopts}_{planning_horizons}_{discountrate}_{demand}_{h2export}export.nc",
costs=CDIR + "costs_{planning_horizons}.csv",
diff --git a/doc/release_notes.rst b/doc/release_notes.rst
index 4b6bce8ef..4843b1dfd 100644
--- a/doc/release_notes.rst
+++ b/doc/release_notes.rst
@@ -29,7 +29,7 @@ This part of documentation collects descriptive release notes to capture the mai
* Fix lossy bidirectional links, especially H2 pipelines, which would sometimes gain H2 instead of losing it. `PR #1192 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1192>`__
-* Fix the need for administrative rights on Windows by changing all shadow directory settings for Windows in the Snakefile `PR #1295 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1295>`__
+* Fix the need for administrative rights on Windows by changing all shadow directory settings for Windows in the Snakefile `PR #1295 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1295>`__ and `PR #1301 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1301>`__
PyPSA-Earth 0.6.0
=================