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

merge #49

Merged
merged 63 commits into from
Jul 29, 2024
Merged

merge #49

merged 63 commits into from
Jul 29, 2024

Commits on Jun 17, 2024

  1. remove files in the taxsim27 directory

    @jdebacker
    jdebacker committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    2eba47f View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. update readme to ref taxsim 35

    @jdebacker
    jdebacker committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    f841d94 View commit details
    Browse the repository at this point in the history

  2. update taxsim35 valid description

    @jdebacker
    jdebacker committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    2aab1e4 View commit details
    Browse the repository at this point in the history

  3. update bash file for 35 tests

    @jdebacker
    jdebacker committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    9668b6c View commit details
    Browse the repository at this point in the history

  4. use shutils to remote tree

    @jdebacker
    jdebacker committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    3e6c650 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. remove unused files

    @jdebacker
    jdebacker committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    5968cc3 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2024

  1. Update to new tmd weights

    @martinholmer
    martinholmer committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    38be0ec View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. fix ctc description

    @jdebacker
    jdebacker committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    2c943aa View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Merge pull request #2762 from jdebacker/remove_taxsim27 

    Remove TAXSIM-27 validation tools
    @jdebacker
    jdebacker authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    39c1ee2 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. Update taxcalc/tmd_weights.csv.gz file.

    @martinholmer
    martinholmer committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    64c29c6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2764 from martinholmer/new-tmd-files 

    Update tmd_weights.csv.gz file
    @martinholmer
    martinholmer authored Jul 4, 2024
    Configuration menu
    Copy the full SHA
    0c03933 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. Add ctc_total variable

    @martinholmer
    martinholmer committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    1c0bac2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2765 from martinholmer/add-ctc_total-variable 

    Add ctc_total variable
    @martinholmer
    martinholmer authored Jul 5, 2024
    Configuration menu
    Copy the full SHA
    30a9771 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2024

  1. Add ctc_refundable variable

    @martinholmer
    martinholmer committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    2886fa0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2766 from martinholmer/add-ctc_refundable-variable 

    Add ctc_refundable variable
    @martinholmer
    martinholmer authored Jul 6, 2024
    Configuration menu
    Copy the full SHA
    b9bfe1f View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2024

  1. Update taxcalc/tmd_weights.csv.gz file

    @martinholmer
    martinholmer committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    2dd8ea5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2767 from martinholmer/tmd-files 

    Update taxcalc/tmd_weights.csv.gz file
    @martinholmer
    martinholmer authored Jul 7, 2024
    Configuration menu
    Copy the full SHA
    bb2c566 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Correct 2018 EITC_ps* parameter values

    @martinholmer
    martinholmer committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    eeb02aa View commit details
    Browse the repository at this point in the history

  2. Update 2018 CPS and PUF aggregate test results

    @martinholmer
    martinholmer committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    6f9ef38 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2768 from martinholmer/fix-2018-eitc-params 

    Fix 2018 EITC phase-out-start parameters
    @martinholmer
    martinholmer authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    9a8cbfd View commit details
    Browse the repository at this point in the history

  4. Add exact calculation logic in CTC_new function

    @martinholmer
    martinholmer committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    3659464 View commit details
    Browse the repository at this point in the history

  5. Update tests to reflect new exact argument of the CTC_new function

    @martinholmer
    martinholmer committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    3779d50 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2769 from martinholmer/fix-arpa-ctc-phaseout 

    Add exact calculation logic to CTC_new function
    @martinholmer
    martinholmer authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    9b758a0 View commit details
    Browse the repository at this point in the history

  7. Fix 2021 0kids EITC_ps_MarriedJ parameter value

    @martinholmer
    martinholmer committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    fa33204 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #2770 from martinholmer/fix-2021-eitc-param 

    Fix 2021 0kids EITC_ps_MarriedJ parameter value
    @martinholmer
    martinholmer authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    9e8ec6e View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Update Tax-Calculator version in the docs/usage/tcja_after_2025.md file

    @martinholmer
    martinholmer committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    2e508fa View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Add mention of custom growfactors file in docs

    @martinholmer
    martinholmer committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    1679d48 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2771 from martinholmer/update-tcja-docs 

    Add custom growfactors discussion to the docs/usage/tcja_after_2025.md file
    @martinholmer
    martinholmer authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    1d24bb4 View commit details
    Browse the repository at this point in the history

  3. Newer tmd-related files after merge of TMD PR #131

    @martinholmer
    martinholmer committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    0066f6a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2772 from martinholmer/newer-tmd-files 

    Newer tmd-related files after merge of TMD PR #131
    @martinholmer
    martinholmer authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    781163a View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Tax-Calculator 4.1.0

    @martinholmer
    martinholmer committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    73d367f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2773 from martinholmer/4-1-0 

    Tax-Calculator 4.1.0
    @jdebacker
    jdebacker authored Jul 11, 2024
    Configuration menu
    Copy the full SHA
    3a73e46 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. Update to final phase3 tmd files

    @martinholmer
    martinholmer committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    6b21f95 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2774 from martinholmer/phase3-tmd-files 

    Update to final Phase3 tax-microdata-generated input files
    @martinholmer
    martinholmer authored Jul 21, 2024
    Configuration menu
    Copy the full SHA
    e608c3f View commit details
    Browse the repository at this point in the history

  3. Update to 4.2.0 version of Tax-Calculator

    @martinholmer
    martinholmer committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    b868c9b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2775 from martinholmer/4-2-0 

    Tax-Calculator 4.2.0
    @martinholmer
    martinholmer authored Jul 21, 2024
    Configuration menu
    Copy the full SHA
    1b696b4 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. add growfactors for current policy baseline

    @jdebacker
    jdebacker committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    c69bd14 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Merge pull request #2777 from jdebacker/ext_grow 

    Add growfactors file for a current policy baseline
    @jdebacker
    jdebacker authored Jul 23, 2024
    Configuration menu
    Copy the full SHA
    e9900f2 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Fix CDCC phase-out calculations

    @martinholmer
    martinholmer committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    d48cec2 View commit details
    Browse the repository at this point in the history

  2. Make RECID be first dump output variable

    @martinholmer
    martinholmer committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    294bdaf View commit details
    Browse the repository at this point in the history

  3. Fix test_output_options in test_taxcalcio.py module

    @martinholmer
    martinholmer committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    10b3ab2 View commit details
    Browse the repository at this point in the history

  4. Generalize putting RECID at beginning of dump output variable list

    @martinholmer
    martinholmer committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    7dcb14b View commit details
    Browse the repository at this point in the history

  5. Revert change in test_taxcalcio.py module

    @martinholmer
    martinholmer committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    4e167ba View commit details
    Browse the repository at this point in the history

  6. Revise test to include RECID in dump output variable list

    @martinholmer
    martinholmer committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    f272eee View commit details
    Browse the repository at this point in the history

  7. Merge pull request #2779 from martinholmer/fix-cdcc 

    Fix CDCC phase-out calculations
    @martinholmer
    martinholmer authored Jul 24, 2024
    Configuration menu
    Copy the full SHA
    1d21162 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. Change policy parameters and calculation logic

    @martinholmer
    martinholmer committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    9443ad5 View commit details
    Browse the repository at this point in the history

  2. Revise tests to pass with new CARES nonitemizer charity deduction logic

    @martinholmer
    martinholmer committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    3ff892e View commit details
    Browse the repository at this point in the history

  3. Rename charity deduction crt parameter

    @martinholmer
    martinholmer committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    6d2fdcd View commit details
    Browse the repository at this point in the history

  4. Use renamed charity parameter in reforms

    @martinholmer
    martinholmer committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    f255488 View commit details
    Browse the repository at this point in the history

  5. Use renamed charity parameter in extend_tcja.py script

    @martinholmer
    martinholmer committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    2cc9541 View commit details
    Browse the repository at this point in the history

  6. Minor updates to expected test results

    @martinholmer
    martinholmer committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    51f3cb9 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. Merge pull request #2781 from martinholmer/fix-cares-charity-deduction 

    Fix CARES charity deduction for nonitemizers
    @jdebacker
    jdebacker authored Jul 26, 2024
    Configuration menu
    Copy the full SHA
    b41af53 View commit details
    Browse the repository at this point in the history

  2. Fix 2020 PT_rt? values and update CPS and PUF expected test results

    @martinholmer
    martinholmer committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    a499d97 View commit details
    Browse the repository at this point in the history

  3. Correct mistaken specification in reforms/TCJA.json file

    @martinholmer
    martinholmer committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    e1ae42c View commit details
    Browse the repository at this point in the history

  4. Fix typo in records_variables.json description

    @martinholmer
    martinholmer committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    6f9d8f4 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2024

  1. Merge pull request #2783 from martinholmer/fix-2020-PT_rt-params 

    Fix four 2020 PT_rt? parameter values
    @jdebacker
    jdebacker authored Jul 27, 2024
    Configuration menu
    Copy the full SHA
    0b775e5 View commit details
    Browse the repository at this point in the history

  2. Correct AMT taxable income calculation to handle QBID correctly.

    @martinholmer
    martinholmer committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    a5a54de View commit details
    Browse the repository at this point in the history

  3. Update expected test results given fix to AMT calculations

    @martinholmer
    martinholmer committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    beefe6a View commit details
    Browse the repository at this point in the history

  4. Simplify QBID threshold gap parameter in policy_current_law.json

    @martinholmer
    martinholmer committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    57b5e18 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2024

  1. Incorrect change in QBI calculation

    @martinholmer
    martinholmer committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    b918948 View commit details
    Browse the repository at this point in the history

  2. Minor changes in expected test results given QBI fix

    @martinholmer
    martinholmer committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    5621d50 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2784 from martinholmer/fix-amt-wrt-qbid 

    Correct AMT taxable income calculation to handle QBID correctly
    @jdebacker
    jdebacker authored Jul 28, 2024
    Configuration menu
    Copy the full SHA
    d36d8db View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2785 from martinholmer/fix-qbi-calc 

    Fix qualified business income calculation
    @jdebacker
    jdebacker authored Jul 28, 2024
    Configuration menu
    Copy the full SHA
    fb0c3c0 View commit details
    Browse the repository at this point in the history