-
Notifications
You must be signed in to change notification settings - Fork 0
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
Updates to OG-USA integration #3
Conversation
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? |
@andersonfrailey Try syncing this branch with upstream/master. I feel like the CI tests ought to be passing here. |
The test failures suggest that the |
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. |
Sounds like a plan, @jdebacker |
@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! |
@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 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:
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.I think the above are best left to future PRs, but trust your judgement if you feel otherwise.