Merge pull request #322 from PyPSA/snakemake_dependencies_followup

make_summary followup on snakemake dependencies removal
This commit is contained in:
Fabian Neumann 2022-03-07 15:53:28 +01:00 committed by GitHub
commit 878fd5045e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -54,7 +54,7 @@ Replacing '/summaries/' with '/plots/' creates nice colored maps of the results.
""" """
import logging import logging
from _helpers import configure_logging, retrieve_snakemake_keys from _helpers import configure_logging
import os import os
import pypsa import pypsa
@ -430,7 +430,8 @@ if __name__ == "__main__":
network_dir = os.path.join('results', 'networks') network_dir = os.path.join('results', 'networks')
configure_logging(snakemake) configure_logging(snakemake)
paths, config, wildcards, logs, out = retrieve_snakemake_keys(snakemake) config = snakemake.config
wildcards = snakemake.wildcards
def expand_from_wildcard(key, config): def expand_from_wildcard(key, config):
w = getattr(wildcards, key) w = getattr(wildcards, key)
@ -451,6 +452,6 @@ if __name__ == "__main__":
for l in ll for l in ll
for opts in expand_from_wildcard("opts", config)} for opts in expand_from_wildcard("opts", config)}
dfs = make_summaries(networks_dict, paths, config, country=wildcards.country) dfs = make_summaries(networks_dict, snakemake.input, config, country=wildcards.country)
to_csv(dfs, out[0]) to_csv(dfs, snakemake.output[0])