From 704f5b25731d92e9c5a0531bd584176abafcfdf5 Mon Sep 17 00:00:00 2001 From: mtifarine Date: Tue, 17 Aug 2021 13:57:26 +0200 Subject: [PATCH 1/3] Modifie la zone de la zone 2 en zone 1 pour la ville de Trilport --- openfisca_france/assets/apl/20110914_zonage.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openfisca_france/assets/apl/20110914_zonage.csv b/openfisca_france/assets/apl/20110914_zonage.csv index e43ba6d851..e531d1d17e 100644 --- a/openfisca_france/assets/apl/20110914_zonage.csv +++ b/openfisca_france/assets/apl/20110914_zonage.csv @@ -31988,7 +31988,7 @@ CODGEO,LIBCOM_2014,REG,DEP,Zonage 77472,La Trétoire,11,77,2 77473,Treuzy-Levelay,11,77,2 77474,Trilbardou,11,77,1 -77475,Trilport,11,77,2 +77475,Trilport,11,77,1 77476,Trocy-en-Multien,11,77,2 77477,Ury,11,77,1 77478,Ussy-sur-Marne,11,77,2 From 075ee4381cce2d581584821497e33ec255b32aad Mon Sep 17 00:00:00 2001 From: Thomas Guillet Date: Fri, 14 Oct 2022 16:16:32 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Met=20=C3=A0=20jour=20le=20CHANGELOG=20et?= =?UTF-8?q?=20setup.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 10 ++++++++++ setup.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6829299119..a5b9dfebdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +### 153.3.5 [#1651](https://github.com/openfisca/openfisca-france/pull/1651) + +* Changement mineur. +* Périodes concernées : à partir du 01/07/2020. +* Zones impactées : `openfisca_france/assets/apl/20110914_zonage.csv`. +* Détails : + - Modification de la zone 2 en 1 pour la ville Trilport. + - Référence: [Arrêté du 27 mai 2020 modifiant l'arrêté du 17 mars 1978 modifié relatif au classement des communes par zones géographiques](https://www.legifrance.gouv.fr/jorf/id/JORFTEXT000041950513) + ### 153.3.4 [2191](https://github.com/openfisca/openfisca-france/pull/2191) * Changement mineur. @@ -470,6 +479,7 @@ Le calcul se fait sur une période annuelle mais là formule actuelle effectue l ```python Instant((period.this_year.offset(-1), 9, 1)) ``` + ### 149.1.1 [#2123](https://github.com/openfisca/openfisca-france/pull/2123) * Changement mineur : Ces changements modifient des éléments non fonctionnels de ce dépôt. diff --git a/setup.py b/setup.py index 51c83ecc52..fe8cc48401 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name = 'OpenFisca-France', - version = '153.3.4', + version = '153.3.5', author = 'OpenFisca Team', author_email = 'contact@openfisca.fr', classifiers = [ From 6697a3b1daa798941c7067dd4a5e010a63315945 Mon Sep 17 00:00:00 2001 From: Robin Guill Date: Fri, 30 Jun 2023 10:32:38 +0200 Subject: [PATCH 3/3] =?UTF-8?q?Renomme=20le=20zonage.csv=20pour=20tracer?= =?UTF-8?q?=20la=20date=20de=20mise=20=C3=A0=20jour?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/apl/{20110914_zonage.csv => 20200701_zonage.csv} | 0 openfisca_france/assets/apl/README.md | 4 ++-- openfisca_france/model/prestations/aides_logement.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename openfisca_france/assets/apl/{20110914_zonage.csv => 20200701_zonage.csv} (100%) diff --git a/openfisca_france/assets/apl/20110914_zonage.csv b/openfisca_france/assets/apl/20200701_zonage.csv similarity index 100% rename from openfisca_france/assets/apl/20110914_zonage.csv rename to openfisca_france/assets/apl/20200701_zonage.csv diff --git a/openfisca_france/assets/apl/README.md b/openfisca_france/assets/apl/README.md index 4c00afaa60..eb3460dfd9 100644 --- a/openfisca_france/assets/apl/README.md +++ b/openfisca_france/assets/apl/README.md @@ -1,7 +1,7 @@ -`20110914_zonage.csv` comes from an XML file sent to Etalab. +`20200701_zonage.csv` comes from an XML file sent to Etalab. This file will be released on http://data.gouv.fr/ soon. -"Arrondissements" and "communes associées" (subcommunes) are not in `20110914_zonage.csv`. +"Arrondissements" and "communes associées" (subcommunes) are not in `20200701_zonage.csv`. Using the file "Liste des communes de la métropole et DOM (toutes les communes ayant existé depuis 1943)" `france2014.txt` available on http://www.insee.fr/fr/methodes/nomenclatures/cog/telechargement.asp diff --git a/openfisca_france/model/prestations/aides_logement.py b/openfisca_france/model/prestations/aides_logement.py index e0087a97d0..675541bc09 100644 --- a/openfisca_france/model/prestations/aides_logement.py +++ b/openfisca_france/model/prestations/aides_logement.py @@ -1390,7 +1390,7 @@ def preload_zone_apl(): if zone_apl_by_depcom is None: with pkg_resources.resource_stream( openfisca_france.__name__, - 'assets/apl/20110914_zonage.csv', + 'assets/apl/20200701_zonage.csv', ) as csv_file: if sys.version_info < (3, 0): csv_reader = csv.DictReader(csv_file)