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

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

@@ -1,5 +1,17 @@
 # Changelog
 
+### 45.0.1 [#1393](https://github.com/openfisca/openfisca-core/pull/1393)
+
+#### Technical changes
+
+- Remove Conda support
+
+# 45.0.0 [#1393](https://github.com/openfisca/openfisca-core/pull/1393)
+
+#### Breaking changes
+
+- Move `ReformExcel*` from OpenFisca-Core to `ExcelReform*` in a dedicated package [openfisca-excel-reform](https://pypi.org/project/openfisca-excel-reform/) 
+
 ## 44.7.1 [#1383](https://github.com/openfisca/openfisca-core/pull/1383)
 
 #### Bug fixes
@@ -15,7 +27,7 @@
 
 - Manage list parameter in Excel reform
 
-## 44.6.0
+## 44.6.0 [#1374](https://github.com/openfisca/openfisca-core/pull/1374)
 
 #### Technical changes
 
@@ -23,7 +35,7 @@
 - Mark versions `44.3.0`, `44.4.0`, `44.4.1`, and `44.5.0` as yanked.
 - Bump version to `44.6.0` to restore continuous deployment from this reverted baseline.
 
-## 44.2.2
+## 44.2.2 [#1361](https://github.com/openfisca/openfisca-core/pull/1361)
 
 #### Bug fixes
 
@@ -35,7 +47,7 @@
 
 - Add a check for creating a simulation when building a test
 
-## 44.2.0
+## 44.2.0 [#1358](https://github.com/openfisca/openfisca-core/pull/1358)
 
 #### New features
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenFisca-Core
-Version: 44.7.1
+Version: 45.0.1
 Summary: A versatile microsimulation free software
 Home-page: https://github.com/openfisca/openfisca-core
 Author: OpenFisca Team
@@ -83,8 +83,6 @@ Dynamic: summary
 
 [![PyPi Downloads](https://img.shields.io/pypi/dm/openfisca-core?label=pypi%2Fdownloads&style=for-the-badge)](https://pepy.tech/project/openfisca-core)
 [![PyPi Version](https://img.shields.io/pypi/v/openfisca-core.svg?label=pypi%2Fversion&style=for-the-badge)](https://pypi.python.org/pypi/openfisca-core)
-[![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/openfisca-core?label=conda%2Fdownloads&style=for-the-badge)](https://anaconda.org/conda-forge/openfisca-core)
-[![Conda Version](https://img.shields.io/conda/vn/conda-forge/openfisca-core.svg?label=conda%2Fversion&style=for-the-badge)](https://anaconda.org/conda-forge/openfisca-core)
 
 [![Python](https://img.shields.io/pypi/pyversions/openfisca-core.svg?label=python&style=for-the-badge)](https://pypi.python.org/pypi/openfisca-core)
 [![Contributors](https://img.shields.io/github/contributors/openfisca/openfisca-core.svg?style=for-the-badge)](https://github.com/openfisca/openfisca-core/graphs/contributors)
@@ -108,7 +106,6 @@ OpenFisca also relies strongly on NumPy. The last four minor versions should wor
 If you're developing your own country package, you don't need to explicitly install OpenFisca-Core. It just needs to appear [in your package dependencies](https://github.com/openfisca/openfisca-france/blob/100.0.0/setup.py#L60).
 If you want to contribute to OpenFisca-Core itself, welcome!
 To install it locally you can use one of these two options:
-* [conda](https://docs.conda.io/en/latest/) package manager that we recommend for Windows operating system users,
 * or standard Python [pip](https://packaging.python.org/en/latest/key_projects/#pip) package manager.
 
 ### Installing `openfisca-core` with `pip`
@@ -125,29 +122,6 @@ source .venv/bin/activate
 make install-deps install-edit
 ```
 
-### Installing `openfisca-core` with `conda`
-
-Since `openfisca-core` version [35.7.7](https://anaconda.org/conda-forge/openfisca-core), you could use `conda` to install OpenFisca-Core.
-
-Conda is the easiest way to use OpenFisca under Windows as by installing Anaconda you will get:
-- Python
-- The package manager [Anaconda.org](https://docs.anaconda.com/anacondaorg/user-guide/)
-- A virtual environment manager : [conda](https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html)
-- A GUI [Anaconda Navigator](https://docs.anaconda.com/anaconda/navigator/index.html) if you choose to install the full [Anaconda](https://www.anaconda.com/products/individual)
-
-If you are familiar with the command line you could use [Miniconda](https://docs.conda.io/projects/conda/en/latest/user-guide/install/windows.html), which needs very much less disk space than Anaconda.
-
-After installing conda, run these commands in an `Anaconda Powershell Prompt`:
-- `conda create --name openfisca python=3.11` to create an `openfisca` environment.
-- `conda activate openfisca` to use your new environment.
-
-Then, choose one of the following options according to your use case:
-- `conda install -c conda-forge openfisca-core` for default dependencies,
-- or `conda install -c conda-forge openfisca-core-api` if you want the Web API part,
-- or `conda install -c conda-forge -c openfisca openfisca-core-dev` if you want all the dependencies needed to contribute to the project.
-
-For information on how we publish to conda-forge, see [openfisca-core-feedstock](https://github.com/openfisca/openfisca-core-feedstock/blob/master/recipe/README.md).
-
 ## Testing
 
 Install the test dependencies:

{openfisca_core-44.7.1 → openfisca_core-45.0.1}/OpenFisca_Core.egg-info/SOURCES.txt

@@ -125,7 +125,6 @@ openfisca_core/projectors/unique_role_to_entity_projector.py
 openfisca_core/reforms/__init__.py
 openfisca_core/reforms/in_yaml_test_reform.py
 openfisca_core/reforms/reform.py
-openfisca_core/reforms/reform_excel.py
 openfisca_core/scripts/__init__.py
 openfisca_core/scripts/find_placeholders.py
 openfisca_core/scripts/measure_numpy_condition_notations.py

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenFisca-Core
-Version: 44.7.1
+Version: 45.0.1
 Summary: A versatile microsimulation free software
 Home-page: https://github.com/openfisca/openfisca-core
 Author: OpenFisca Team
@@ -83,8 +83,6 @@ Dynamic: summary
 
 [![PyPi Downloads](https://img.shields.io/pypi/dm/openfisca-core?label=pypi%2Fdownloads&style=for-the-badge)](https://pepy.tech/project/openfisca-core)
 [![PyPi Version](https://img.shields.io/pypi/v/openfisca-core.svg?label=pypi%2Fversion&style=for-the-badge)](https://pypi.python.org/pypi/openfisca-core)
-[![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/openfisca-core?label=conda%2Fdownloads&style=for-the-badge)](https://anaconda.org/conda-forge/openfisca-core)
-[![Conda Version](https://img.shields.io/conda/vn/conda-forge/openfisca-core.svg?label=conda%2Fversion&style=for-the-badge)](https://anaconda.org/conda-forge/openfisca-core)
 
 [![Python](https://img.shields.io/pypi/pyversions/openfisca-core.svg?label=python&style=for-the-badge)](https://pypi.python.org/pypi/openfisca-core)
 [![Contributors](https://img.shields.io/github/contributors/openfisca/openfisca-core.svg?style=for-the-badge)](https://github.com/openfisca/openfisca-core/graphs/contributors)
@@ -108,7 +106,6 @@ OpenFisca also relies strongly on NumPy. The last four minor versions should wor
 If you're developing your own country package, you don't need to explicitly install OpenFisca-Core. It just needs to appear [in your package dependencies](https://github.com/openfisca/openfisca-france/blob/100.0.0/setup.py#L60).
 If you want to contribute to OpenFisca-Core itself, welcome!
 To install it locally you can use one of these two options:
-* [conda](https://docs.conda.io/en/latest/) package manager that we recommend for Windows operating system users,
 * or standard Python [pip](https://packaging.python.org/en/latest/key_projects/#pip) package manager.
 
 ### Installing `openfisca-core` with `pip`
@@ -125,29 +122,6 @@ source .venv/bin/activate
 make install-deps install-edit
 ```
 
-### Installing `openfisca-core` with `conda`
-
-Since `openfisca-core` version [35.7.7](https://anaconda.org/conda-forge/openfisca-core), you could use `conda` to install OpenFisca-Core.
-
-Conda is the easiest way to use OpenFisca under Windows as by installing Anaconda you will get:
-- Python
-- The package manager [Anaconda.org](https://docs.anaconda.com/anacondaorg/user-guide/)
-- A virtual environment manager : [conda](https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html)
-- A GUI [Anaconda Navigator](https://docs.anaconda.com/anaconda/navigator/index.html) if you choose to install the full [Anaconda](https://www.anaconda.com/products/individual)
-
-If you are familiar with the command line you could use [Miniconda](https://docs.conda.io/projects/conda/en/latest/user-guide/install/windows.html), which needs very much less disk space than Anaconda.
-
-After installing conda, run these commands in an `Anaconda Powershell Prompt`:
-- `conda create --name openfisca python=3.11` to create an `openfisca` environment.
-- `conda activate openfisca` to use your new environment.
-
-Then, choose one of the following options according to your use case:
-- `conda install -c conda-forge openfisca-core` for default dependencies,
-- or `conda install -c conda-forge openfisca-core-api` if you want the Web API part,
-- or `conda install -c conda-forge -c openfisca openfisca-core-dev` if you want all the dependencies needed to contribute to the project.
-
-For information on how we publish to conda-forge, see [openfisca-core-feedstock](https://github.com/openfisca/openfisca-core-feedstock/blob/master/recipe/README.md).
-
 ## Testing
 
 Install the test dependencies:

{openfisca_core-44.7.1 → openfisca_core-45.0.1}/README.md

@@ -2,8 +2,6 @@
 
 [![PyPi Downloads](https://img.shields.io/pypi/dm/openfisca-core?label=pypi%2Fdownloads&style=for-the-badge)](https://pepy.tech/project/openfisca-core)
 [![PyPi Version](https://img.shields.io/pypi/v/openfisca-core.svg?label=pypi%2Fversion&style=for-the-badge)](https://pypi.python.org/pypi/openfisca-core)
-[![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/openfisca-core?label=conda%2Fdownloads&style=for-the-badge)](https://anaconda.org/conda-forge/openfisca-core)
-[![Conda Version](https://img.shields.io/conda/vn/conda-forge/openfisca-core.svg?label=conda%2Fversion&style=for-the-badge)](https://anaconda.org/conda-forge/openfisca-core)
 
 [![Python](https://img.shields.io/pypi/pyversions/openfisca-core.svg?label=python&style=for-the-badge)](https://pypi.python.org/pypi/openfisca-core)
 [![Contributors](https://img.shields.io/github/contributors/openfisca/openfisca-core.svg?style=for-the-badge)](https://github.com/openfisca/openfisca-core/graphs/contributors)
@@ -27,7 +25,6 @@ OpenFisca also relies strongly on NumPy. The last four minor versions should wor
 If you're developing your own country package, you don't need to explicitly install OpenFisca-Core. It just needs to appear [in your package dependencies](https://github.com/openfisca/openfisca-france/blob/100.0.0/setup.py#L60).
 If you want to contribute to OpenFisca-Core itself, welcome!
 To install it locally you can use one of these two options:
-* [conda](https://docs.conda.io/en/latest/) package manager that we recommend for Windows operating system users,
 * or standard Python [pip](https://packaging.python.org/en/latest/key_projects/#pip) package manager.
 
 ### Installing `openfisca-core` with `pip`
@@ -44,29 +41,6 @@ source .venv/bin/activate
 make install-deps install-edit
 ```
 
-### Installing `openfisca-core` with `conda`
-
-Since `openfisca-core` version [35.7.7](https://anaconda.org/conda-forge/openfisca-core), you could use `conda` to install OpenFisca-Core.
-
-Conda is the easiest way to use OpenFisca under Windows as by installing Anaconda you will get:
-- Python
-- The package manager [Anaconda.org](https://docs.anaconda.com/anacondaorg/user-guide/)
-- A virtual environment manager : [conda](https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html)
-- A GUI [Anaconda Navigator](https://docs.anaconda.com/anaconda/navigator/index.html) if you choose to install the full [Anaconda](https://www.anaconda.com/products/individual)
-
-If you are familiar with the command line you could use [Miniconda](https://docs.conda.io/projects/conda/en/latest/user-guide/install/windows.html), which needs very much less disk space than Anaconda.
-
-After installing conda, run these commands in an `Anaconda Powershell Prompt`:
-- `conda create --name openfisca python=3.11` to create an `openfisca` environment.
-- `conda activate openfisca` to use your new environment.
-
-Then, choose one of the following options according to your use case:
-- `conda install -c conda-forge openfisca-core` for default dependencies,
-- or `conda install -c conda-forge openfisca-core-api` if you want the Web API part,
-- or `conda install -c conda-forge -c openfisca openfisca-core-dev` if you want all the dependencies needed to contribute to the project.
-
-For information on how we publish to conda-forge, see [openfisca-core-feedstock](https://github.com/openfisca/openfisca-core-feedstock/blob/master/recipe/README.md).
-
 ## Testing
 
 Install the test dependencies:

{openfisca_core-44.7.1 → openfisca_core-45.0.1}/openfisca_core/reforms/in_yaml_test_reform.py

@@ -14,7 +14,7 @@ class InYamlTestReform(Reform):
         baseline: TaxBenefitSystem,
         reformed_parameters=dict,
     ) -> None:
-        """Initialize the ReformExcel instance.
+        """Initialize the instance.
 
         :param baseline: Baseline TaxBenefitSystem.
         :param reformed_parameters: Yaml file `parameters` value similar to a parameter tree

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

@@ -25,7 +25,6 @@ long_description = (this_directory / "README.md").read_text()
 
 # Please make sure to cap all dependency versions, in order to avoid unwanted
 # functional and integration breaks caused by external code updates.
-# DO NOT add space between '>=' and version number as it break conda build.
 general_requirements = [
     "PyYAML >=6.0, <7.0",
     "StrEnum >=0.4.8, <0.5.0",  # 3.11.x backport
@@ -84,7 +83,7 @@ dev_requirements = [
 
 setup(
     name="OpenFisca-Core",
-    version="44.7.1",
+    version="45.0.1",
     author="OpenFisca Team",
     author_email="contact@openfisca.org",
     classifiers=[

openfisca_core-44.7.1/openfisca_core/reforms/reform_excel.py

@@ -1,235 +0,0 @@
-from __future__ import annotations
-
-from typing import IO, Iterator
-
-from openfisca_core.types import TaxBenefitSystem
-
-from datetime import date
-from pathlib import Path
-
-import openpyxl
-
-from openfisca_core.parameters.parameter_node import ParameterNode
-from openfisca_core.parameters.parameter_scale import ParameterScale
-from openfisca_core.parameters.parameter_scale_bracket import ParameterScaleBracket
-from openfisca_core.reforms import Reform
-
-
-def get_parameter_node(
-    p: ParameterNode, segments: str | list[str]
-) -> tuple[ParameterNode | ParameterScale | ParameterScaleBracket, list[str]]:
-    if isinstance(segments, str):
-        segments = segments.split(".")
-    if segments:
-        if hasattr(p, "children"):
-            return get_parameter_node(p.children[segments[0]], segments[1:])
-        else:
-            return p, segments
-    else:
-        return p, []
-
-
-class ReformExcelBuilder:
-    def __init__(
-        self,
-        baseline: type[TaxBenefitSystem],
-        path_or_file: Path | str | IO[bytes],
-    ) -> None:
-        # data_only = True to get the value stored the last time Excel read the sheet
-        self.wb = openpyxl.load_workbook(path_or_file, data_only=True)
-        self.baseline = baseline
-
-    @property
-    def suffixes(self) -> list[str]:
-        return [
-            sheetname[len("Paramètres") :]
-            for sheetname in self.wb.sheetnames
-            if sheetname.startswith("Paramètres")
-        ]
-
-    @property
-    def reforms(self) -> Iterator[ReformExcel]:
-        for suffix in self.suffixes:
-            yield self.build_reform(suffix)
-
-    @property
-    def root_name(self) -> str:
-        assert self.wb["Config"]["A2"].value == "root"
-        return self.wb["Config"]["B2"].value
-
-    def get_parameters(self, suffix: str) -> list[tuple[str, float, date]]:
-        sheet = self.wb[f"Paramètres{suffix}"]
-        nom_col = [
-            i for i, cell in enumerate(sheet.iter_cols()) if cell[0].value == "Nom"
-        ]
-        valeur_col = [
-            i for i, cell in enumerate(sheet.iter_cols()) if cell[0].value == "Valeur"
-        ]
-        date_col = [
-            i for i, cell in enumerate(sheet.iter_cols()) if cell[0].value == "Date"
-        ]
-
-        assert nom_col, "La colonne 'Nom' est manquante"
-        assert valeur_col is not None, "La colonne 'Valeur' est manquante"
-        assert date_col, "La colonne 'Date' est manquante"
-
-        return [
-            (
-                row[nom_col[0]],
-                row[valeur_col[0]],
-                row[date_col[0]].date(),
-            )
-            for row in sheet.iter_rows(min_row=2, values_only=True)
-            if row[date_col[0]]
-        ]
-
-    def build_reform(self, suffix: str) -> "ReformExcel":
-        return ReformExcel(
-            suffix,
-            self.baseline,
-            self.root_name,
-            self.get_parameters(suffix),
-        )
-
-
-class ReformExcelTemplateGenerator:
-    def __init__(
-        self, baseline: type[TaxBenefitSystem], root_name: str, period: date
-    ) -> None:
-        self.baseline = baseline
-        self.root_name = root_name
-        self.period = period
-
-    def generate_parameter_tree_values(self, parameter) -> list[tuple[str, float]]:
-        values = []
-        if type(parameter) is ParameterNode:
-            for child in parameter.children.values():
-                values.extend(self.generate_parameter_tree_values(child))
-        else:
-            value = parameter.get_at_instant(self.period)
-            name = parameter.name.removeprefix(self.root_name + ".")
-            if type(parameter) is ParameterScale:
-                threshold_values = (
-                    value.amounts
-                    if parameter.metadata.get("type") == "single_amount"
-                    else value.rates
-                )
-                for threshold, val in zip(value.thresholds, threshold_values):
-                    values.append((f"{name}.{threshold}", val))
-            else:
-                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]]:
-        root_parameter, _ = get_parameter_node(self.baseline.parameters, self.root_name)
-        return self.generate_parameter_tree_values(root_parameter)
-
-    def save_template_xlsx(
-        self,
-        path_or_file: Path | str | IO[bytes],
-    ) -> None:
-        wb = openpyxl.Workbook()
-        ws_config = wb.active
-        ws_config.title = "Config"
-        ws_config.append(["Parameter name", "Parameter value"])
-        ws_config.append(["root", self.root_name])
-
-        wb.create_sheet(title="Paramètres")
-        ws_params = wb["Paramètres"]
-        ws_params.append(["Nom", "Date", "Valeur"])
-
-        for name, value in self.parameter_data():
-            ws_params.append([name, self.period, value])
-
-        # Heuristics to adjust to content
-        ws_params.column_dimensions["A"].width = 70
-        ws_params.column_dimensions["B"].width = 12
-        ws_params.column_dimensions["C"].width = 12
-        wb.active = ws_params
-
-        wb.save(path_or_file)
-
-
-class ReformExcel(Reform):
-    """A class representing a reform defined in an Excel file.
-
-    This class extends the Reform class to provide functionality specific to reforms defined in Excel format.
-    """
-
-    def __init__(
-        self,
-        name: str,
-        baseline: TaxBenefitSystem,
-        root_name: str,
-        reformed_parameters: list[tuple[str, str, date | None]] | None = None,
-    ) -> None:
-        """Initialize the ReformExcel instance.
-
-        :param baseline: Baseline TaxBenefitSystem.
-        :param path: Path to the Excel file defining the reform.
-        :param suffix: Suffix to identify the relevant parameters sheet.
-        """
-        self.name = name
-        self.root_name = root_name
-        self.reformed_parameters = reformed_parameters or []
-        super().__init__(baseline)
-
-    def apply(self):
-        def modify_parameters(local_parameters: ParameterNode) -> ParameterNode:
-            # Go down the parameter tree to the parameter root of this Excel reform
-            root, _ = get_parameter_node(local_parameters, self.root_name)
-            # Dict to track scale-based multiline parameters
-            params_with_thresholds: dict[
-                str, tuple[ParameterScale, list[tuple[float, ParameterScaleBracket]]]
-            ] = dict()
-
-            for name, value, date_ in self.reformed_parameters:
-                leaf, threshold = get_parameter_node(root, name)
-                if type(leaf) is ParameterScale:
-                    threshold_value = float(".".join(threshold))
-                    prop_name = (
-                        "amount"
-                        if leaf.metadata.get("type") == "single_amount"
-                        else "rate"
-                    )
-                    stripped_name = ".".join(name.split(".")[:-1])
-
-                    bracket = ParameterScaleBracket(
-                        data={
-                            "threshold": {
-                                date_.isoformat(): {"value": threshold_value}
-                            },
-                            prop_name: {date_.isoformat(): {"value": value}},
-                        }
-                    )
-
-                    params_with_thresholds.setdefault(stripped_name, (leaf, list()))[
-                        1
-                    ].append(
-                        (
-                            threshold_value,
-                            bracket,
-                        )
-                    )
-                else:
-                    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])]
-                leaf.brackets = sorted_brackets
-
-            return local_parameters
-
-        self.modify_parameters(modifier_function=modify_parameters)