Merge branch 'master' into scenario-management

This commit is contained in:
Fabian Neumann 2024-02-18 09:48:12 +01:00
commit f710923320
3 changed files with 9 additions and 13 deletions

View File

@ -1,11 +1,12 @@
# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
# SPDX-FileCopyrightText: : 2017-2024 The PyPSA-Eur Authors
#
# SPDX-License-Identifier: MIT
from os.path import normpath
from shutil import move, rmtree
from os.path import normpath, exists
from shutil import copyfile, move, rmtree
from pathlib import Path
import yaml
from snakemake.remote.HTTP import RemoteProvider as HTTPRemoteProvider
from snakemake.utils import min_version
@ -15,6 +16,10 @@ from scripts._helpers import path_provider
min_version("7.7")
HTTP = HTTPRemoteProvider()
conf_file = os.path.join(workflow.current_basedir, "config/config.yaml")
conf_default_file = os.path.join(workflow.current_basedir, "config/config.default.yaml")
if not exists(conf_file) and exists(conf_default_file):
copyfile(conf_default_file, conf_file)
configfile: "config/config.default.yaml"
configfile: "config/config.yaml"

View File

@ -1,8 +0,0 @@
# SPDX-FileCopyrightText: : 2024 The PyPSA-Eur Authors
#
# SPDX-License-Identifier: CC0-1.0
# add your own configuration overrides here, for instance
version: 0.9.0
# enable:
# retrieve: false

View File

@ -41,8 +41,7 @@ Upcoming Release
applied.
* The default configuration ``config/config.default.yaml`` is now automatically
used as a base configuration file and no longer copied to
``config/config.yaml`` on first use. The file ``config/config.yaml`` should be
used as a base configuration file. The file ``config/config.yaml`` should be
used to define deviations from the default configuration.
* Merged two OPSD time series data versions into such that the option ``load: