Skip to content

Commit

Permalink
Merge pull request #893 from OpenFreeEnergy/gaff-update
Browse files Browse the repository at this point in the history
Fix OpenMMForceFields gaff tests version checks
  • Loading branch information
IAlibay authored Jul 21, 2024
2 parents ecc8a50 + 72431cc commit 9de8fa6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- "3.11"
- "3.12"
openeye: ["no"]
ommff-version: ["0.13"]
ommff-version: [">0.13"]
include:
- os: "macos-12"
python-version: "3.12"
Expand All @@ -57,11 +57,11 @@ jobs:
python-version: "3.10"
pydantic-version: ">1"
openeye: "no"
ommff-version: "<0.13"
ommff-version: "0.13"
- os: "macos-latest"
python-version: "3.12"
pydantic-version: ">1"
omff-version: "0.13"
omff-version: ">0.13"
openeye: ["no"]

env:
Expand Down
2 changes: 1 addition & 1 deletion openfe/tests/protocols/test_openmm_equil_rfe_protocols.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ def test_dry_run_gaff_vacuum(benzene_vacuum_system, toluene_vacuum_system,

gaff_should_fail = version.parse(
ommff_version
) >= version.parse("0.13.0")
) == version.parse("0.13.0")

if gaff_should_fail:
from openmmforcefields.generators.template_generators import (
Expand Down
2 changes: 1 addition & 1 deletion openfe/tests/protocols/test_openmm_plain_md_protocols.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ def test_dry_run_gaff_vacuum(benzene_vacuum_system, tmpdir):

gaff_should_fail = version.parse(
ommff_version
) >= version.parse("0.13.0")
) == version.parse("0.13.0")

if gaff_should_fail:
from openmmforcefields.generators.template_generators import (
Expand Down

0 comments on commit 9de8fa6

Please sign in to comment.