Skip to content

Commit 52ce7d3

Browse files
committed
Merge branch 'major-testing' into major
# Conflicts: # tests/actions/test_activity_actions.py # tests/actions/test_database_actions.py # tests/actions/test_method_actions.py # tests/conftest.py # tests_old/legacy/test_settings.py # tests_old/legacy/test_uncertainty.py # tests_old/legacy/test_utils.py # tests_old/legacy/test_widgets.py # tests_old/widgets/test_custom_allocation_editor.py # tests_old/widgets/test_property_editor.py # tests_old/widgets/test_tag_editor.py # tests_old/wizards/test_export_wizard.py # tests_old/wizards/test_import_wizard.py # tests_old/wizards/test_uncertainty_wizard.py
2 parents a09b9c1 + c0d84ff commit 52ce7d3

47 files changed

Lines changed: 2797 additions & 1292 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

activity_browser/bwutils/metadata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def on_node_changed(self, new, old):
105105

106106
@property
107107
def databases(self):
108-
return set(self.dataframe["database"].unique())
108+
return set(self.dataframe.get("database").unique())
109109

110110
def sync_node(self, key: tuple) -> None:
111111
"""Update metadata when an activity has changed.

activity_browser/layouts/pages/activity_details/exchanges_tab.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ def displayData(self, col: int, key: str):
582582
"normalize": False,
583583
}
584584

585-
if key.startswith("property_") and self[key]["normalize"]:
585+
if key.startswith("property_") and self[key].get("normalize", True):
586586
prop = self[key].copy()
587587
prop["unit"] = prop['unit'] + f" / {self['unit']}"
588588
return prop

activity_browser/mod/bw2data_bak/__init__.py

Lines changed: 0 additions & 10 deletions
This file was deleted.

activity_browser/mod/bw2data_bak/backends/__init__.py

Lines changed: 0 additions & 16 deletions
This file was deleted.

activity_browser/mod/bw2data_bak/backends/base.py

Lines changed: 0 additions & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)