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

4.0.0 merge #47

Merged
merged 45 commits into from
Jun 7, 2024
Merged

4.0.0 merge #47

merged 45 commits into from
Jun 7, 2024

Commits on Sep 30, 2021

  1. Divide CDCC_crt and CDCC_frt parameters by 100 to match other paramet… 

    …ers.
    @duncanhobbs
    duncanhobbs committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    29f91fc View commit details
    Browse the repository at this point in the history

  2. Update documentation for CDCC_crt and CDCC_frt to reflect division by… 

    … 100.
    @duncanhobbs
    duncanhobbs committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    25c5cfe View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2021

  1. Update test_reforms.py with adjusted parameter values.

    @duncanhobbs
    duncanhobbs committed Oct 5, 2021
    Configuration menu
    Copy the full SHA
    473ae2a View commit details
    Browse the repository at this point in the history

  2. Correct precision of CDCC_frt.

    @duncanhobbs
    duncanhobbs committed Oct 5, 2021
    Configuration menu
    Copy the full SHA
    fac5f21 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2021

  1. make CDCC_prt a rate

    @jdebacker
    jdebacker committed Oct 21, 2021
    Configuration menu
    Copy the full SHA
    7fbd861 View commit details
    Browse the repository at this point in the history

  2. update F2441 docstring

    @jdebacker
    jdebacker committed Oct 21, 2021
    Configuration menu
    Copy the full SHA
    b4b1749 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2021

  1. Merge pull request #1 from jdebacker/pr-2628 

    Update to CDCC_prt
    @duncanhobbs
    duncanhobbs authored Oct 22, 2021
    Configuration menu
    Copy the full SHA
    1cf3c04 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2021

  1. Merge pull request #2628 from duncanhobbs/divide-by-100 

    Divide CDCC parameters by 100
    @jdebacker
    jdebacker authored Oct 25, 2021
    Configuration menu
    Copy the full SHA
    cd37b7f View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2023

  1. update documentation of policy parameters

    Bodi Yang committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    3cf3a21 View commit details
    Browse the repository at this point in the history

  2. update functions

    Bodi Yang committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    73ee270 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2023

  1. update reform, tests files

    Bodi Yang committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    8c9de96 View commit details
    Browse the repository at this point in the history

  2. update parameter in policy law file

    Bodi Yang committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    d25902f View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2023

  1. update testing reform file

    Bodi Yang committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    0969fc8 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2023

  1. solve payroll testing problem

    Bodi Yang committed Jan 12, 2023
    Configuration menu
    Copy the full SHA
    8255631 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2023

  1. Merge branch 'v4_development' into its_merge_conflict_fix

    @jdebacker
    jdebacker authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    f323e85 View commit details
    Browse the repository at this point in the history

  2. change CDCC rate scale

    @jdebacker
    jdebacker committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    dc5f6b6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'v4_development' into pr-2670

    @jdebacker
    jdebacker authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    cdc449d View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2671 from jdebacker/pr-2670 

    Update CDCC rates in reform to be on new scale
    @jdebacker
    jdebacker authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    c37e14e View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2672 from PSLmodels/v4_development 

    Update fix conflict branch
    @jdebacker
    jdebacker authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    dce49ac View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2670 from PSLmodels/its_merge_conflict_fix 

    Update v4 branch with latest from master
    @jdebacker
    jdebacker authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    0444a60 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2023

  1. Merge pull request #2669 from bodiyang/employer-payroll 

    add Employer side payroll parameters
    @jdebacker
    jdebacker authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    c6420c1 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. Merge pull request #2680 from PSLmodels/master 

    Sync v4 branch with master
    @jdebacker
    jdebacker authored May 3, 2023
    Configuration menu
    Copy the full SHA
    01ebe83 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. Merge pull request #2693 from PSLmodels/master 

    Update v4 development branch with latest from master
    @jdebacker
    jdebacker authored Sep 28, 2023
    Configuration menu
    Copy the full SHA
    bc20f78 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. Merge pull request #34 from PSLmodels/v4_development 

    V4 development
    @bodiyang
    bodiyang authored Feb 27, 2024
    Configuration menu
    Copy the full SHA
    0495b94 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. Merge branch 'v4_development' into master_v4_conflicts

    @jdebacker
    jdebacker authored May 6, 2024
    Configuration menu
    Copy the full SHA
    829892d View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. Merge pull request #2742 from PSLmodels/master_v4_conflicts 

    Merge master into V4 development
    @jdebacker
    jdebacker authored May 8, 2024
    Configuration menu
    Copy the full SHA
    877145a View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. Merge pull request #2749 from PSLmodels/master 

    Sync `v4_development` branch to `master`
    @jdebacker
    jdebacker authored May 20, 2024
    Configuration menu
    Copy the full SHA
    9560083 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Merge pull request #43 from PSLmodels/v4_development 

    V4 development
    @bodiyang
    bodiyang authored May 28, 2024
    Configuration menu
    Copy the full SHA
    f313bfe View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. release doc

    Bodi Yang committed May 30, 2024
    Configuration menu
    Copy the full SHA
    ebf0cfa View commit details
    Browse the repository at this point in the history

  2. update version

    Bodi Yang committed May 30, 2024
    Configuration menu
    Copy the full SHA
    8ab58fc View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. change documentation

    Bodi Yang committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    ee589b9 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Merge pull request #45 from PSLmodels/master 

    merge
    @bodiyang
    bodiyang authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    802e20e View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.0.0-release' into v4_development

    @bodiyang
    bodiyang authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    dcdf068 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #46 from bodiyang/v4_development 

    V4 development
    @bodiyang
    bodiyang authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    2794aa4 View commit details
    Browse the repository at this point in the history

  4. Add test_tmdcsv.py pytest file

    @martinholmer
    martinholmer committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    50ae0c8 View commit details
    Browse the repository at this point in the history

  5. Add back no-cover pragma because test is requires_tmdcsv

    @martinholmer
    martinholmer committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    87861f8 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. releases.md

    Bodi Yang committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    96e9f16 View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.0.0-release' of github.com:bodiyang/Tax-Calculator in… 

    …to 4.0.0-release
    Bodi Yang committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    1a6b09c View commit details
    Browse the repository at this point in the history

  3. update release file

    Bodi Yang committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    cb7b95a View commit details
    Browse the repository at this point in the history

  4. Revise GrowFactor constructor to handle custom growfactors files.

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

  5. Merge in PR-2753 changes

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

  6. Add another test to test_growfactors.py

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

  7. Merge pull request #2757 from martinholmer/growfactors-ctor 

    Revise GrowFactors constructor to handle custom growfactors files
    @martinholmer
    martinholmer authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    d9b56c7 View commit details
    Browse the repository at this point in the history

  8. Merge in recent changes on master branch

    @martinholmer
    martinholmer committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    2504d6d View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Merge pull request #2756 from martinholmer/add-tmd-test 

    Add test_tmdcsv.py pytest file
    @martinholmer
    martinholmer authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    b75b24f View commit details
    Browse the repository at this point in the history