From a9e0849f5c045a4bf2c609272b7f1bce7bfbb14f Mon Sep 17 00:00:00 2001 From: bsteubing Date: Fri, 13 Nov 2026 13:45:35 -0400 Subject: [PATCH] Accept bw2data 4.7 and 4.8 project_changed sender shapes. _check_and_update now takes the ProjectDataset from sender (4.7) or dataset= (4.8), matching multifunctional. --- bw_functional/__init__.py | 7 ++++++- tests/test_project_signal_api.py | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 tests/test_project_signal_api.py diff --git a/bw_functional/__init__.py b/bw_functional/__init__.py index 8c8b6ee..4c0ff5f 100644 --- a/bw_functional/__init__.py +++ b/bw_functional/__init__.py @@ -63,7 +63,12 @@ def _check_parameterized_exchange_for_allocation(_, name): continue process.allocate() -def _check_and_update(dataset): +def _check_and_update(sender, dataset=None, **kwargs): + # bw2data 4.7 and earlier send the ProjectDataset as the sender; 4.8+ send + # the ProjectManager as the sender and the ProjectDataset as dataset=. + if dataset is None: + dataset = sender + if dataset.data is None: dataset.data = {} dataset.save() diff --git a/tests/test_project_signal_api.py b/tests/test_project_signal_api.py new file mode 100644 index 0000000..bb5f09c --- /dev/null +++ b/tests/test_project_signal_api.py @@ -0,0 +1,27 @@ +"""bw2data 4.7 vs 4.8 project_changed receiver compatibility.""" + + +class _FakeProjectDataset: + name = "compat-test" + data = {"bw_functional_version": "already-current"} + + def save(self): + raise AssertionError("save should not run when version is already current") + + +def test_check_and_update_accepts_bw2data_47_positional_sender(monkeypatch): + import bw_functional as bf + + monkeypatch.setattr(bf, "latest", "already-current") + ds = _FakeProjectDataset() + # bw2data ≤4.7: project_changed.send(dataset) + bf._check_and_update(ds) + + +def test_check_and_update_accepts_bw2data_48_dataset_kwarg(monkeypatch): + import bw_functional as bf + + monkeypatch.setattr(bf, "latest", "already-current") + ds = _FakeProjectDataset() + # bw2data 4.8+: project_changed.send(manager, dataset=dataset) + bf._check_and_update(object(), dataset=ds)