From 24f05f51d2af1f4da59c3c636b3917b20d6b0e8f Mon Sep 17 00:00:00 2001 From: lisazeyen <35347358+lisazeyen@users.noreply.github.com> Date: Wed, 7 Aug 2024 09:56:26 +0200 Subject: [PATCH 1/4] fix intersphinx mapping --- doc/conf.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/conf.py b/doc/conf.py index 5c4b3b89..a166dd70 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -341,4 +341,6 @@ texinfo_documents = [ # Example configuration for intersphinx: refer to the Python standard library. -intersphinx_mapping = {"https://docs.python.org/": None} +intersphinx_mapping = { + 'https://docs.python.org/': ('https://docs.python.org/3', None), +} From 59574211a453f18f7d0c63868273612ac1ccfc69 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 7 Aug 2024 10:15:35 +0200 Subject: [PATCH 2/4] retrieve.smk: consistently use conda directive --- rules/retrieve.smk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rules/retrieve.smk b/rules/retrieve.smk index 18b0ddd2..dcfbd1af 100644 --- a/rules/retrieve.smk +++ b/rules/retrieve.smk @@ -53,6 +53,8 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_databundle", log: "logs/retrieve_eurostat_data.log", retries: 2 + conda: + "../envs/retrieve.yaml" script: "../scripts/retrieve_eurostat_data.py" @@ -62,6 +64,8 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_databundle", log: "logs/retrieve_eurostat_household_data.log", retries: 2 + conda: + "../envs/retrieve.yaml" script: "../scripts/retrieve_eurostat_household_data.py" From 9c32932eee710bb2cb2d549bd4ce6f9a690d5664 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 08:18:38 +0000 Subject: [PATCH 3/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- doc/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/conf.py b/doc/conf.py index a166dd70..efce867e 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -342,5 +342,5 @@ texinfo_documents = [ # Example configuration for intersphinx: refer to the Python standard library. intersphinx_mapping = { - 'https://docs.python.org/': ('https://docs.python.org/3', None), + "https://docs.python.org/": ("https://docs.python.org/3", None), } From bab392f37896e249a8b45a8cecb9cd2de335b19a Mon Sep 17 00:00:00 2001 From: lisazeyen <35347358+lisazeyen@users.noreply.github.com> Date: Wed, 7 Aug 2024 14:14:19 +0200 Subject: [PATCH 4/4] remove not needed function --- rules/build_sector.smk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/rules/build_sector.smk b/rules/build_sector.smk index 5916aa02..d1a29e83 100644 --- a/rules/build_sector.smk +++ b/rules/build_sector.smk @@ -215,15 +215,6 @@ rule build_temperature_profiles: "../scripts/build_temperature_profiles.py" -# def output_cop(wildcards): -# return { -# f"cop_{source}_{sink}": resources( -# "cop_" + source + "_" + sink + "_" + "elec_s{simpl}_{clusters}.nc" -# ) -# for sink, source in config["sector"]["heat_pump_sources"].items() -# } - - rule build_cop_profiles: params: heat_pump_sink_T_decentral_heating=config_provider(