bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into scenario-management

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Snakefile
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 # SPDX-License-Identifier: MIT
from os.path import normpath from os.path import normpath, exists
from shutil import move, rmtree from shutil import copyfile, move, rmtree
from pathlib import Path from pathlib import Path
import yaml import yaml
from snakemake.remote.HTTP import RemoteProvider as HTTPRemoteProvider from snakemake.remote.HTTP import RemoteProvider as HTTPRemoteProvider
from snakemake.utils import min_version from snakemake.utils import min_version
@ -15,6 +16,10 @@ from scripts._helpers import path_provider
min_version("7.7") min_version("7.7")
HTTP = HTTPRemoteProvider() 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.default.yaml"
configfile: "config/config.yaml" configfile: "config/config.yaml"

8
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

3
doc/release_notes.rst
View File

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