Merge remote-tracking branch 'origin/master' into country-specific-dh-forward-temperatures

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),
+}

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(

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"