Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
romainsacchi committed May 16, 2023
2 parents 5f077af + b88179f commit 7ee5718
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
7 changes: 3 additions & 4 deletions premise_gwp/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ def add_premise_gwp():
check_biosphere_database()
bw2io_version = check_biosphere_version()




# impact methods to create
categories_bw2io087 = {
(
Expand Down Expand Up @@ -76,7 +73,9 @@ def add_premise_gwp():
),
}

categories = categories_bw2io088 if bw2io_version >= (0, 8, 8) else categories_bw2io087
categories = (
categories_bw2io088 if bw2io_version >= (0, 8, 8) else categories_bw2io087
)

for c in categories:
print("Adding {}".format(c[0]))
Expand Down
1 change: 1 addition & 0 deletions premise_gwp/biosphere.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ def check_biosphere_database():
ERROR = "IPCC LCIA methods for ecoinvent biosphere flows only; install base ecoinvent data"
assert "biosphere3" in bd.databases, ERROR


def check_biosphere_version() -> tuple:
# check for the presence of Beryllium II
if "Beryllium II" not in [f["name"] for f in bd.Database("biosphere3")]:
Expand Down

0 comments on commit 7ee5718

Please sign in to comment.