From 9628fe748a879e3408a43f360a97416093101bf9 Mon Sep 17 00:00:00 2001 From: romainsacchi Date: Wed, 24 Jan 2024 10:01:26 +0000 Subject: [PATCH 1/4] Black reformating --- tests/test_inventory.py | 47 +++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/tests/test_inventory.py b/tests/test_inventory.py index e0b6942..7b90476 100644 --- a/tests/test_inventory.py +++ b/tests/test_inventory.py @@ -57,7 +57,13 @@ def test_fuel_blend(): tip.static() _, array = fill_xarray_from_input_parameters( tip, - scope={"powertrain": ["ICEV-d", "ICEV-g", ], "size": ["13m-city"]}, + scope={ + "powertrain": [ + "ICEV-d", + "ICEV-g", + ], + "size": ["13m-city"], + }, ) bm = BusModel(array, country="CH") bm.set_all() @@ -102,29 +108,29 @@ def test_fuel_blend(): for fuels in [ ("diesel", "hydrogen - electrolysis - PEM", "methane"), ( - "diesel - biodiesel - palm oil", - "hydrogen - smr - natural gas", - "methane - biomethane - sewage sludge", + "diesel - biodiesel - palm oil", + "hydrogen - smr - natural gas", + "methane - biomethane - sewage sludge", ), ( - "diesel - biodiesel - rapeseed oil", - "hydrogen - smr - natural gas with CCS", - "methane - synthetic - coal", + "diesel - biodiesel - rapeseed oil", + "hydrogen - smr - natural gas with CCS", + "methane - synthetic - coal", ), ( - "diesel - biodiesel - cooking oil", - "hydrogen - wood gasification", - "methane - synthetic - biological", + "diesel - biodiesel - cooking oil", + "hydrogen - wood gasification", + "methane - synthetic - biological", ), ( - "diesel - synthetic - FT - coal - economic allocation", - "hydrogen - atr - biogas", - "methane - synthetic - biological - MSWI", + "diesel - synthetic - FT - coal - economic allocation", + "hydrogen - atr - biogas", + "methane - synthetic - biological - MSWI", ), ( - "diesel - synthetic - methanol - cement - economic allocation", - "hydrogen - wood gasification with CCS", - "methane - synthetic - electrochemical - MSWI", + "diesel - synthetic - methanol - cement - economic allocation", + "hydrogen - wood gasification with CCS", + "methane - synthetic - electrochemical - MSWI", ), ]: fb = { @@ -152,13 +158,8 @@ def test_countries(): bm.energy_storage["origin"] = c ic = InventoryBus(bm, method="recipe", indicator="midpoint") - assert ( - ic.vm.country - == bm.country - ) - assert ( - ic.vm.energy_storage["origin"] == c - ) + assert ic.vm.country == bm.country + assert ic.vm.energy_storage["origin"] == c ic.calculate_impacts() From 05ffdcba292c31ad67f22859204fd6be306a93f2 Mon Sep 17 00:00:00 2001 From: romainsacchi Date: Sun, 11 Feb 2024 11:43:50 +0000 Subject: [PATCH 2/4] Black reformating --- carculator_bus/model.py | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/carculator_bus/model.py b/carculator_bus/model.py index 482249a..2fc41bd 100644 --- a/carculator_bus/model.py +++ b/carculator_bus/model.py @@ -195,9 +195,11 @@ def set_all(self): parameter=["average passengers"], powertrain=pt, year=y, - value="reference" - if "reference" in self.array.coords["value"] - else 0, + value=( + "reference" + if "reference" in self.array.coords["value"] + else 0 + ), size=s, ).values, 1, @@ -209,9 +211,11 @@ def set_all(self): parameter="is_compliant", powertrain=pt, year=y, - value="reference" - if "reference" in self.array.coords["value"] - else 0, + value=( + "reference" + if "reference" in self.array.coords["value"] + else 0 + ), size=s, ).values, val, @@ -224,9 +228,11 @@ def set_all(self): parameter="has_schedule_issue", powertrain=pt, year=y, - value="reference" - if "reference" in self.array.coords["value"] - else 0, + value=( + "reference" + if "reference" in self.array.coords["value"] + else 0 + ), size=s, ).values, "O", @@ -239,9 +245,11 @@ def set_all(self): parameter="is_too_heavy", powertrain=pt, year=y, - value="reference" - if "reference" in self.array.coords["value"] - else 0, + value=( + "reference" + if "reference" in self.array.coords["value"] + else 0 + ), size=s, ).values, "X", @@ -254,9 +262,11 @@ def set_all(self): parameter="is_available", powertrain=pt, year=y, - value="reference" - if "reference" in self.array.coords["value"] - else 0, + value=( + "reference" + if "reference" in self.array.coords["value"] + else 0 + ), size=s, ).values, val, From 0350c76ca34a3e4e5218a048b3e8407b9140f4e0 Mon Sep 17 00:00:00 2001 From: romainsacchi Date: Sun, 11 Feb 2024 12:44:09 +0100 Subject: [PATCH 3/4] Update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5810fd7..d892103 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -carculator_utils==1.2.0.dev3 -prettytable \ No newline at end of file +carculator_utils>=1.2.0.dev5 +prettytable From 1c653b5e60f10e86590d6d8b327bd1f51fdb61ee Mon Sep 17 00:00:00 2001 From: romainsacchi Date: Sun, 11 Feb 2024 12:44:31 +0100 Subject: [PATCH 4/4] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d61c508..481ca5d 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ def package_files(directory): }, python_requires=">=3.10", install_requires=[ - "carculator_utils==1.2.0.dev3", + "carculator_utils>=1.2.0.dev5", "prettytable", ], url="https://github.com/romainsacchi/carculator_bus",