OpenFisca-Core 44.6.0__tar.gz → 44.7.1__tar.gz

{openfisca_core-44.6.0 → openfisca_core-44.7.1}/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 44.7.1 [#1383](https://github.com/openfisca/openfisca-core/pull/1383)
+
+#### Bug fixes
+
+- Fix `TypeError: metaclass conflict` on `import openfisca_core` with NumPy >= 2.5.
+  - NumPy 2.5 redefined `numpy.typing.NDArray` as a [PEP 695](https://peps.python.org/pep-0695/) `typing.TypeAliasType`, which cannot be used as a runtime base class.
+  - `types.EnumArray` now derives from `numpy.ndarray` directly, preserving its `dtype` parametrisation.
+  - Add NumPy 2.5 to the test matrix, which previously stopped at 2.3.0 while `setup.py` allows up to 3.
+
+## 44.7.0 [#1357](https://github.com/openfisca/openfisca-core/pull/1357)
+
+#### New features
+
+- Manage list parameter in Excel reform
+
 ## 44.6.0
 
 #### Technical changes

{openfisca_core-44.6.0 → openfisca_core-44.7.1/OpenFisca_Core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenFisca-Core
-Version: 44.6.0
+Version: 44.7.1
 Summary: A versatile microsimulation free software
 Home-page: https://github.com/openfisca/openfisca-core
 Author: OpenFisca Team

{openfisca_core-44.6.0/OpenFisca_Core.egg-info → openfisca_core-44.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenFisca-Core
-Version: 44.6.0
+Version: 44.7.1
 Summary: A versatile microsimulation free software
 Home-page: https://github.com/openfisca/openfisca-core
 Author: OpenFisca Team

{openfisca_core-44.6.0 → openfisca_core-44.7.1}/openfisca_core/reforms/reform_excel.py

@@ -117,7 +117,10 @@ class ReformExcelTemplateGenerator:
                 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]]:
@@ -212,7 +215,16 @@ class ReformExcel(Reform):
                         )
                     )
                 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])]

{openfisca_core-44.6.0 → openfisca_core-44.7.1}/openfisca_core/types.py

@@ -179,7 +179,9 @@ class Enum(enum.Enum, metaclass=EnumType):
     _member_names_: list[str]
 
 
-class EnumArray(Array[DTypeEnum], metaclass=abc.ABCMeta):
+class EnumArray(
+    numpy.ndarray[tuple[int, ...], numpy.dtype[DTypeEnum]], metaclass=abc.ABCMeta
+):
     possible_values: None | type[Enum]
 
     @abc.abstractmethod

{openfisca_core-44.6.0 → openfisca_core-44.7.1}/setup.py

@@ -84,7 +84,7 @@ dev_requirements = [
 
 setup(
     name="OpenFisca-Core",
-    version="44.6.0",
+    version="44.7.1",
     author="OpenFisca Team",
     author_email="contact@openfisca.org",
     classifiers=[