From ff524e64f927af3c86fb6585c66cf7613f219c6b Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Thu, 26 Jan 2017 16:18:36 +0100 Subject: [PATCH 1/5] Deprecate nbsala Deprecate tva_ent --- .../model/revenus/activite/salarie.py | 30 ++----------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/openfisca_france/model/revenus/activite/salarie.py b/openfisca_france/model/revenus/activite/salarie.py index f1292ae966..13ae611806 100644 --- a/openfisca_france/model/revenus/activite/salarie.py +++ b/openfisca_france/model/revenus/activite/salarie.py @@ -100,34 +100,6 @@ class ppe_tp_sa(Variable): # (f1ax, f1bx, f1cx, f1dx, f1qx) -class nbsala(Variable): - column = EnumCol( - enum = Enum([ - u"Sans objet", - u"Aucun salarié", - u"1 à 4 salariés", - u"5 à 9 salariés", - u"10 à 19 salariés", - u"20 à 49 salariés", - u"50 à 199 salariés", - u"200 à 499 salariés", - u"500 à 999 salariés", - u"1000 salariés ou plus", - u"Ne sait pas", - ]) - , - ) - entity = Individu - label = u"Nombre de salariés dans l'établissement de l'emploi actuel" - - - -class tva_ent(Variable): - column = BoolCol(default = True) - entity = Individu - label = u"L'entreprise employant le salarié paye de la TVA" - - # build_column('code_risque', EnumCol(label = u"Code risque pour les accidents du travail")) # TODO: Complete label, add enum and relevant default. @@ -145,6 +117,7 @@ class exposition_accident(Variable): entity = Individu label = u"Exposition au risque pour les accidents du travail" + class exposition_penibilite(Variable): column = EnumCol( enum = Enum([ @@ -279,6 +252,7 @@ class cotisation_sociale_mode_recouvrement(Variable): entity = Individu label = u"Mode de recouvrement des cotisations sociales" + class entreprise_est_association_non_lucrative(Variable): column = BoolCol entity = Individu From ffbeb406c7056dc949ea7c609ccdc1983b4ea4a8 Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Thu, 26 Jan 2017 16:20:28 +0100 Subject: [PATCH 2/5] Bump --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 518276f646..075f3f9773 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 12.0.5 + +* Minor version change because deprecating unused variables +* Deprecate nbsala +* Deprecate tva_ent + ## 12.0.4 * Change `aige_aine` column from IntCol to AgeCol. diff --git a/setup.py b/setup.py index 5d1ee491a2..f92dd7acb1 100755 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name = 'OpenFisca-France', - version = '12.0.4', + version = '12.0.5', author = 'OpenFisca Team', author_email = 'contact@openfisca.fr', classifiers = [ From 90d43eda362061cee58adf4ecb9fa23fb75adacb Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Thu, 26 Jan 2017 18:31:32 +0100 Subject: [PATCH 3/5] Bump --- CHANGELOG.md | 8 ++++---- setup.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 075f3f9773..599b96d88d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ # Changelog -## 12.0.5 +## 13.0.0 -* Minor version change because deprecating unused variables -* Deprecate nbsala -* Deprecate tva_ent +* Deprecate `nbsala` +* Deprecate `tva_ent` +* Low impact changes since deprecating unused variables ## 12.0.4 diff --git a/setup.py b/setup.py index f92dd7acb1..356185c303 100755 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name = 'OpenFisca-France', - version = '12.0.5', + version = '13.0.0', author = 'OpenFisca Team', author_email = 'contact@openfisca.fr', classifiers = [ From 09b95682b18df7da825e7ae0c558a02076ac3eff Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Mon, 30 Jan 2017 10:27:35 +0100 Subject: [PATCH 4/5] Update CHANGELOG --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 599b96d88d..25ff02c271 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,8 @@ * Deprecate `nbsala` * Deprecate `tva_ent` -* Low impact changes since deprecating unused variables + +These changes are low impact since the two deprecated variables were not used. ## 12.0.4 From 2df443b730584a3a79220de36fea2fe68d114e7a Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Mon, 30 Jan 2017 10:59:56 +0100 Subject: [PATCH 5/5] Fix setup.py --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index d2bac84465..356185c303 100755 --- a/setup.py +++ b/setup.py @@ -8,7 +8,6 @@ setup( name = 'OpenFisca-France', version = '13.0.0', - version = '12.0.5', author = 'OpenFisca Team', author_email = 'contact@openfisca.fr', classifiers = [