Skip to content

Commit

Permalink
Merge branch 'master' into revert-209-tests_inversion
Browse files Browse the repository at this point in the history
  • Loading branch information
pzuldp authored Mar 14, 2024
2 parents 93e4dec + 9dc1376 commit b7d6286
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Changelog

# 3.1.2 [#250](https://github.com/openfisca/openfisca-france-data/pull/250)

* Reverts #209

# 3.1.1 [#249](https://github.com/openfisca/openfisca-france-data/pull/249)

* Technical changes
- Met à jour la version d'openfisca france dans les dépendances

## 3.1.0 [#209](https://github.com/openfisca/openfisca-france-data/pull/209)

New features
Introduce testing for income "inversion" (deduce gross from net)
Update features
Corrects the inversion functions + extends the inversion of unemployment benefit's taxation

### 3.0.6 [#248](https://github.com/openfisca/openfisca-france-data/pull/248)
* Technical changes
- Correction d'une typo dans la PR précédente
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

setup(
name = "OpenFisca-France-Data",
version = "3.0.6",
version = "3.1.2",
description = "OpenFisca-France-Data module to work with French survey data",
long_description = long_description,
long_description_content_type="text/markdown",
Expand Down Expand Up @@ -42,7 +42,7 @@
python_requires = ">=3.9",
install_requires = [
"multipledispatch >=0.6.0, <1.0.0",
"OpenFisca-France >=156.0.0, <157.0.0",
"OpenFisca-France >=160.0.0, <161.0.0",
"openFisca-survey-manager >=2.0.0, <2.1.0",
],
extras_require = {
Expand Down

0 comments on commit b7d6286

Please sign in to comment.