Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,9 @@ jobs:
PYTEST_ARGS+=" --ignore=openff/toolkit/_tests/test_examples.py"
PYTEST_ARGS+=" --ignore=openff/toolkit/_tests/test_links.py"

# TODO: Flip back to schedule condition before merge
PYTEST_ARGS+=" --runslow"
if [[ "$GITHUB_EVENT_NAME" == "schedule" ]]; then
PYTEST_ARGS+=" --runslow"
fi

python -m pytest -x --durations=20 $PYTEST_ARGS $COV openff/toolkit/_tests

Expand Down
1 change: 1 addition & 0 deletions devtools/conda-envs/openeye.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ dependencies:
- pytest-cov
- pytest-xdist
- pytest-rerunfailures
- pytest-timeout
- pyyaml
- toml
- bson
Expand Down
1 change: 1 addition & 0 deletions devtools/conda-envs/rdkit-examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencies:
- pytest =8
- pytest-xdist
- pytest-rerunfailures
- pytest-timeout
- pyyaml
- toml
- bson
Expand Down
1 change: 1 addition & 0 deletions devtools/conda-envs/rdkit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ dependencies:
- pytest-cov
- pytest-xdist
- pytest-rerunfailures
- pytest-timeout
- pyyaml
- toml
- bson
Expand Down
4 changes: 2 additions & 2 deletions devtools/conda-envs/test_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
- xmltodict <=1.0.2
- python-constraint
- openmm >=7.6
- openff-forcefields >=2023.05.1
- openff-forcefields >=2025
- openff-units
- openff-amber-ff-ports
- openff-utilities >=0.1.5
Expand All @@ -30,7 +30,7 @@ dependencies:

- openeye-toolkits
# Test-only/optional/dev/typing
- pytest =8
- pytest
- pytest-cov
- pytest-xdist
- pytest-rerunfailures
Expand Down
18 changes: 9 additions & 9 deletions openff/toolkit/_tests/test_forcefield.py
Original file line number Diff line number Diff line change
Expand Up @@ -695,25 +695,25 @@ def generate_monatomic_ions():
"toolkit": AmberToolsToolkitWrapper,
"partial_charge_method": "AM1-Mulliken",
"exception": None,
"exception_match": "",
"exception_match": None,
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

See any recent logs with

 /home/runner/micromamba/envs/openff-toolkit-test/lib/python3.11/site-packages/_pytest/raises.py:624: PytestWarning: matching against an empty string will *always* pass. If you want to check for an empty message you need to pass '^$'. If you don't want to match you should pass `None` or leave out the parameter.

},
{
"toolkit": AmberToolsToolkitWrapper,
"partial_charge_method": "Gasteiger",
"exception": None,
"exception_match": "",
"exception_match": None,
},
{
"toolkit": AmberToolsToolkitWrapper,
"partial_charge_method": "Madeup-ChargeMethod",
"exception": ChargeMethodUnavailableError,
"exception_match": "",
"exception_match": None,
},
{
"toolkit": OpenEyeToolkitWrapper,
"partial_charge_method": "AM1-Mulliken",
"exception": None,
"exception_match": "",
"exception_match": None,
},
{
"toolkit": OpenEyeToolkitWrapper,
Expand All @@ -725,31 +725,31 @@ def generate_monatomic_ions():
"toolkit": OpenEyeToolkitWrapper,
"partial_charge_method": "MMFF94",
"exception": None,
"exception_match": "",
"exception_match": None,
},
{
"toolkit": OpenEyeToolkitWrapper,
"partial_charge_method": "am1bcc",
"exception": None,
"exception_match": "",
"exception_match": None,
},
{
"toolkit": OpenEyeToolkitWrapper,
"partial_charge_method": "am1bccnosymspt",
"exception": None,
"exception_match": "",
"exception_match": None,
},
{
"toolkit": OpenEyeToolkitWrapper,
"partial_charge_method": "am1bccelf10",
"exception": None,
"exception_match": "",
"exception_match": None,
},
{
"toolkit": OpenEyeToolkitWrapper,
"partial_charge_method": "Madeup-ChargeMethod",
"exception": ChargeMethodUnavailableError,
"exception_match": "",
"exception_match": None,
},
]

Expand Down
4 changes: 2 additions & 2 deletions openff/toolkit/_tests/test_nagl.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ def test_atom_order_dependence(self):
)

numpy.testing.assert_allclose(
forward.partial_charges,
reverse.partial_charges[::-1],
forward.partial_charges.m,
reverse.partial_charges.m[::-1],
atol=1e-7,
)

Expand Down
2 changes: 1 addition & 1 deletion openff/toolkit/_tests/test_parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -2202,7 +2202,7 @@ def test_validate_found_match(
):
if unsafe_vsites:
monkeypatch.setenv("OPENFF_UNSAFE_VSITES", "1")
molecule = Molecule.from_smiles(smiles, allow_undefined_stereo=True)
molecule = Molecule.from_mapped_smiles(smiles, allow_undefined_stereo=True)
topology: Topology = molecule.to_topology()

atoms = {i: atom for i, atom in enumerate(topology.atoms)}
Expand Down
Loading