search

TheCGO / fiscalsim-us

FiscalSim US is a microsimulation model of the US federal and state tax and benefit system relating to households and individuals.
https://thecgo.github.io/fiscalsim-us/
GNU Affero General Public License v3.0
11 stars 12 forks source link

Merge PolicyEngine-US v0.220.0 changes into FiscalSim-US using automa… #27

Closed ss7886 closed 1 year ago

ss7886 commented 1 year ago

Update changes to PolicyEngine-US v0.220.0 (Commit: a5d23ada42c003fb63f7090188350f64a8affdc9)

rickecon commented 1 year ago

@ss7886. All tests are passing (minus the check version test that I will remove). I only see one commit. Didn't you have one before that?

rickecon commented 1 year ago

@ss7886. When I compare PolicyEngine-US v. 0.220.0 to v. 0.211.0, I get 135 files changed. What was left out?

rickecon commented 1 year ago

@ss7886. OK, I figured out that the CHANGELOG.md and changelog.yaml files are missing, which is OK. I need to update the changes to the setup.py file. And I need to figure out why the diff on GitHub is not showing the precise small number of places where the code changed.

ss7886 commented 1 year ago

@ss7886. OK, I figured out that the CHANGELOG.md and changelog.yaml files are missing, which is OK. I need to update the changes to the setup.py file. And I need to figure out why the diff on GitHub is not showing the precise small number of places where the code changed.

It looks like this is just an issue with line endings according to some of the StackOverflow threads I read. There probably is a way to fix this in the future, but for now you can see just the actual changes by clicking on the gear under the "Files changed" tab and clicking the "Hide whitespace" option.

rickecon commented 1 year ago

@ss7886. OK. It looks like I broke the tests, either with my changes to setup.py or with my changes to pr.yaml and push.yaml. I'll work on this and submit another PR. BTW, I might be able to fix the diff issue by running make format in the fiscalsim-us conda environment.

rickecon commented 1 year ago

@ss7886. Almost done with this PR. I have checked each file. I made four direct commits to your branch, rather than submitting a PR (so you will want to pull from your remote to sync up your local branch). With those commits, I added a new section to the "Different settings in FiscalSim US relative to PolicyEngine US" section of PR_notes.md in the fiscalsim-us-maintenance repo.

My only remaining task is to make sure we got all the modify, add, delete, and rename changes right.

rickecon commented 1 year ago

@ss7886. I am merging this. The Lint test is failing because a usage limit has been hit. But that limit will reset on Tuesday, March 7. Plus, this repository should be open source by then. Merging.