67 Commits

Author SHA1 Message Date
Jeff Wagner
8941f7e7b9 undownpin interchange 2025-02-27 13:46:42 -08:00
Mike Henry
7565e25d7c Test new ambertools 24 build (#361)
* test if CI is green

* github has removed macos-12 runners

* something is weird with the ambertools build on macos-13

* test new ambertools 23 build

* try older build

* test new ambertools build

* bump ci

* update the openmm versions we test

* don't test on intel macs
2025-02-27 12:44:36 -07:00
Jeff Wagner
ecb5ccdf9b try downpinning away from openff-interchange 0.4.2 (#366) 2025-02-27 08:04:04 -07:00
Mike Henry
72431bbbde run latest version of openmm in CI (#345)
* run latest version of openmm

* run n, n-1 openmm versions
2024-07-29 14:13:13 -07:00
Mike Henry
051cbcbbb1 Remove shipping gaff/ffxml and read parms from parmchk2 (#344)
* re-enable gaff

* run espaloma and gaff tests

* gaff has two fs michael

* Use 8.1.2rc1

* Update linters

* Remove Espaloma tests

* Apply suggestions from code review

Co-authored-by: Iván Pulido <2949729+ijpulidos@users.noreply.github.com>

* working on parmchk output

* fix pytest warnings

* Migrate from pkg_resources to importlib_resources

* Remove shipping gaff/ffxml and read everything from parmchk2

* make sure we use older openmm version for testing

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* test on ci now

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* decided to keep shipping the xmls

* cleaned things up, gave a better name to the set we track gaff atom types

* Update openmmforcefields/generators/template_generators.py

* updated change log

* Added note about how we might remove openmmforcefields/ffxml/amber/gaff/ffxml in a future release

---------

Co-authored-by: Matthew W. Thompson <mattwthompson@protonmail.com>
Co-authored-by: Iván Pulido <2949729+ijpulidos@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-07-24 15:18:58 -07:00
Mike Henry
38eb754ec9 re-enable gaff (#334)
* re-enable gaff

* run espaloma and gaff tests

* gaff has two fs michael

* Use 8.1.2rc1

* Update linters

* Remove Espaloma tests

* Apply suggestions from code review

Co-authored-by: Iván Pulido <2949729+ijpulidos@users.noreply.github.com>

* Use Intel macOS runners

* check if older macos works

* test all the macos versions

* see if rdkit is the issue

* Drop macOS 13

* Typo/fix

* Update dependencies

---------

Co-authored-by: Matthew W. Thompson <mattwthompson@protonmail.com>
Co-authored-by: Iván Pulido <2949729+ijpulidos@users.noreply.github.com>
2024-07-19 10:46:23 -07:00
Matt Thompson
b685637bbe Temporarily remove GAFF because of parmchk2 issues (#329)
* Temporarily remove GAFF because of parmchk2 issues

* Drop OpenEye from tests

* Drop automerge action

* Update Python and AmberTools versions, run tests in parallel

* Remove Espaloma from test environment

* Remove Espaloma CI

* Refactor some tests to enable skipping GAFF

* Skip SPC/E test when iterating over small molecule force fields

* Update default force field in `SystemGenerator`

* Streamline testing

* Update testing setup

* Mask CodeCov upload failures

* Add release notes
2024-05-03 08:07:59 -07:00
John Chodera
ec15b9cb73 Skip problematic test that caused error due to invalid SMIRNOFF parameters 2023-10-11 14:48:01 -07:00
Mike Henry
b3b288628e remove defaults channel 2023-09-25 10:59:28 -07:00
Iván Pulido
cc74477cbc Use latest Espaloma 0.3.x by default 2023-09-22 20:11:40 -04:00
Iván Pulido
175a928872 Espaloma+dgl now on conda-frge 2023-09-22 18:51:27 -04:00
Matt Thompson
8660a1afe8 Scattered fixes to get CI running (#290)
* Scattered fixes

* Pin AmberTools
* Skip non-small molecule force fields at test time
* Always run tests, even if OpenEye is not licensed

* OPC

* Update Python versions

* Trim more force fields at test time

* Parametrize tests

* Revert "Parametrize tests"

This reverts commit 5b37af526f.

* Debug, comments

* Run all tests

* Testing espaloma in different workflow

* pinning dgl version

* Change name of workflow

* Testing espaloma only with latest openff toolkit

* using pytest and fixtures

* Marking espaloma tests and parametrizing

* Running espaloma tests in workflow

* Fixing call in test

* Cache test should be inside context manager

* Remove support for older openff toolkit (<0.11)

* Specifying root path for tests

* testing without the /

* fixing CI yamls

* Mark espaloma tests

* need argument for tests

* remove trailing newline

---------

Co-authored-by: Iván Pulido <2949729+ijpulidos@users.noreply.github.com>
Co-authored-by: Mike Henry <11765982+mikemhenry@users.noreply.github.com>
2023-07-18 23:20:03 +00:00
Matt Thompson
b12c2e871b Convert all amber ions (#242)
* conversion script from openmm #3773

* add converted ions from ambertools-22.0-py38h6177452_1

* OPC and OPC3 water (without ions) from openmm #3654

* move opc waters

* fix typo

* make opc and opc3 standard files by combining water and ions

* Fix paths

* Fiddle with paths again

* Bring in openff-amber-ff-ports by default

* Move `opc.xml` and `opc3.xml`

Co-authored-by: Alex Izvorski <aizvorski@gmail.com>
2022-10-21 14:33:38 -05:00
Mike Henry
33d500e900 make sure we don't install the newest toolkit by mistake (#237)
* make sure we don't install the newest toolkit by mistake

* make sure we don't pull in a really old version of the toolkit

* forgot to add a verb there

* Start to make internals compatible with both unit packages

* Try different logic

* Improve logic in test

* Fix some tests

* Fix

* Fix

* Better units logic in tests

* Remove temporary code

* That's too semantic a variable name

Co-authored-by: Matthew W. Thompson <mattwthompson@protonmail.com>
2022-09-20 15:05:52 -07:00
Mike Henry
35496e5095 Fix toolkit tests (#227)
* Ensure 0.11.0 RC version of toolkit is installed

* Possible fix to finish #191

* Try to ensure bash args thing is passed through

* Naive unit refactor

* Work through tests

* Update CI matrix

* Use mamba for development

* Debug, add boilerplate .gitignore

* Fix syntax

* make sure the package didn't get installed before we install it

* Do not install Espaloma

* Fix some unit registries in tests

* install espaloma, but remove openmmforcefields

* add back in espaloma

* switch to micromamba

* Explicitly move ffxml sources into entry point

* Remove symlinking

* Add boilerplate `.gitignore`

* Update package installation in CI

* Fix finding Amber files in test

* Soft import whatever units module is used by the toolkit

* Switch to micromamba for setting up conda environment

Add boilerplate `.gitignore` file

Do not pull from non-standard labels

Install instead of update

Try to figure out why if: {{ false }} still triggers

Syntax?

Tinker

Bring in (full) mamba

Bash thing everywhere

Bring down old toolkit

Do not present un-loadable ff14SB port as available

More pins

* Fix YAML syntax

* Use pip

* More fixes

* No particles
* Fix unit serialization
* Fix Atom.element calls

* Update some tests

* Clean up un-used imports

* Fix more tests

* Fix more tests

* Exclude Python 3.10 on macOS

* Skip ff14SB being treated as a small molecule

* Fix test

* Track duration of longest 20 tests

* Update action versions

* Try to fix exclusions in CI matrix

* Fix pathing in Amber conversion

* Run `pyupgrade --py38-plus`

* Try directly uploading coverage report

* Fix syntax

* Add back some tests

* Debug

* Drop `pytest-xdist` arg

* Fiddle with path

* Just try to get stuff passing

* Try uploading again

* Switch back to codecov

* Simply coverage reporting

* Allow 0 coverage

* Simplify coverage arguments

* Add `__init__.py` in `/tests/` submodule

https://stackoverflow.com/a/60579142

* Add `__init__.py` in `/tests/` submodule

https://stackoverflow.com/a/60579142

* Simplify coverage arguments

* Add back durations argument

* Apply suggestions from code review

* only upload report if it is not scheduled

Co-authored-by: Matthew W. Thompson <mattwthompson@protonmail.com>
2022-09-15 20:59:04 +00:00
Matt Thompson
140bc79930 Tweak CI: Switch to Micromamba, pin to supported OpenFF Toolkit versions (#232)
* Switch to micromamba for setting up conda environment

Add boilerplate `.gitignore` file

Do not pull from non-standard labels

Install instead of update

Try to figure out why if: {{ false }} still triggers

Syntax?

Tinker

Bring in (full) mamba

Bash thing everywhere

Bring down old toolkit

Do not present un-loadable ff14SB port as available

More pins

* Drop 3.7, add 3.10

Co-authored-by: Mike Henry <11765982+mikemhenry@users.noreply.github.com>
2022-09-09 17:29:32 +00:00
Mike Henry
d4e6a07d89 add back in openeye toolkit (#226) 2022-08-19 16:51:57 -07:00
Mike Henry
ecfa15e34e pull espaloma from conda-froge 2022-08-04 10:00:51 -07:00
John Chodera
364c8e3200 Merge pull request #220 from openmm/feat/remove_openeye_check
remove oe license check
2022-08-02 14:05:08 -07:00
Mike Henry
6a19869112 missed a few bits on openeye removal 2022-08-01 14:54:57 -07:00
Mike Henry
3adb413691 Merge branch 'master' into toolkit-update 2022-07-12 13:53:55 -07:00
John Chodera
b8cd9a0175 Test against espaloma master to see if bugfix addresses test failure 2022-07-12 00:44:31 -04:00
Mike Henry
e5fd0dde2f Fix CI (#202)
* Update ci.yaml

* kill CI when another job is triggered on the same PR and don't upload codecov on scheduled runs

* use cuda shim

* update torch

* update *py*torch
2022-05-16 10:50:05 -07:00
John Chodera
617c5d9315 Update to espaloma-0.2.2 2022-04-05 20:32:42 -07:00
Matthew W. Thompson
bbddefb278 Merge remote-tracking branch 'upstream/master' into toolkit-update 2022-03-28 11:26:47 -05:00
Matthew W. Thompson
2195abab82 Update SMIRNOFFTemplateGenerator for toolkit API breaks 2022-03-28 11:25:52 -05:00
John Chodera
1dab2f1151 Ensure we use a sufficiently recent qcportal 2021-12-20 17:41:20 -08:00
John Chodera
94d86fa77c Update conda env to test against espaloma master 2021-11-14 16:32:45 +01:00
John Chodera
d06c944284 Add qcportal to conda env requirements, since espaloma seems to require it? 2021-10-28 23:27:15 -07:00
John Chodera
f7d0142381 Fix indentation in test environment YAML 2021-10-28 22:18:42 -07:00
John Chodera
5597b73150 Fix test env YAML 2021-10-28 22:16:40 -07:00
John Chodera
243709b15f Initial implementation of EspalomaTemplateGenerator and unit tests 2021-10-28 22:11:59 -07:00
John Chodera
534bd4ee34 Update all simtk.openmm -> openmm and simtk.unit -> openmm.unit imports for OpenMM 7.6; pin to >=7.6 2021-08-27 17:48:27 -07:00
SimonBoothroyd
620543f1bd Migrate the CI to GHA. 2021-01-23 11:03:59 +00:00
SimonBoothroyd
7c0e2a0e96 Migrate to the conda-forge openff-toolkit package. 2021-01-21 09:44:19 +00:00
John Chodera
1ac495ab8e Use new openforcefield 0.7.1 API for finding force fields 2020-07-21 17:31:28 -07:00
John Chodera
d3430010b7 Update to use openmm 7.4.2 rc in build 2020-05-17 17:32:53 -07:00
John Chodera
0e02ae8173 Fix miniconda paths 2020-05-17 17:30:59 -07:00
John Chodera
f18af600df Use openeye toolkits to speed up tests 2020-01-05 18:08:17 -08:00
John Chodera
6e610a4de5 Use https://github.com/openmm/openmm/pull/2511 fix on travis 2020-01-05 16:38:17 -08:00
John Chodera
b11db2098a Update tests for SystemGenerator 2020-01-04 16:57:06 -08:00
John Chodera
86967c642c Update requirements to openmm >=7.5.0 for smirnoff updates 2020-01-04 16:06:30 -08:00
John Chodera
b7ab3fa893 Cleanup 2019-12-21 19:28:35 -05:00
John Chodera
3f880ac840 Allow osx tests by backing off on required AmberTools version 2019-11-30 10:33:20 -05:00
John Chodera
e884280d5d GAFFTemplateGenerator tests pass locally! 2019-11-29 21:36:34 -05:00
John Chodera
86002b5278 Draft GAFFTemplateGenerator migrated from perses branch 2019-11-23 21:39:10 -05:00
John Chodera
862a3dcf10 Update test environment. 2019-10-29 22:11:21 -07:00
John Chodera
73b0ffea3e Relax ambertools dependency to allow both linux and osx for now 2019-10-26 19:01:11 -07:00
John Chodera
8d5bdee59d Update to MolSSI cookiecutter 2019-10-26 18:55:15 -07:00
John Chodera
9a0515e560 Add Python 3.7 support 2019-01-02 13:22:50 -08:00