diff --git a/CHANGELOG.md b/CHANGELOG.md index dc02a384..8c559eca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +# 1.3.1 [#228](https://github.com/openfisca/openfisca-france-data/pull/228) +* Technical changes +- Ajoute de deux jeux de données utilisées pour les tests au paquet : + - 'assets/aggregats/taxipp/agregats_tests_taxipp_2_0.xlsx' + - `'assets/aggregats/ines/ines_2019.json' + # 1.3.0 [#227](https://github.com/openfisca/openfisca-france-data/pull/227) * Technical changes - Adapte le comparator pour effectuer plus de tests en distribution diff --git a/openfisca_france_data/erfs_fpr/input_data_builder/step_06_final.py b/openfisca_france_data/erfs_fpr/input_data_builder/step_06_final.py index eaa28055..48e06e7c 100644 --- a/openfisca_france_data/erfs_fpr/input_data_builder/step_06_final.py +++ b/openfisca_france_data/erfs_fpr/input_data_builder/step_06_final.py @@ -48,16 +48,24 @@ def create_input_data_frame(temporary_store = None, year = None, export_flattene "traitement_indiciaire_brut", ] - var_menages = [ - 'idmen', - 'loyer', - 'statut_occupation_logement', - 'taxe_habitation', - 'wprm', - 'zone_apl', - 'logement_conventionne', - 'prest_precarite_hand' # on récupère la variable de montant de aah / caah pour pouvoir faire une imputation du handicap - ] + if year >= 2018: + var_menages = [ + 'idmen', + 'loyer', + 'statut_occupation_logement', + 'taxe_habitation', + 'wprm', + 'zone_apl', + 'logement_conventionne', + 'prest_precarite_hand' # on récupère la variable de montant de aah / caah pour pouvoir faire une imputation du handicap + ] + else: + var_menages = [ + 'idmen', + 'loyer', + 'taxe_habitation', + 'wprm', + ] individus = create_ids_and_roles(individus) individus = individus[var_individus].copy() diff --git a/setup.py b/setup.py index e67439f2..e1afc26d 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name = "OpenFisca-France-Data", - version = "1.3.0", + version = "1.3.1", description = "OpenFisca-France-Data module to work with French survey data", long_description = long_description, long_description_content_type="text/markdown", @@ -23,8 +23,9 @@ "Programming Language :: Python :: 3.7", "Topic :: Scientific/Engineering :: Information Analysis", ], - package_data = { - 'openfisca_france_data/assets': ['openfisca_france_data/assets/agregats_tests_taxipp_2_0.xlsx'], + package_data = { + 'openfisca_france_data': ['assets/aggregats/taxipp/agregats_tests_taxipp_2_0.xlsx', + 'assets/aggregats/ines/ines_2019.json'], }, entry_points = { 'console_scripts': [