-
Notifications
You must be signed in to change notification settings - Fork 201
Replace employment_income with irs_employment_income in earned_income
#4066
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
Open
SirMalamute
wants to merge
13
commits into
PolicyEngine:main
Choose a base branch
from
SirMalamute:SirMalamute/issue4007
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
302c762
Replace `employment_income` with `irs_employment_income` in `earned_i…
SirMalamute b6a4d9d
replaced
SirMalamute a0e0c4e
fixed tests
SirMalamute 9c24917
Merge branch 'master' of https://github.com/PolicyEngine/policyengine…
SirMalamute 01ec40d
added changelog
SirMalamute 4b79ec1
removed md tanf
SirMalamute 9b561ca
Update changelog_entry.yaml
PavelMakarchuk 29bdbf0
Merge branch 'master' of https://github.com/PolicyEngine/policyengine…
SirMalamute ace26b8
Replace `employment_income` with `irs_employment_income` in `earned_i…
SirMalamute 2c93b26
Merge branch 'SirMalamute/issue4007' of https://github.com/SirMalamut…
SirMalamute 681a68c
commit
SirMalamute f208521
Merge branch 'master' of https://github.com/PolicyEngine/policyengine…
PavelMakarchuk 6ff7423
some initial changes
PavelMakarchuk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| - bump: minor | ||
| changes: | ||
| changed: | ||
| - Replaced employment_income with irs_employment_income in earned_income. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...come/taxable_income/adjusted_gross_income/irs_gross_income/earned_income/earned_income.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| from policyengine_us.model_api import * | ||
|
|
||
|
|
||
| class earned_income(Variable): | ||
| class irs_earned_income(Variable): | ||
| value_type = float | ||
| entity = Person | ||
| label = "Earned income" | ||
| unit = USD | ||
| documentation = "Income from wages or self-employment" | ||
| definition_period = YEAR | ||
|
|
||
| adds = ["employment_income", "self_employment_income"] | ||
| adds = ["irs_employment_income", "self_employment_income"] |
4 changes: 2 additions & 2 deletions
4
...ble_income/adjusted_gross_income/irs_gross_income/earned_income/tax_unit_earned_income.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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") |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Which issue do we address if we are changing the Maryland TANF files?