merge in files from main branch

.coveragerc

@@ -1,2 +1,6 @@
 [run]
 disable_warnings = couldnt-parse
+
+[report]
+# Include only variables related to taxes and benefits:
+include = */variables/*

.github/workflows/build_and_test.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.10"]
+        python-version: ["3.10", "3.11"]
 
     steps:
       - name: Checkout

.gitignore

@@ -48,3 +48,6 @@ docs/book/_build
 # GitHub Codespaces.
 venv/**
 oryx-build-commands.txt
+
+**/*.csv.gz
+**/*.pkl

CHANGELOG.md

@@ -5,12 +5,33 @@ 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.2.2] - 2023-10-11 12:00:00
+## [0.2.5] - 2023-10-24 20:00:00
 
 ### Added
 
+- Updated environment.yml and build_and_test.yml to allow for python 3.11
 - Updated Virginia tax logic with correct mapping from federal filing status to state filing status.
 
+## [0.2.4] - 2023-10-24 10:00:00
+
+### Added
+
+- Fixed circularity in CO tax logic
+- Fixed circularity in MO tax logic
+
+## [0.2.3] - 2023-10-13 16:00:00
+
+### Added
+
+- added three files `prior_year_state_income_tax_paid.py`, `prior_year_local_income_tax_paid.py`, and `sales_or_prior_year_state_and_local_income_tax.py`
+- adjusted `salt_deduction.py` to calculate based on the added variables above
+
+## [0.2.2] - 2023-10-13 03:30:00
+
+### Added
+
+- Updates files from PolicyEngine-US v0.500.0 (e4a95733baafca0a7bec9ae79e96797416a4d237)
+
 ## [0.2.1] - 2023-10-09 02:00:00
 
 ### Added
@@ -165,6 +186,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+[0.2.5]: https://github.com/TheCGO/fiscalsim-us/compare/v0.2.4...v0.2.5
+[0.2.4]: https://github.com/TheCGO/fiscalsim-us/compare/v0.2.3...v0.2.4
+[0.2.3]: https://github.com/TheCGO/fiscalsim-us/compare/v0.2.2...v0.2.3
 [0.2.2]: https://github.com/TheCGO/fiscalsim-us/compare/v0.2.1...v0.2.2
 [0.2.1]: https://github.com/TheCGO/fiscalsim-us/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/TheCGO/fiscalsim-us/compare/v0.1.5...v0.2.0

changelog.yaml

@@ -149,5 +149,23 @@
 - bump: patch
   changes:
     added:
+      - Updates files from PolicyEngine-US v0.500.0 (e4a95733baafca0a7bec9ae79e96797416a4d237)
+  date: 2023-10-13 03:30:00
+- bump: patch
+  changes:
+    added:
+      - adjusted `salt_deduction.py` to calculate based on the added variables
+      - Adds three files `prior_year_state_income_tax_paid.py`, `prior_year_local_income_tax_paid.py`, and `sales_or_prior_year_state_and_local_income_tax.py`
+  date: 2023-10-13 16:00:00
+- bump: patch
+  changes:
+    added:
+      - Fixed circularity in CO tax logic
+      - Fixed circularity in MO tax logic
+  date: 2023-10-24 10:00:00
+- bump: patch
+  changes:
+    added:
+      - Updated environment.yml and build_and_test.yml to allow for python 3.11
       - Updated Virginia tax logic with correct mapping from federal filing status to state filing status.
-  date: 2023-10-11 12:00:00
+  date: 2023-10-24 20:00:00

environment.yml

@@ -1,4 +1,4 @@
 name: fiscalsim-us-dev
 dependencies:
-  - python=3.10
+  - python>=3.10,<3.12
   - pip

fiscalsim_us/data/datasets/__init__.py

@@ -1,11 +1,25 @@
-from .cps import (
-    CPS_2020,
-    CPS_2021,
-    CPS_2022,
-    CPS_2023,
-    RawCPS_2020,
-    RawCPS_2021,
-    CalibratedCPS_2023,
-)
-
-DATASETS = [CPS_2020, CPS_2021, CPS_2022, CPS_2023, CalibratedCPS_2023]
+from .cps import (
+    CPS_2020,
+    CPS_2021,
+    CPS_2022,
+    CPS_2023,
+    RawCPS_2020,
+    RawCPS_2021,
+    RawCPS_2022,
+    EnhancedCPS_2023,
+    PUFExtendedCPS_2023,
+    CalibratedCPS_2023,
+)
+
+from .poverty_tracker.poverty_tracker import PovertyTracker
+
+DATASETS = [
+    CPS_2020,
+    CPS_2021,
+    CPS_2022,
+    CPS_2023,
+    EnhancedCPS_2023,
+    PUFExtendedCPS_2023,
+    CalibratedCPS_2023,
+    PovertyTracker,
+]

fiscalsim_us/data/datasets/cps/__init__.py

@@ -1,10 +1,14 @@
-from .cps import (
-    CPS_2020,
-    CPS_2021,
-    CPS_2022,
-    CPS_2023,
-)
-
-from .raw_cps import RawCPS_2020, RawCPS_2021
-
-from .calibrated_cps import CalibratedCPS_2023
+from .cps import (
+    CPS_2020,
+    CPS_2021,
+    CPS_2022,
+    CPS_2023,
+)
+
+from .raw_cps import RawCPS_2020, RawCPS_2021, RawCPS_2022
+
+from .enhanced_cps import (
+    EnhancedCPS_2023,
+    PUFExtendedCPS_2023,
+    CalibratedCPS_2023,
+)