From 33a1c5092375a3139903b044b96cc8a4883ab6c0 Mon Sep 17 00:00:00 2001 From: yerbol-akhmetov Date: Mon, 30 Oct 2023 19:18:25 +0600 Subject: [PATCH 1/7] Add cp1252 encoding --- scripts/build_biomass_transport_costs.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/scripts/build_biomass_transport_costs.py b/scripts/build_biomass_transport_costs.py index 9271b6002..a5db4c9d1 100644 --- a/scripts/build_biomass_transport_costs.py +++ b/scripts/build_biomass_transport_costs.py @@ -24,13 +24,14 @@ def get_countries(): - pandas_options = dict(skiprows=range(6), header=None, index_col=0) + pandas_options = dict(skiprows=range(6), header=None, index_col=0, encoding='cp1252') return tbl.read_pdf( str(snakemake.input.transport_cost_data), pages="145", multiple_tables=False, pandas_options=pandas_options, + encoding='cp1252', )[0].index @@ -41,6 +42,7 @@ def get_cost_per_tkm(page, countries): sep=" |,", engine="python", index_col=False, + encoding='cp1252', ) sc = tbl.read_pdf( @@ -48,6 +50,7 @@ def get_cost_per_tkm(page, countries): pages=page, multiple_tables=False, pandas_options=pandas_options, + encoding='cp1252', )[0] sc.index = countries sc.columns = sc.columns.str.replace("€", "EUR") @@ -80,4 +83,15 @@ def build_biomass_transport_costs(): if __name__ == "__main__": + if "snakemake" not in globals(): + from _helpers import mock_snakemake + + snakemake = mock_snakemake( + "build_biomass_transport_costs", + simpl="", + clusters=48, + ll="v1.0", + sector_opts="Co2L0-168H-T-H-B-I-solar3-dist1", + ) + build_biomass_transport_costs() From 0e97d39c4c1fbc6ae4619e24550baff3d5e0addf Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 14:10:53 +0000 Subject: [PATCH 2/7] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/build_biomass_transport_costs.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/build_biomass_transport_costs.py b/scripts/build_biomass_transport_costs.py index a5db4c9d1..c20b38827 100644 --- a/scripts/build_biomass_transport_costs.py +++ b/scripts/build_biomass_transport_costs.py @@ -24,14 +24,16 @@ def get_countries(): - pandas_options = dict(skiprows=range(6), header=None, index_col=0, encoding='cp1252') + pandas_options = dict( + skiprows=range(6), header=None, index_col=0, encoding="cp1252" + ) return tbl.read_pdf( str(snakemake.input.transport_cost_data), pages="145", multiple_tables=False, pandas_options=pandas_options, - encoding='cp1252', + encoding="cp1252", )[0].index @@ -42,7 +44,7 @@ def get_cost_per_tkm(page, countries): sep=" |,", engine="python", index_col=False, - encoding='cp1252', + encoding="cp1252", ) sc = tbl.read_pdf( @@ -50,7 +52,7 @@ def get_cost_per_tkm(page, countries): pages=page, multiple_tables=False, pandas_options=pandas_options, - encoding='cp1252', + encoding="cp1252", )[0] sc.index = countries sc.columns = sc.columns.str.replace("€", "EUR") From aaba8fb115f6883e10937d9f57c15bad188f1487 Mon Sep 17 00:00:00 2001 From: yerbol-akhmetov Date: Sat, 20 Apr 2024 15:09:54 +0500 Subject: [PATCH 3/7] add OS based encoding --- scripts/build_biomass_transport_costs.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/build_biomass_transport_costs.py b/scripts/build_biomass_transport_costs.py index c20b38827..a54f85be3 100644 --- a/scripts/build_biomass_transport_costs.py +++ b/scripts/build_biomass_transport_costs.py @@ -19,13 +19,16 @@ import pandas as pd import tabula as tbl +import platform ENERGY_CONTENT = 4.8 # unit MWh/t (wood pellets) +system = platform.system() +encoding = 'cp1252' if system == 'Windows' else None def get_countries(): pandas_options = dict( - skiprows=range(6), header=None, index_col=0, encoding="cp1252" + skiprows=range(6), header=None, index_col=0, encoding=encoding ) return tbl.read_pdf( @@ -33,7 +36,7 @@ def get_countries(): pages="145", multiple_tables=False, pandas_options=pandas_options, - encoding="cp1252", + encoding=encoding, )[0].index @@ -44,7 +47,7 @@ def get_cost_per_tkm(page, countries): sep=" |,", engine="python", index_col=False, - encoding="cp1252", + encoding=encoding, ) sc = tbl.read_pdf( @@ -52,7 +55,7 @@ def get_cost_per_tkm(page, countries): pages=page, multiple_tables=False, pandas_options=pandas_options, - encoding="cp1252", + encoding=encoding, )[0] sc.index = countries sc.columns = sc.columns.str.replace("€", "EUR") From 3e1eef2934d26c6016dccbb804092ca4795d4b84 Mon Sep 17 00:00:00 2001 From: yerbol-akhmetov Date: Sat, 20 Apr 2024 15:14:24 +0500 Subject: [PATCH 4/7] revert mocksnakemake --- scripts/build_biomass_transport_costs.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/scripts/build_biomass_transport_costs.py b/scripts/build_biomass_transport_costs.py index a54f85be3..5cd10dd5c 100644 --- a/scripts/build_biomass_transport_costs.py +++ b/scripts/build_biomass_transport_costs.py @@ -91,12 +91,6 @@ def build_biomass_transport_costs(): if "snakemake" not in globals(): from _helpers import mock_snakemake - snakemake = mock_snakemake( - "build_biomass_transport_costs", - simpl="", - clusters=48, - ll="v1.0", - sector_opts="Co2L0-168H-T-H-B-I-solar3-dist1", - ) + snakemake = mock_snakemake("build_biomass_transport_costs") build_biomass_transport_costs() From b313b3940c6464ca2e4915588c556559832e9b22 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 20 Apr 2024 10:15:57 +0000 Subject: [PATCH 5/7] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/build_biomass_transport_costs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/build_biomass_transport_costs.py b/scripts/build_biomass_transport_costs.py index 893a2187b..085a0f004 100644 --- a/scripts/build_biomass_transport_costs.py +++ b/scripts/build_biomass_transport_costs.py @@ -17,13 +17,14 @@ @author: bw0928 """ +import platform + import pandas as pd import tabula as tbl -import platform ENERGY_CONTENT = 4.8 # unit MWh/t (wood pellets) system = platform.system() -encoding = 'cp1252' if system == 'Windows' else None +encoding = "cp1252" if system == "Windows" else None def get_countries(): From b29b9e6c5d91cb631fdfee8c7d2220d03278bb82 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 20:25:40 +0000 Subject: [PATCH 6/7] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/prepare_sector_network.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 0e4367d10..fb290130b 100755 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -2708,9 +2708,8 @@ def add_industry(n, costs): ) p_set_methanol = ( - industrial_demand["methanol"] - .rename(lambda x: x + " industry methanol") - / nhours + industrial_demand["methanol"].rename(lambda x: x + " industry methanol") + / nhours ) if not options["regional_methanol_demand"]: @@ -2732,10 +2731,7 @@ def add_industry(n, costs): bus2="co2 atmosphere", carrier="industry methanol", p_nom_extendable=True, - efficiency2=1 - / options[ - "MWh_MeOH_per_tCO2" - ], + efficiency2=1 / options["MWh_MeOH_per_tCO2"], # CO2 intensity methanol based on stoichiometric calculation with 22.7 GJ/t methanol (32 g/mol), CO2 (44 g/mol), 277.78 MWh/TJ = 0.218 t/MWh ) From 849bdae0d522e580b1ca0dcafdeb2b740506e854 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 20 May 2024 22:40:23 +0200 Subject: [PATCH 7/7] add release note --- doc/release_notes.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index a5454c3b6..551b8c482 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -316,6 +316,8 @@ Upcoming Release * Mark downloaded files as ``ancient`` rather than ``protected``. +* Fix file name enconding in optional rule :mod:`build_biomass_transport_costs` depending on the operating system. + PyPSA-Eur 0.10.0 (19th February 2024) =====================================