Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate unused variables #671

Merged
merged 7 commits into from
Jan 30, 2017
Merged
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 13.0.0

* Deprecate `nbsala`
* Deprecate `tva_ent`

These changes are low impact since the two deprecated variables were not used.

## 12.0.6

* Fix `rsa_activite`
Expand Down
30 changes: 2 additions & 28 deletions openfisca_france/model/revenus/activite/salarie.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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([
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down