Skip to content

Commit

Permalink
Black reformating
Browse files Browse the repository at this point in the history
  • Loading branch information
romainsacchi committed Aug 5, 2023
1 parent d24ad26 commit bd2328d
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 24 deletions.
6 changes: 3 additions & 3 deletions premise/cement.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def _update_cement(scenario, version, system_model, modified_datasets, cache):
version=version,
system_model=system_model,
modified_datasets=modified_datasets,
cache=cache
cache=cache,
)

if scenario["iam data"].cement_markets is not None:
Expand Down Expand Up @@ -76,7 +76,7 @@ def __init__(
version: str,
system_model: str,
modified_datasets: dict,
cache: dict = None
cache: dict = None,
):
super().__init__(
database,
Expand All @@ -87,7 +87,7 @@ def __init__(
version,
system_model,
modified_datasets,
cache
cache,
)
self.version = version

Expand Down
4 changes: 2 additions & 2 deletions premise/direct_air_capture.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def _update_dac(scenario, version, system_model, modified_datasets, cache=None):
version=version,
system_model=system_model,
modified_datasets=modified_datasets,
cache=cache
cache=cache,
)

if scenario["iam data"].dac_markets is not None:
Expand Down Expand Up @@ -88,7 +88,7 @@ def __init__(
version,
system_model,
modified_datasets,
cache
cache,
)
self.database = database
self.iam_data = iam_data
Expand Down
12 changes: 6 additions & 6 deletions premise/ecoinvent_modification.py
Original file line number Diff line number Diff line change
Expand Up @@ -415,43 +415,43 @@ def _update_all(
vehicle_type=vehicle_type,
version=version,
system_model=system_model,
modified_datasets=modified_datasets
modified_datasets=modified_datasets,
)
scenario, modified_datasets, cache = _update_electricity(
scenario=scenario,
version=version,
system_model=system_model,
modified_datasets=modified_datasets,
use_absolute_efficiency=use_absolute_efficiency,
cache=cache
cache=cache,
)
scenario, modified_datasets, cache = _update_dac(
scenario=scenario,
version=version,
system_model=system_model,
modified_datasets=modified_datasets,
cache=cache
cache=cache,
)
scenario, modified_datasets, cache = _update_cement(
scenario=scenario,
version=version,
system_model=system_model,
modified_datasets=modified_datasets,
cache=cache
cache=cache,
)
scenario, modified_datasets, cache = _update_steel(
scenario=scenario,
version=version,
system_model=system_model,
modified_datasets=modified_datasets,
cache=cache
cache=cache,
)
scenario, modified_datasets, cache = _update_fuels(
scenario=scenario,
version=version,
system_model=system_model,
modified_datasets=modified_datasets,
cache=cache
cache=cache,
)
scenario, modified_datasets = _update_emissions(
scenario, version, system_model, gains_scenario, modified_datasets
Expand Down
9 changes: 7 additions & 2 deletions premise/electricity.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,12 @@ def get_production_weighted_losses(


def _update_electricity(
scenario, version, system_model, modified_datasets, use_absolute_efficiency, cache=None
scenario,
version,
system_model,
modified_datasets,
use_absolute_efficiency,
cache=None,
):
electricity = Electricity(
database=scenario["database"],
Expand Down Expand Up @@ -248,7 +253,7 @@ def __init__(
version,
system_model,
modified_datasets,
cache
cache,
)
mapping = InventorySet(self.database)
self.powerplant_map = mapping.generate_powerplant_map()
Expand Down
6 changes: 3 additions & 3 deletions premise/fuels.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ def _update_fuels(scenario, version, system_model, modified_datasets, cache):
version=version,
system_model=system_model,
modified_datasets=modified_datasets,
cache=cache
cache=cache,
)

if any(
Expand Down Expand Up @@ -321,7 +321,7 @@ def __init__(
version: str,
system_model: str,
modified_datasets: dict,
cache: dict = None
cache: dict = None,
):
super().__init__(
database,
Expand All @@ -332,7 +332,7 @@ def __init__(
version,
system_model,
modified_datasets,
cache
cache,
)
# ecoinvent version
self.version = version
Expand Down
4 changes: 2 additions & 2 deletions premise/steel.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def __init__(
version: str,
system_model: str,
modified_datasets: dict,
cache: dict = None
cache: dict = None,
) -> None:
super().__init__(
database,
Expand All @@ -72,7 +72,7 @@ def __init__(
version,
system_model,
modified_datasets,
cache
cache,
)
self.version = version

Expand Down
12 changes: 6 additions & 6 deletions premise/transport.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@


def _update_vehicles(
scenario,
vehicle_type,
version,
system_model,
modified_datasets,
cache=None,
scenario,
vehicle_type,
version,
system_model,
modified_datasets,
cache=None,
):
trspt = Transport(
database=scenario["database"],
Expand Down

0 comments on commit bd2328d

Please sign in to comment.