Skip to content

Commit

Permalink
Merge pull request #62 from rickecon/pe500b
Browse files Browse the repository at this point in the history 
Merging
  • Loading branch information
@rickecon
rickecon authored Oct 13, 2023
2 parents c908062 + 2cec486 commit 4a96442
Show file tree
Hide file tree
Showing 1,782 changed files with 49,920 additions and 9,490 deletions.
4 changes: 4 additions & 0 deletions .coveragerc
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
[run]
disable_warnings = couldnt-parse

[report]
# Include only variables related to taxes and benefits:
include = */variables/*
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,6 @@ docs/book/_build
# GitHub Codespaces.
venv/**
oryx-build-commands.txt

**/*.csv.gz
**/*.pkl
47 changes: 27 additions & 20 deletions CHANGELOG.md
View file
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.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
Expand Down Expand Up @@ -158,23 +164,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- First prototype version based off of openfisca-us and tax-calculator.


[0.2.1]: https://github.com/TheCGO/fiscalsim-us/compare/0.2.0...0.2.1
[0.2.0]: https://github.com/TheCGO/fiscalsim-us/compare/0.1.5...0.2.0
[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
[0.0.12]: https://github.com/TheCGO/fiscalsim-us/compare/0.0.11...0.0.12
[0.0.11]: https://github.com/TheCGO/fiscalsim-us/compare/0.0.10...0.0.11
[0.0.10]: https://github.com/TheCGO/fiscalsim-us/compare/0.0.9...0.0.10
[0.0.9]: https://github.com/TheCGO/fiscalsim-us/compare/0.0.8...0.0.9
[0.0.8]: https://github.com/TheCGO/fiscalsim-us/compare/0.0.7...0.0.8
[0.0.7]: https://github.com/TheCGO/fiscalsim-us/compare/0.0.6...0.0.7
[0.0.6]: https://github.com/TheCGO/fiscalsim-us/compare/0.0.5...0.0.6
[0.0.5]: https://github.com/TheCGO/fiscalsim-us/compare/0.0.4...0.0.5
[0.0.4]: https://github.com/TheCGO/fiscalsim-us/compare/0.0.3...0.0.4
[0.0.3]: https://github.com/TheCGO/fiscalsim-us/compare/0.0.2...0.0.3
[0.0.2]: https://github.com/TheCGO/fiscalsim-us/compare/0.0.1...0.0.2
[0.0.1]: https://github.com/TheCGO/fiscalsim-us/compare/0.0.0...0.0.1
[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
[0.1.5]: https://github.com/TheCGO/fiscalsim-us/compare/v0.1.4...v0.1.5
[0.1.4]: https://github.com/TheCGO/fiscalsim-us/compare/v0.1.3...v0.1.4
[0.1.3]: https://github.com/TheCGO/fiscalsim-us/compare/v0.1.2...v0.1.3
[0.1.2]: https://github.com/TheCGO/fiscalsim-us/compare/v0.1.1...v0.1.2
[0.1.1]: https://github.com/TheCGO/fiscalsim-us/compare/v0.1.0...v0.1.1
[0.1.0]: https://github.com/TheCGO/fiscalsim-us/compare/v0.0.12...v0.1.0
[0.0.12]: https://github.com/TheCGO/fiscalsim-us/compare/v0.0.11...v0.0.12
[0.0.11]: https://github.com/TheCGO/fiscalsim-us/compare/v0.0.10...v0.0.11
[0.0.10]: https://github.com/TheCGO/fiscalsim-us/compare/v0.0.9...v0.0.10
[0.0.9]: https://github.com/TheCGO/fiscalsim-us/compare/v0.0.8...v0.0.9
[0.0.8]: https://github.com/TheCGO/fiscalsim-us/compare/v0.0.7...v0.0.8
[0.0.7]: https://github.com/TheCGO/fiscalsim-us/compare/v0.0.6...v0.0.7
[0.0.6]: https://github.com/TheCGO/fiscalsim-us/compare/v0.0.5...v0.0.6
[0.0.5]: https://github.com/TheCGO/fiscalsim-us/compare/v0.0.4...v0.0.5
[0.0.4]: https://github.com/TheCGO/fiscalsim-us/compare/v0.0.3...v0.0.4
[0.0.3]: https://github.com/TheCGO/fiscalsim-us/compare/v0.0.2...v0.0.3
[0.0.2]: https://github.com/TheCGO/fiscalsim-us/compare/v0.0.1...v0.0.2
[0.0.1]: https://github.com/TheCGO/fiscalsim-us/compare/v0.0.0...v0.0.1
5 changes: 5 additions & 0 deletions changelog.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,8 @@
added:
- Updates two files `la_nonrefundable_childcare.py` and `in_unemployment_compensation_deduction.py` that need a `min()` reference updated to `min_()`
date: 2023-10-09 02:00:00
- bump: patch
changes:
added:
- Updates files from PolicyEngine-US v0.500.0 (e4a95733baafca0a7bec9ae79e96797416a4d237)
date: 2023-10-13 03:30:00
36 changes: 25 additions & 11 deletions fiscalsim_us/data/datasets/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -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,
]
24 changes: 14 additions & 10 deletions fiscalsim_us/data/datasets/cps/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -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,
)
1 change: 0 additions & 1 deletion fiscalsim_us/data/datasets/cps/calibrated_cps/__init__.py
View file

This file was deleted.

77 changes: 0 additions & 77 deletions fiscalsim_us/data/datasets/cps/calibrated_cps/calibrated_cps.py
View file

This file was deleted.

108 changes: 0 additions & 108 deletions ...lsim_us/data/datasets/cps/calibrated_cps/calibration_parameters/populations/by_state.yaml
View file

This file was deleted.

26 changes: 0 additions & 26 deletions fiscalsim_us/data/datasets/cps/calibrated_cps/calibration_parameters/populations/total.yaml
View file

This file was deleted.

12 changes: 0 additions & 12 deletions ...ta/datasets/cps/calibrated_cps/calibration_parameters/programs/snap/budgetary_impact.yaml
View file

This file was deleted.

12 changes: 0 additions & 12 deletions ...im_us/data/datasets/cps/calibrated_cps/calibration_parameters/programs/snap/caseload.yaml
View file

This file was deleted.

1 change: 0 additions & 1 deletion fiscalsim_us/data/datasets/cps/calibrated_cps/loss/__init__.py
View file

This file was deleted.

Loading

0 comments on commit 4a96442

Please sign in to comment.