diff --git a/.coverage.baseline b/.coverage.baseline new file mode 100644 index 00000000000..a1ee0409073 Binary files /dev/null and b/.coverage.baseline differ diff --git a/changelog_entry.yaml b/changelog_entry.yaml index e69de29bb2d..2174197cc94 100644 --- a/changelog_entry.yaml +++ b/changelog_entry.yaml @@ -0,0 +1,4 @@ +- bump: minor + changes: + changed: + - Replaced employment_income with irs_employment_income in earned_income. \ No newline at end of file diff --git a/policyengine_us/variables/gov/irs/income/adjusted_earnings.py b/policyengine_us/variables/gov/irs/income/adjusted_earnings.py index 47b55af66c1..79cd43b877d 100644 --- a/policyengine_us/variables/gov/irs/income/adjusted_earnings.py +++ b/policyengine_us/variables/gov/irs/income/adjusted_earnings.py @@ -1,7 +1,7 @@ from policyengine_us.model_api import * -class adjusted_earnings(Variable): +class irs_adjusted_earnings(Variable): value_type = float entity = Person definition_period = YEAR @@ -15,4 +15,4 @@ def formula(person, period, parameters): * misc.employer_share * person("self_employment_tax", period) ) - return max_(0, person("earned_income", period) - adjustment) + return max_(0, person("irs_earned_income", period) - adjustment) diff --git a/policyengine_us/variables/gov/irs/income/taxable_income/adjusted_gross_income/irs_gross_income/earned_income/earned_income.py b/policyengine_us/variables/gov/irs/income/taxable_income/adjusted_gross_income/irs_gross_income/earned_income/earned_income.py index 73dd3522683..8c4d0ab63d5 100644 --- a/policyengine_us/variables/gov/irs/income/taxable_income/adjusted_gross_income/irs_gross_income/earned_income/earned_income.py +++ b/policyengine_us/variables/gov/irs/income/taxable_income/adjusted_gross_income/irs_gross_income/earned_income/earned_income.py @@ -1,7 +1,7 @@ from policyengine_us.model_api import * -class earned_income(Variable): +class irs_earned_income(Variable): value_type = float entity = Person label = "Earned income" @@ -9,4 +9,4 @@ class earned_income(Variable): documentation = "Income from wages or self-employment" definition_period = YEAR - adds = ["employment_income", "self_employment_income"] + adds = ["irs_employment_income", "self_employment_income"] diff --git a/policyengine_us/variables/gov/irs/income/taxable_income/adjusted_gross_income/irs_gross_income/earned_income/tax_unit_earned_income.py b/policyengine_us/variables/gov/irs/income/taxable_income/adjusted_gross_income/irs_gross_income/earned_income/tax_unit_earned_income.py index e4fc4d8bd5e..5217f8e2619 100644 --- a/policyengine_us/variables/gov/irs/income/taxable_income/adjusted_gross_income/irs_gross_income/earned_income/tax_unit_earned_income.py +++ b/policyengine_us/variables/gov/irs/income/taxable_income/adjusted_gross_income/irs_gross_income/earned_income/tax_unit_earned_income.py @@ -1,11 +1,11 @@ from policyengine_us.model_api import * -class tax_unit_earned_income(Variable): +class tax_unit_irs_earned_income(Variable): value_type = float entity = TaxUnit label = "Tax unit earned income" unit = USD definition_period = YEAR - formula = sum_among_non_dependents("earned_income") + formula = sum_among_non_dependents("irs_earned_income")