Skip to content

Commit

Permalink
Merge pull request #1 from rickecon/austinperryfrancis-va_fix
Browse files Browse the repository at this point in the history
Update formatting and version in Austin's PR branch
  • Loading branch information
austinperryfrancis authored Sep 22, 2023
2 parents 955d37f + c4e505a commit 42c354d
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 10 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.1.6] - 2023-09-22 12:00:00

### Added

- Updated Virginia tax logic with correct mapping from federal filing status to state filing status.

## [0.1.5] - 2023-09-20 17:00:00

### Added
Expand Down Expand Up @@ -145,6 +151,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0



[0.1.6]: https://github.com/TheCGO/fiscalsim-us/compare/0.1.5...0.1.6
[0.1.5]: https://github.com/TheCGO/fiscalsim-us/compare/0.1.4...0.1.5
[0.1.4]: https://github.com/TheCGO/fiscalsim-us/compare/0.1.3...0.1.4
[0.1.3]: https://github.com/TheCGO/fiscalsim-us/compare/0.1.2...0.1.3
[0.1.2]: https://github.com/TheCGO/fiscalsim-us/compare/0.1.1...0.1.2
[0.1.1]: https://github.com/TheCGO/fiscalsim-us/compare/0.1.0...0.1.1
[0.1.0]: https://github.com/TheCGO/fiscalsim-us/compare/0.0.12...0.1.0
Expand Down
5 changes: 5 additions & 0 deletions changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,8 @@
added:
- Updated `README.md` and its badges.
date: 2023-09-20 17:00:00
- bump: patch
changes:
added:
- Updated Virginia tax logic with correct mapping from federal filing status to state filing status.
date: 2023-09-22 12:00:00
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def formula(tax_unit, period, parameters):
# line_11 = tax_unit("va_standard_deduction",period)

filing_status = tax_unit("filing_status", period)

# for single, head of household, widow filing status
if filing_status == 0 or filing_status == 2 or filing_status == 4:
va_standard_deduction = parameters(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@ def formula(tax_unit, period, parameters):

subtotal = line3 - line8

if filing_status == 0 or filing_status == 2 or filing_status == 4 or filing_status == 2:
if (
filing_status == 0
or filing_status == 2
or filing_status == 4
or filing_status == 2
):
if subtotal < single:
tax_owed = 0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,12 @@ def formula(tax_unit, period, parameters):
if line11 < line12:
line14 = line12 - line11

if filing_status == 0 or filing_status == 2 or filing_status == 4 or filing_status == 1:
if (
filing_status == 0
or filing_status == 2
or filing_status == 4
or filing_status == 1
):
return line14

if filing_status == 3 and age_of_spouse >= 65:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,12 @@ def formula(tax_unit, period, parameters):
net_tax = tax_unit("va_income_tax_before_refundable_credits", period)

if filing_status == 3:

spouse_if_filing_jointly = 0

elif filing_status == 1:

spouse_if_filing_jointly = 1

else:
elif filing_status == 1:
spouse_if_filing_jointly = 1

else:
spouse_if_filing_jointly = 0

spouse_agi = tax_unit("spouse_separate_adjusted_gross_income", period)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

setup(
name="fiscalsim-us",
version="0.1.5",
version="0.1.6",
author="Center for Growth and Opportunity at Utah State University (CGO)",
author_email="fiscalsim@thecgo.org",
long_description=readme,
Expand Down

0 comments on commit 42c354d

Please sign in to comment.