Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mise à jour vers OpenFisca 113 #205

Merged
merged 38 commits into from
Jan 24, 2023
Merged

Mise à jour vers OpenFisca 113 #205

merged 38 commits into from
Jan 24, 2023

Conversation

benoit-cty
Copy link
Contributor

@benoit-cty benoit-cty commented Jan 17, 2023 •
edited
Loading

Technical changes

  • Mise à jour pour utiliser OpenFisca France >= 113.0.0 et < 120.0.0
  • Cette PR est le travail de @lukas-puschnig puis des modifications de ma part pour le rendre compatible avec la CI.

lukas-puschnig and others added 30 commits October 10, 2022 17:54
@lukas-puschnig @benoit-cty
Limit data sources to 2016 only to begin with
9724efc
@lukas-puschnig @benoit-cty
Change access rights for some files
94daa0a
@lukas-puschnig @benoit-cty
Add comments, restructure return value of create_familles()
970aed9
@lukas-puschnig @benoit-cty
Add log output for divergences of households in final data set
be4e169
@lukas-puschnig @benoit-cty
Change default value of year to 2017
7dbc221 
Necessary bc. unable to set command line parameters in VSCode debugger
@lukas-puschnig @benoit-cty
Add .csv and .html outputs to .gitignore file
a12b004
@lukas-puschnig @benoit-cty
Begin to overhaul log structure
75dc3f5
@lukas-puschnig @benoit-cty
Tidy up logs
c11beec
@lukas-puschnig @benoit-cty
Minor bug fixes
0c2eb69
@lukas-puschnig @benoit-cty
Improve logging, add second handler (file)
955d452
@lukas-puschnig @benoit-cty
Fix variable name bug (rev_fonciers) for old versions of ERFS
a185c57
@lukas-puschnig @benoit-cty
Automatically fix some erroneous years of birth
efad9fe
@lukas-puschnig @benoit-cty
Change default year to 2017 (latest available data)
0f52a94
@lukas-puschnig @benoit-cty
[WIP] Begins big overhaul of SMIC calculations (on hold, waiting for …
effd1c6 
…OFF update)
@lukas-puschnig @benoit-cty
Fixes the SMIC calculation with the new OFF version
995b7ec
@lukas-puschnig @benoit-cty
Aligns parameter paths to new version of OFF
e63d414
@lukas-puschnig @benoit-cty
Control for table and variable names pre-2002
553c443
@lukas-puschnig @benoit-cty
Met en oeuvre des modifs temp pour reproduire un bug
570325c
@lukas-puschnig @benoit-cty
Improve sample data export
63be9dc
@lukas-puschnig @benoit-cty
Ajoute la première (et brute) version des outputs pour déboguer
07071b2
@lukas-puschnig @benoit-cty
Ajoute des paramètres, adapte les outputs
35bba1c
@lukas-puschnig @benoit-cty
Add quick start guide
7339c92
@benoit-cty
Set dep openFisca-france >= 103.0.0
51a3dca
@benoit-cty
Put back CI path
c4aa895
@benoit-cty
openFisca-france >= 113.0.0
e232a3a
@benoit-cty
Fix survey-manager update
eb86483
@benoit-cty
Fix Log folder
8ec9bdc
@benoit-cty
retrait de use_modified
ef1af1d
@benoit-cty
Upgrade click for black
c276ddc
@benoit-cty
cp csv
e2b0c9d
@benoit-cty
Add log
6556f83
@benoit-cty
Fix CI
c933586 
Test CI

Change output file name

Fix parameter

Cast year

Add survey_name parameter

Remet export CSV et HTML

Toutes les années

Ajout suffix aux fichiers de sortie

Moins d'années

WIP: CI

Better logs

All years
@benoit-cty
Add survey_name in log
11542fa
@benoit-cty
Copy link
Contributor Author

Voir aussi : https://git.leximpact.dev/benjello/openfisca-france-data/-/merge_requests/9

@benoit-cty benoit-cty requested a review from benjello January 17, 2023 16:24
@benoit-cty
Copy link
Contributor Author

J'ai dû forcer la version maximum d'OpenFisca-France à 120 à cause de openfisca/openfisca-france#1996 pour que les tests passent.

@benoit-cty
WIP: test CI
0814440 
WIP :debug CI

WIP

Missing comma

Add ignore

wip: force buildcollectin

wip : put back years

cleaning

All years
@benoit-cty
Fix CI
39dfc5a
benjello
benjello approved these changes Jan 23, 2023
View reviewed changes
Copy link
Member

@benjello benjello left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Je n'ai rien à redire sur cette PR.
Il vaudrait cependant aussi mieux que l'équipe taxipp y jette un oeil.

@benjello benjello requested a review from a team January 23, 2023 19:56
@benjello
Copy link
Member

@openfisca/france-contrib-ipp est-ce ok pour vous ?

@lukas-puschnig
Copy link
Contributor

très bien pour moi, merci @benoit-cty et @benjello ! :)

@benoit-cty benoit-cty merged commit 5b6d7b9 into master Jan 24, 2023
@benoit-cty benoit-cty deleted the update_to_of_113 branch January 24, 2023 12:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lukas-puschnig lukas-puschnig lukas-puschnig approved these changes

@benjello benjello benjello approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@benoit-cty @benjello @lukas-puschnig