Skip to content

Commit fce02b2

Browse files
removed return from tests
1 parent fa6cce5 commit fce02b2

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
- matplotlib
1515
# testing and developing
1616
- pdbpp
17-
- country_converter >= 0.7.7
17+
- country_converter >= 0.8.0
1818
- pytest >= 5.4.3
1919
- isort >= 5.6.0
2020
- pytest-black

pymrio/core/mriosystem.py

+4-8
Original file line numberDiff line numberDiff line change
@@ -2439,14 +2439,10 @@ def aggregate(
24392439
extension.__dict__[ik_name].columns = mi_reg_sec
24402440
extension.__dict__[ik_name].index = mi_reg_sec
24412441
st_redo_unit = True
2442-
elif (
2443-
ik_df.index.names
2444-
== [
2445-
"region",
2446-
"sector",
2447-
]
2448-
and ik_df.columns.names == ["region", "category"]
2449-
):
2442+
elif ik_df.index.names == [
2443+
"region",
2444+
"sector",
2445+
] and ik_df.columns.names == ["region", "category"]:
24502446

24512447
# Full disaggregated finald demand satellite account.
24522448
# Thats not implemented yet - but aggregation is in place

tests/test_core.py

-2
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,6 @@ def test_characterize_extension(fix_testmrio):
343343
check_names=False,
344344
)
345345

346-
return locals()
347-
348346

349347
def test_reset_to_flows(fix_testmrio):
350348
tt = fix_testmrio.testmrio

0 commit comments

Comments
 (0)