Skip to content

Conversation

@mattwthompson
Copy link
Collaborator

@mattwthompson mattwthompson commented Jul 12, 2023

  • Pin AmberTools
  • Skip non-small molecule force fields at test time
  • Always run tests, even if OpenEye is not licensed
  • Update supported Python versions

* Pin AmberTools
* Skip non-small molecule force fields at test time
* Always run tests, even if OpenEye is not licensed
@mattwthompson
Copy link
Collaborator Author

This inheritance is having some side effects - could it be updated to only pull from the base class?

class TestSMIRNOFFTemplateGenerator(TestGAFFTemplateGenerator):

Removing more of the unittest reliance might be nice, especially since the developers here spend a good bit of time digging through test failures.

@mattwthompson
Copy link
Collaborator Author

This PR gets everything working except DGL stuff - could somebody take this over?

@mattwthompson mattwthompson marked this pull request as ready for review July 13, 2023 13:45
@jchodera
Copy link
Member

Thanks so much, @mattwthompson !

@ijpulidos will take this over!

@codecov-commenter
Copy link

codecov-commenter commented Jul 17, 2023

Codecov Report

Patch coverage has no change and project coverage change: -7.88 ⚠️

Comparison is base (1b0dfe8) 77.08% compared to head (fb8073a) 69.21%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #290      +/-   ##
==========================================
- Coverage   77.08%   69.21%   -7.88%     
==========================================
  Files           5        5              
  Lines         851      851              
==========================================
- Hits          656      589      -67     
- Misses        195      262      +67     
Impacted Files Coverage Δ
...penmmforcefields/generators/template_generators.py 74.91% <0.00%> (-11.13%) ⬇️

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@ijpulidos
Copy link
Collaborator

I changed the tests such that we can test espaloma independently of the other forcefields. Tests seem to be passing now (still a few to go, but I already see green check marks). The coverage of course was reduced because now we are skipping the espaloma parts and I think it's working as expected as per https://app.codecov.io/gh/openmm/openmmforcefields/pull/290/blob/openmmforcefields/generators/template_generators.py , but would love somebody else to confirm this.

I marked the espaloma tests with pytest.mark.espaloma but for some reason they are not being run correctly in the Espaloma CI workflow (check https://github.com/openmm/openmmforcefields/actions/runs/5581424990/jobs/10199559997?pr=290#step:6:24) . I need to figure out what else is needed for these to get run in that workflow exclusively.

The good news is that we seem to have the CI back up and running succesfully again for all the non-espaloma ffs that we are testing.

@ijpulidos ijpulidos requested a review from mikemhenry July 17, 2023 23:37
@ijpulidos
Copy link
Collaborator

I see the tests are failing about the opc3 forcefields with the old openff-toolkit, I think this is expected. @mattwthompson do you have any insights on this? Should we even be testing 0.10.x versions of the toolkit?

@mattwthompson
Copy link
Collaborator Author

I would just drop the 0.10.x toolkit testing, support is completely going away soon and as far as I'm aware all projects have upgraded to at least 0.11.x at this point. If people need it with openmmforcefields, they can install an old version, and if they need a bugfix release they can advocate for it.

You can try to git cherry-pick ac9881e092b1bdecfe9167b5c3cf469281833387 and then clean up my mess, or just crib from #287 whatever you want.

@mikemhenry
Copy link
Collaborator

I think you need to add the path to the conftest.py file at the end of this command pytest -v --log-cli-level $LOGLEVEL $COV_ARGS --durations=20 \ -k "TestEspalomaTemplateGenerator" -m "espaloma"

@mikemhenry mikemhenry enabled auto-merge (squash) July 18, 2023 22:28
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.

6 participants