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

Solvation settings prep #695

Merged
merged 9 commits into from
Feb 6, 2024
Merged

Solvation settings prep #695

merged 9 commits into from
Feb 6, 2024

Conversation

IAlibay
Copy link
Member

@IAlibay IAlibay commented Jan 30, 2024

Half way point to #673

Developers certificate of origin

@pep8speaks
Copy link

pep8speaks commented Jan 30, 2024

Hello @IAlibay! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

Line 464:80: E501 line too long (109 > 79 characters)
Line 465:80: E501 line too long (84 > 79 characters)
Line 466:80: E501 line too long (90 > 79 characters)

Line 631:80: E501 line too long (90 > 79 characters)

Line 140:19: E203 whitespace before ':'
Line 141:21: E203 whitespace before ':'

Comment last updated at 2024-02-06 17:55:29 UTC

@@ -289,7 +289,7 @@ def _get_modeller(
solvent_component: Optional[SolventComponent],
smc_components: dict[SmallMoleculeComponent, OFFMolecule],
system_generator: SystemGenerator,
solvation_settings: SolvationSettings
solvation_settings: BaseSolvationSettings
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using BaseSolvation settings here because we can expect derivatives of this base class to have different solvation setttings that aren't OpenMMSolvationSettings

@richardjgowers richardjgowers self-assigned this Feb 6, 2024
# Conflicts:
#	openfe/protocols/openmm_afe/base.py
#	openfe/protocols/openmm_afe/equil_afe_settings.py
#	openfe/protocols/openmm_afe/equil_solvation_afe_method.py
#	openfe/protocols/openmm_md/plain_md_methods.py
#	openfe/protocols/openmm_md/plain_md_settings.py
#	openfe/protocols/openmm_rfe/equil_rfe_methods.py
#	openfe/protocols/openmm_rfe/equil_rfe_settings.py
#	openfe/protocols/openmm_utils/omm_settings.py
#	openfe/protocols/openmm_utils/system_creation.py
#	openfe/tests/data/openmm_afe/AHFEProtocol_json_results.gz
#	openfe/tests/data/openmm_md/MDProtocol_json_results.gz
#	openfe/tests/data/openmm_rfe/RHFEProtocol_json_results.gz
#	openfe/tests/protocols/test_openmm_afe_solvation_protocol.py
#	openfe/tests/protocols/test_openmm_equil_rfe_protocols.py
#	openfe/tests/protocols/test_rfe_tokenization.py
#	openfe/tests/protocols/test_solvation_afe_tokenization.py
Copy link

codecov bot commented Feb 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (2a948cc) 91.43% compared to head (1bd5e7c) 91.33%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #695      +/-   ##
==========================================
- Coverage   91.43%   91.33%   -0.11%     
==========================================
  Files         132      132              
  Lines        9333     9328       -5     
==========================================
- Hits         8534     8520      -14     
- Misses        799      808       +9     
Flag Coverage Δ
fast-tests 91.33% <100.00%> (-0.11%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@richardjgowers richardjgowers merged commit 0219070 into main Feb 6, 2024
8 of 9 checks passed
@richardjgowers richardjgowers deleted the solvation-prep branch February 6, 2024 20:01
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.

3 participants