Skip to content

Commit

Permalink
Add MDTraj test dependency, make regression tests RDKit-only
Browse files Browse the repository at this point in the history
  • Loading branch information
mattwthompson committed Jan 8, 2021
1 parent 129a1eb commit 354838e
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions devtools/conda-envs/openeye.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ dependencies:
- qcelemental
- qcportal
- qcengine
- mdtraj
1 change: 1 addition & 0 deletions devtools/conda-envs/rdkit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ dependencies:
- qcelemental
- qcportal
- qcengine
- mdtraj
1 change: 1 addition & 0 deletions devtools/conda-envs/test_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ dependencies:
- qcelemental
- qcportal
- qcengine
- mdtraj
3 changes: 2 additions & 1 deletion openforcefield/tests/test_energies.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
import pytest
from simtk import unit

from openforcefield.tests.utils import get_data_file_path
from openforcefield.tests.utils import get_data_file_path, requires_rdkit
from openforcefield.topology import Molecule, Topology
from openforcefield.typing.engines.smirnoff import ForceField


@requires_rdkit
@pytest.mark.parametrize("constrained", [True, False])
@pytest.mark.parametrize(
"mol",
Expand Down
2 changes: 2 additions & 0 deletions openforcefield/tests/test_topology.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
from openforcefield.tests.utils import (
get_data_file_path,
requires_openeye,
requires_pkg,
requires_rdkit,
)
from openforcefield.topology import (
Expand Down Expand Up @@ -717,6 +718,7 @@ def test_to_from_openmm(self):
assert bond.bond_order == bond_copy.bond_order
assert bond.bond.is_aromatic == bond_copy.bond.is_aromatic

@requires_pkg("mdtraj")
def test_from_mdtraj(self):
"""Test construction of an OpenFF Topology from an MDTraj Topology object"""
import mdtraj as md
Expand Down

0 comments on commit 354838e

Please sign in to comment.