Skip to content

Commit

Permalink
removed return from tests
Browse files Browse the repository at this point in the history
  • Loading branch information
konstantinstadler committed Nov 16, 2022
1 parent fa6cce5 commit fce02b2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
- matplotlib
# testing and developing
- pdbpp
- country_converter >= 0.7.7
- country_converter >= 0.8.0
- pytest >= 5.4.3
- isort >= 5.6.0
- pytest-black
Expand Down
12 changes: 4 additions & 8 deletions pymrio/core/mriosystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -2439,14 +2439,10 @@ def aggregate(
extension.__dict__[ik_name].columns = mi_reg_sec
extension.__dict__[ik_name].index = mi_reg_sec
st_redo_unit = True
elif (
ik_df.index.names
== [
"region",
"sector",
]
and ik_df.columns.names == ["region", "category"]
):
elif ik_df.index.names == [
"region",
"sector",
] and ik_df.columns.names == ["region", "category"]:

# Full disaggregated finald demand satellite account.
# Thats not implemented yet - but aggregation is in place
Expand Down
2 changes: 0 additions & 2 deletions tests/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,6 @@ def test_characterize_extension(fix_testmrio):
check_names=False,
)

return locals()


def test_reset_to_flows(fix_testmrio):
tt = fix_testmrio.testmrio
Expand Down

0 comments on commit fce02b2

Please sign in to comment.