PSLmodels / OG-Core

An overlapping generations model framework for evaluating fiscal policies.
https://pslmodels.github.io/OG-Core/
Creative Commons Zero v1.0 Universal
65 stars 111 forks source link

Remove unused args and refs to Tax-Calculator #927

Closed jdebacker closed 4 months ago

jdebacker commented 4 months ago

This PR removes some unused arguments in functions in the txfunc.py module. It also removes reference to Tax-Calculator since this module is agnostic to the microsimulation model used to generate average and marginal tax rates.

jdebacker commented 4 months ago

Local testing found the following failures, but I think they are expected on a different platform than the cashed results where estimated on:

FAILED tests/test_txfunc.py::test_txfunc_est[DEP] - assert False
FAILED tests/test_txfunc.py::test_txfunc_est[GS] - assert False
FAILED tests/test_txfunc.py::test_tax_func_loop - assert False
FAILED tests/test_txfunc.py::test_tax_func_estimate - assert False
codecov-commenter commented 4 months ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 73.44%. Comparing base (8f1d770) to head (420b815).

Additional details and impacted files [![Impacted file tree graph](https://app.codecov.io/gh/PSLmodels/OG-Core/pull/927/graphs/tree.svg?width=650&height=150&src=pr&token=98mQCVhspd&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels)](https://app.codecov.io/gh/PSLmodels/OG-Core/pull/927?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels) ```diff @@ Coverage Diff @@ ## master #927 +/- ## ======================================= Coverage 73.44% 73.44% ======================================= Files 19 19 Lines 4643 4643 ======================================= Hits 3410 3410 Misses 1233 1233 ``` | [Flag](https://app.codecov.io/gh/PSLmodels/OG-Core/pull/927/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels) | Coverage Δ | | |---|---|---| | [unittests](https://app.codecov.io/gh/PSLmodels/OG-Core/pull/927/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels) | `73.44% <ø> (ø)` | | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels#carryforward-flags-in-the-pull-request-comment) to find out more. | [Files](https://app.codecov.io/gh/PSLmodels/OG-Core/pull/927?dropdown=coverage&src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels) | Coverage Δ | | |---|---|---| | [ogcore/txfunc.py](https://app.codecov.io/gh/PSLmodels/OG-Core/pull/927?src=pr&el=tree&filepath=ogcore%2Ftxfunc.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels#diff-b2djb3JlL3R4ZnVuYy5weQ==) | `29.52% <ø> (ø)` | |
rickecon commented 4 months ago

@jdebacker. I had three test_txfunc.py tests fail on my machine locally on TJ's PR #925. And I just got the same three failures when I ran the tests on this branch. So this is just something we need to fix in the txfunc.py module.

FAILED tests/test_txfunc.py::test_txfunc_est[DEP] - assert False
FAILED tests/test_txfunc.py::test_tax_func_loop - assert False
FAILED tests/test_txfunc.py::test_tax_func_estimate - assert False
rickecon commented 4 months ago

@jdebacker. Looks great. Merging.