Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 44.2.2 [#1357](https://github.com/openfisca/openfisca-core/pull/1357)

#### New features

- Manage list parameter in Excel reform

## 44.2.1 [#1341](https://github.com/openfisca/openfisca-core/pull/1341)

#### Technical changes
Expand Down
16 changes: 14 additions & 2 deletions openfisca_core/reforms/reform_excel.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,10 @@ def generate_parameter_tree_values(self, parameter) -> list[tuple[str, float]]:
for threshold, val in zip(value.thresholds, threshold_values):
values.append((f"{name}.{threshold}", val))
else:
values.append((name, value))
if isinstance(value, list):
values.append((name, ", ".join(value)))
else:
values.append((name, value))
return sorted(values, key=lambda v: v[0])

def parameter_data(self) -> list[tuple[str, float]]:
Expand Down Expand Up @@ -212,7 +215,16 @@ def modify_parameters(local_parameters: ParameterNode) -> ParameterNode:
)
)
else:
leaf.update(start=date_, value=value)
if "unit" in leaf.metadata and leaf.metadata["unit"] == "list":
if value is None:
leaf.update(start=date_, value=[])
else:
values = [
p.replace(",", "").strip() for p in value.split(" ")
]
leaf.update(start=date_, value=[v for v in values if v])
else:
leaf.update(start=date_, value=value)

for leaf, threshold in params_with_thresholds.values():
sorted_brackets = [v[1] for v in sorted(threshold, key=lambda x: x[0])]
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

setup(
name="OpenFisca-Core",
version="44.2.1",
version="44.2.2",
author="OpenFisca Team",
author_email="contact@openfisca.org",
classifiers=[
Expand Down
Loading