From 0af64be95eacbb0d19fe3cd7a1e1c0a48e4fce09 Mon Sep 17 00:00:00 2001 From: Emmanuel Raviart Date: Mon, 19 Jun 2023 11:59:59 +0200 Subject: [PATCH 1/5] =?UTF-8?q?Supprime=20le=20+=20devant=20un=20bool?= =?UTF-8?q?=C3=A9en?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ce n'est plus supporté par numpy 1.25.0 --- .../prelevements_sociaux/taxes_salaires_main_oeuvre.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/taxes_salaires_main_oeuvre.py b/openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/taxes_salaires_main_oeuvre.py index 34184bbec5..03c4ff89dd 100644 --- a/openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/taxes_salaires_main_oeuvre.py +++ b/openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/taxes_salaires_main_oeuvre.py @@ -362,7 +362,7 @@ def formula_2015_01_01(individu, period, parameters): variable_name = 'financement_organisations_syndicales', ) contrat_de_droit_prive = ( - + (categorie_salarie == TypesCategorieSalarie.prive_non_cadre) + (categorie_salarie == TypesCategorieSalarie.prive_non_cadre) + (categorie_salarie == TypesCategorieSalarie.prive_cadre) + (categorie_salarie == TypesCategorieSalarie.public_non_titulaire) ) From 36a396e72dce624f1f304fd607c5b8c9c55f1b2f Mon Sep 17 00:00:00 2001 From: Emmanuel Raviart Date: Mon, 19 Jun 2023 12:08:05 +0200 Subject: [PATCH 2/5] =?UTF-8?q?Supprime=20le=20+=20devant=20un=20bool?= =?UTF-8?q?=C3=A9en?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openfisca_france/model/prestations/minima_sociaux/asi_aspa.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openfisca_france/model/prestations/minima_sociaux/asi_aspa.py b/openfisca_france/model/prestations/minima_sociaux/asi_aspa.py index 44f675b56e..c538092d3f 100644 --- a/openfisca_france/model/prestations/minima_sociaux/asi_aspa.py +++ b/openfisca_france/model/prestations/minima_sociaux/asi_aspa.py @@ -243,7 +243,7 @@ def formula_2020_04_01(individu, period, parameters): montant_servi_asi = max_(plafond_ressources - base_ressources, 0) return montant_servi_asi * ( - + individu.has_role(Famille.DEMANDEUR) * demandeur_eligible_asi * (elig1 + elig2 / 2 + elig3 / 2) + individu.has_role(Famille.DEMANDEUR) * demandeur_eligible_asi * (elig1 + elig2 / 2 + elig3 / 2) + individu.has_role(Famille.CONJOINT) * conjoint_eligible_asi * (elig1 + elig2 / 2 + elig3 / 2) ) From 66c73e0c26873cecfc294b3487dca418841b0fd6 Mon Sep 17 00:00:00 2001 From: Emmanuel Raviart Date: Mon, 19 Jun 2023 12:16:22 +0200 Subject: [PATCH 3/5] =?UTF-8?q?Supprime=20le=20+=20devant=20un=20bool?= =?UTF-8?q?=C3=A9en?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openfisca_france/model/prestations/cheque_energie.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openfisca_france/model/prestations/cheque_energie.py b/openfisca_france/model/prestations/cheque_energie.py index f46a14e262..a60244489a 100644 --- a/openfisca_france/model/prestations/cheque_energie.py +++ b/openfisca_france/model/prestations/cheque_energie.py @@ -40,7 +40,7 @@ def formula_2017(menage, period, parameters): return ( not_(residence_saint_martin) * ( - + (statut_occupation_logement == TypesStatutOccupationLogement.primo_accedant) + (statut_occupation_logement == TypesStatutOccupationLogement.primo_accedant) + (statut_occupation_logement == TypesStatutOccupationLogement.proprietaire) + (statut_occupation_logement == TypesStatutOccupationLogement.locataire_hlm) + (statut_occupation_logement == TypesStatutOccupationLogement.locataire_vide) From 0b1a8b1ec83537f845de69e1249274fddb938361 Mon Sep 17 00:00:00 2001 From: Emmanuel Raviart Date: Mon, 19 Jun 2023 13:24:31 +0200 Subject: [PATCH 4/5] =?UTF-8?q?Supprime=20le=20+=20devant=20un=20bool?= =?UTF-8?q?=C3=A9en?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openfisca_france/model/prestations/locapass.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openfisca_france/model/prestations/locapass.py b/openfisca_france/model/prestations/locapass.py index bcf844676c..23d173de93 100644 --- a/openfisca_france/model/prestations/locapass.py +++ b/openfisca_france/model/prestations/locapass.py @@ -27,7 +27,7 @@ class locapass_eligibilite_logement(Variable): def formula(menage, period): statut_occupation = menage('statut_occupation_logement', period) return ( - + (statut_occupation == TypesStatutOccupationLogement.locataire_hlm) + (statut_occupation == TypesStatutOccupationLogement.locataire_hlm) + (statut_occupation == TypesStatutOccupationLogement.locataire_vide) + (statut_occupation == TypesStatutOccupationLogement.locataire_meuble) + (statut_occupation == TypesStatutOccupationLogement.locataire_foyer) From 6ca7af282cde4eac6d67893683f0ade3790cd9b8 Mon Sep 17 00:00:00 2001 From: eraviart Date: Mon, 19 Jun 2023 13:55:52 +0200 Subject: [PATCH 5/5] =?UTF-8?q?Mont=C3=A9e=20de=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 16 ++++++++++++++-- setup.py | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d26356ca6..292d693ed3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,16 @@ - # Changelog +# Changelog + +### 149.1.2 [#2124](https://github.com/openfisca/openfisca-france/pull/2124) + +* Changement mineur. +* Périodes concernées : toutes. +* Zones impactées : + - `openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/taxes_salaires_main_oeuvre.py` + - `openfisca_france/model/prestations/minima_sociaux/asi_aspa.py` + - `openfisca_france/model/prestations/cheque_energie.py` + - `openfisca_france/model/prestations/locapass.py` +* Détails : + - Enlève l'opérateur unaire "+" devant un booléen, car ce n'est plus supporté par Numpy 1.25 ### 149.1.1 [#2123](https://github.com/openfisca/openfisca-france/pull/2123) @@ -8,7 +20,7 @@ * Détails : Implémente des unités plus précises du SMIC -### 149.1.0 [#2118](https://github.com/openfisca/openfisca-france/pull/2118) +## 149.1.0 [#2118](https://github.com/openfisca/openfisca-france/pull/2118) * Amélioration technique. * Périodes concernées : à partir du 01/04/2014 diff --git a/setup.py b/setup.py index 4d0f78a2de..59f6345ada 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name = 'OpenFisca-France', - version = '149.1.1', + version = '149.1.2', author = 'OpenFisca Team', author_email = 'contact@openfisca.fr', classifiers = [