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.

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

Updates for C/S with Tax-Calc 3.0.0 #637

Merged
merged 11 commits into from
Sep 3, 2020

Conversation

jdebacker
Copy link
Member

This PR updates the cs-config files to work with the Tax-Calculator 3.0.0 and its use of ParamTools.

@codecov-commenter
Copy link

codecov-commenter commented Sep 2, 2020

Codecov Report

Merging #637 into master will increase coverage by 0.24%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #637      +/-   ##
==========================================
+ Coverage   84.06%   84.30%   +0.24%     
==========================================
  Files          47       47              
  Lines        6852     6959     +107     
==========================================
+ Hits         5760     5867     +107     
  Misses       1092     1092              
Impacted Files Coverage Δ
ogusa/tests/test_get_micro_data.py 81.25% <ø> (+1.25%) ⬆️
ogusa/tests/test_tax.py 100.00% <0.00%> (ø)
ogusa/tests/test_firm.py 100.00% <0.00%> (ø)
ogusa/tests/test_utils.py 100.00% <0.00%> (ø)
ogusa/tests/test_fiscal.py 100.00% <0.00%> (ø)
ogusa/tests/test_income.py 100.00% <0.00%> (ø)
ogusa/tests/test_household.py 100.00% <0.00%> (ø)
ogusa/tests/test_aggregates.py 100.00% <0.00%> (ø)
ogusa/tests/test_output_plots.py 100.00% <0.00%> (ø)
ogusa/tests/test_parameter_plots.py 100.00% <0.00%> (ø)
... and 13 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2ad7dce...e5c25c9. Read the comment docs.

@rickecon
Copy link
Member

rickecon commented Sep 2, 2020

@hdoupe made the following comments in merged PR #631 that was on a different issue.

Hey @MaxGhenis and @jdebacker, @Peter-Metz and have started going through the process of updating some of the cs-config code for Tax-Cruncher here: PSLmodels/Tax-Cruncher#38.

Tax-Cruncher doesn't have the CPS/PUF distinction so it's a little more straightforward. I'm planning to do the update to account for some parameters only being compatible with one of the files tomorrow or Wednesday.

@jdebacker
Copy link
Member Author

@rickecon Yes, his updates as of about 10pm last night are included here. He made a few more changes today that I'll try to incorporate, but all tests are passing for cs_config currently.

@jdebacker
Copy link
Member Author

@rickecon I've successfully run the full testing suite with the changes in this branch. It's ready for your review.

@hdoupe
Copy link
Contributor

hdoupe commented Sep 3, 2020

Sorry @jdebacker you need the function too. You're best bet is to just copy the file over in case I missed something else: https://github.com/PSLmodels/Tax-Cruncher/blob/master/cs-config/cs_config/inputs.py

Definitely looking forward to having a better set up for distributing these functions.

@rickecon
Copy link
Member

rickecon commented Sep 3, 2020

@jdebacker. @hdoupe's last comment was:

Sorry @jdebacker you need the function too. You're best bet is to just copy the file over in case I missed something else: https://github.com/PSLmodels/Tax-Cruncher/blob/master/cs-config/cs_config/inputs.py

Definitely looking forward to having a better set up for distributing these functions.

It looks like this comment is satisfied/resolved by what we currently have in this PR in OG-USA/cs-config/cs_config/inputs.py. If that is correct, then this PR is ready to merge.

@jdebacker
Copy link
Member Author

Ok, latest commit updates inputs.py to match that used in Tax-Cruncher.

Note that OG-USA only uses one function from inputs.py, convert_behavior_adjustment(), so all tests pass before the last two commits and continue to pass after.

@hdoupe
Copy link
Contributor

hdoupe commented Sep 3, 2020

Thanks for updating @jdebacker and review @rickecon . LGTM

@rickecon rickecon merged commit d1c06bf into PSLmodels:master Sep 3, 2020
@jdebacker jdebacker deleted the param_cs_updates branch August 15, 2021 17:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants