From cd449218faa7b021c545d0fd7f6cd305ba5a84ce Mon Sep 17 00:00:00 2001 From: ttochev Date: Tue, 14 Jan 2025 19:03:32 +0100 Subject: [PATCH 1/3] Fix dependency conflict with openfisca-survey-manager --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4c1a209..f63fe72 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ ], install_requires = [ "bottleneck >=1.3.2,<=2.0.0", - "OpenFisca-Core >= 41.5.0,<42", + "OpenFisca-Core >= 41.5.0,<44", "numba>=0.54,<1.0.0", "pandas>=2.0,<3.0", ], From d479396a5b42481c084d9eea3dac6911a800b779 Mon Sep 17 00:00:00 2001 From: ttochev Date: Tue, 14 Jan 2025 19:11:08 +0100 Subject: [PATCH 2/3] Modify setup.py and changelog --- CHANGELOG.md | 30 ++++++++++++++++++++++++++---- setup.py | 2 +- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b539e9a..be4f8c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,39 @@ # Changelog -## 0.0.3 [6](https://github.com/openfisca/openfisca-france-pension/pull/6) +### 0.1.2 [15](https://https://github.com/openfisca/openfisca-france-pension/pull/15) + +* Mise à jour dépendance OpenFisca-Core afin de résoudre conflit de dépendances avec OpenFisca-Survey-Manager + +### 0.1.1 [13](https://github.com/openfisca/openfisca-france-pension/pull/13) + +* Modification de environment.yml afin de rendre possible l'installation dans l'environnement CASD. + +## 0.1.0 [14](https://github.com/openfisca/openfisca-france-pension/pull/14) + +* Amélioration technique. +* Périodes concernées : toutes. +* Zones impactées : `parameters/retraite`. +* Détails : + - Déplie les paramètres qui ne le sont pas (mais pas forcément tous) + +### 0.0.3 [6](https://github.com/openfisca/openfisca-france-pension/pull/6) + +* Amélioration technique. +* Détails : + - Utilisation de la nouvelle version de openfisca-core intégrant les as-of-date parameters. + +### 0.0.3 [6](https://github.com/openfisca/openfisca-france-pension/pull/6) * Amélioration technique. * Détails : - Utilisation de la nouvelle version de openfisca-core intégrant les as-of-date parameters. -## 0.0.2 [5](https://github.com/openfisca/openfisca-france-pension/pull/5) +### 0.0.2 [5](https://github.com/openfisca/openfisca-france-pension/pull/5) * Amélioration technique. * Détails : - Configuration de l'intégration continue -## 0.0.1 +### 0.0.1 -First draft +First draft \ No newline at end of file diff --git a/setup.py b/setup.py index f63fe72..47761cd 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name = "OpenFisca-France-Pension", python_requires='>=3.9', - version = "0.0.3", + version = "0.1.2", author = "OpenFisca Team", author_email = "contact@openfisca.org", classifiers=[ From ec2b1966041cd1f580c1d682ecf868f09e888c1e Mon Sep 17 00:00:00 2001 From: ttochev Date: Wed, 15 Jan 2025 11:57:26 +0100 Subject: [PATCH 3/3] Modify build pipeline to produce sdists as well as wheels --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7f6da95..c54653a 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ install: deps build: clean deps @# `make build` allows us to be be sure tests are run against the packaged version - python setup.py bdist_wheel + python setup.py sdist bdist_wheel find dist -name "*.whl" -exec pip install --upgrade {}[dev] \; check-syntax-errors: