Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
romainsacchi committed Oct 9, 2023
2 parents 874acd5 + 2b27737 commit a2b071a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
8 changes: 5 additions & 3 deletions premise/external.py
Original file line number Diff line number Diff line change
Expand Up @@ -1065,9 +1065,11 @@ def create_custom_markets(self) -> None:

# if there's more than one region, we create a World region
create_world_region = True
if "World" in regions or "World" in market_vars.get(
"except regions", []
) or len(regions) == 1:
if (
"World" in regions
or "World" in market_vars.get("except regions", [])
or len(regions) == 1
):
create_world_region = False

if create_world_region:
Expand Down
7 changes: 6 additions & 1 deletion premise/external_data_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ def check_inventories(
),
"new dataset": val["ecoinvent alias"].get("new dataset", False),
"regionalize": val["ecoinvent alias"].get("regionalize", False),
"except regions": val.get("except regions", ["World",]),
"except regions": val.get(
"except regions",
[
"World",
],
),
"efficiency": val.get("efficiency", []),
"replaces": val.get("replaces", []),
"replaces in": val.get("replaces in", []),
Expand Down

0 comments on commit a2b071a

Please sign in to comment.