Skip to content
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

Updates to OG-USA integration #3

Merged
merged 16 commits into from
Mar 25, 2021

Conversation

jdebacker
Copy link

@andersonfrailey I made some modification to your branch that brings OG-USA into the model.

I've written some tests and confirmed with local runs that things are working as expected.

Left out:

  1. Adding OG-USA to the environment.yml file. There is not OG-USA conda package at the moment and installing from GitHub requires downloading the bloated test files. I'm going to try to create a new OG-USA package on conda forge soon. If that works, I'll add that as a dependency here.
  2. Using OG-USA to update macros beyond wages.
  3. Doing an iterated process (Tax-Calc->OG-USA->Tax-Calc->OG-USA->Tax-Calc) to ensure more consistency with macro model forecasts and the macro forecast underlying the micro data.
  4. Enabling an OG-USA specifications dictionary to be passed from the Tax-Brain entry point.

I think the above are best left to future PRs, but trust your judgement if you feel otherwise.

@andersonfrailey
Copy link
Owner

Thanks for working on this, @jdebacker! I agree that everything you left out can be saved for future PRs. What do you think is the best way to move forward? Should we get tests passing here and merge before the PR #56 on the main branch or merge # 56 before this one?

@jdebacker
Copy link
Author

@andersonfrailey Try syncing this branch with upstream/master. I feel like the CI tests ought to be passing here.

@jdebacker
Copy link
Author

The test failures suggest that the multiprocessing package is not in the environment. But this PR adds it to the environment.yml file...

@jdebacker
Copy link
Author

Should we get tests passing here and merge before the PR PSLmodels#56 on the main branch or merge # 56 before this one?

If we can, let's get tests passing here and then merge this PR, which update your branch and thus will be reflected in PR PSLmodels#56. We can then merge that PR to upstream/master.

@andersonfrailey
Copy link
Owner

Sounds like a plan, @jdebacker

@jdebacker
Copy link
Author

@andersonfrailey -- can you try to re-run the jobs on this PR? The failures looks like a failure to setup, which is often resolved by just re-running. Thanks!

@jdebacker
Copy link
Author

@andersonfrailey -- actually, just merge this PR into your branch. These CI tests will not pass on your branch as they GH action seems to only install miniconda properly on pushes to the upstream repo (I just noticed this over in the CCC repo, where the action failed on fork, but passed on the upstream). Not sure why this is.

@andersonfrailey andersonfrailey merged commit 03626ff into andersonfrailey:ogusascripts Mar 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants