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

Develop combine #659

Merged
merged 135 commits into from
Jan 18, 2021
Merged

Develop combine #659

merged 135 commits into from
Jan 18, 2021

Conversation

shimwell
Copy link
Collaborator

@shimwell shimwell commented Jan 6, 2021

Proposed changes

This brings in recent changes that have been combined

3d mesh tallies
automatic movement of the trelis script for neutronics simulations
type hinting on lots of classes and functions

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Code refactoring
  • Documentation Update (if none of the other choices apply)
  • New tests

Checklist

  • Pep8 applied
  • Unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

shimwell and others added 30 commits December 20, 2020 22:52
@shimwell
Copy link
Collaborator Author

I think that is about as many tests that can be added without testing the importErrors

@shimwell
Copy link
Collaborator Author

John has a few more tests in progress #680 which could help raise the coverage a bit more

@RemDelaporteMathurin
Copy link

John has a few more tests in progress #680 which could help raise the coverage a bit more

Super! I think the coverage is fine tbh. This can surely be merged in if needed. The question was more on "should we have these try/except imports or not" but this can be answered later :-)

@shimwell
Copy link
Collaborator Author

@billingsley-john that last commit replaced nested tests with discrete unit tests for the test_NeutronicModel

@shimwell
Copy link
Collaborator Author

Thanks for the tests refactoring John, I think this is ready to merge. I will have a go at the import testing at some point and see if it can be done in a simple manner

@shimwell
Copy link
Collaborator Author

I just added a few more suggestions for the pullrequest.com review. Making steady progress getting through them 👍

@shimwell
Copy link
Collaborator Author

The pullrequest.com suggestions included changing a few ValueErrors to TypeErrors. I forgot to follow this up in the tests so that is why the tests failed. I think they are all fixed now :-)

@RemDelaporteMathurin
Copy link

@shimwell any idea why the GA CI fails ?

@shimwell
Copy link
Collaborator Author

@shimwell any idea why the GA CI fails ?

I think it was due to a small change in the OpenMC DAGMC interface that is fixed now openmc-dev/openmc#1747

I am now rerunning the CI

@shimwell
Copy link
Collaborator Author

Tests are passing on both github actions and circle ci. Happy to merge this one in.

@shimwell shimwell merged commit 5e2e671 into develop Jan 18, 2021
@shimwell shimwell deleted the develop_combine branch February 10, 2021 12:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Some assertions not being tested correctly in some unit tests
3 participants