diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a911f3c..b9aa8f60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +### 3.7.3 [#268](https://github.com/openfisca/openfisca-france-data/pull/268) + +* Technical changes + - Bump de la version d'openfisca-survey-manager en dépendances et adaptation du code à ce bump + ### 3.7.2 [#265](https://github.com/openfisca/openfisca-france-data/pull/265) * Technical changes : diff --git a/openfisca_france_data/erfs_fpr/get_survey_scenario.py b/openfisca_france_data/erfs_fpr/get_survey_scenario.py index ed626143..0fb87ba7 100644 --- a/openfisca_france_data/erfs_fpr/get_survey_scenario.py +++ b/openfisca_france_data/erfs_fpr/get_survey_scenario.py @@ -10,7 +10,7 @@ from openfisca_france_data.erfs_fpr.scenario import ErfsFprSurveyScenario from openfisca_france_data import france_data_tax_benefit_system -from openfisca_survey_manager import default_config_files_directory +from openfisca_survey_manager.paths import default_config_files_directory from openfisca_france_data.model.id_variables import ( idmen_original, diff --git a/openfisca_france_data/pote/input_data_builder/console.py b/openfisca_france_data/pote/input_data_builder/console.py index bfb8d7c7..6aff44b1 100644 --- a/openfisca_france_data/pote/input_data_builder/console.py +++ b/openfisca_france_data/pote/input_data_builder/console.py @@ -11,7 +11,7 @@ from openfisca_france_data.pote.input_data_builder.step_02_b_simulation_credits_reductions import simulation_preparation_credits_reductions from openfisca_france_data.pote.input_data_builder.step_02_c_create_table_foyer_fiscal import create_table_foyer_fiscal from openfisca_france_data.pote.input_data_builder.analyse_variables import liens_variables -from openfisca_survey_manager import default_config_files_directory +from openfisca_survey_manager.paths import default_config_files_directory log = logging.getLogger(__name__) log.setLevel(logging.INFO) diff --git a/setup.py b/setup.py index 374db8cd..35f6f5f1 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name = "OpenFisca-France-Data", - version = "3.7.2", + version = "3.7.3", description = "OpenFisca-France-Data module to work with French survey data", long_description = long_description, long_description_content_type="text/markdown", @@ -44,7 +44,7 @@ install_requires = [ "multipledispatch >=0.6.0, <1.0.0", "OpenFisca-France >=169.0.0, <170.0.0", - "openFisca-survey-manager >=2.3.0, <2.4.0", + "OpenFisca-survey-manager >=3.0.0, <4.0.0", ], extras_require = { "test": [ diff --git a/tests/pote/test_pote_survey_scenario.py b/tests/pote/test_pote_survey_scenario.py index b3b3ecf3..5b37de01 100644 --- a/tests/pote/test_pote_survey_scenario.py +++ b/tests/pote/test_pote_survey_scenario.py @@ -1,5 +1,5 @@ from openfisca_france_data.pote.survey_scenario import PoteSurveyScenario -from openfisca_survey_manager import default_config_files_directory +from openfisca_survey_manager.paths import default_config_files_directory def test_pote_survey_scenario(period=2022, config_file_directory=default_config_files_directory): survey_scenario = PoteSurveyScenario(period = period, config_files_directory=config_file_directory)