Commit Graph

529 Commits

Author SHA1 Message Date
Matt Thompson
87226a2808 Fix OPC3 bond length (#273)
Co-authored-by: Mike Henry <11765982+mikemhenry@users.noreply.github.com>
2023-06-12 11:11:39 -07:00
Matt Thompson
98f3350299 Switch to setup-micromamba (#274) 2023-06-12 10:44:00 -07:00
John Chodera
1b0dfe8534 Merge pull request #253 from openmm/fix-#252
SystemGenerator should only add barostat if system is periodic
2022-12-01 00:07:51 -08:00
John Chodera
f735beef2b Revert conda environment change so we can test against pre- and post- 0.11 version of openff-toolkit 2022-11-30 20:10:41 -05:00
John Chodera
220ecac811 Pin openff-toolkit >=0.11.3 due to bug noted in https://github.com/openmm/openmmforcefields/pull/253#issuecomment-1332933319 2022-11-30 19:27:24 -05:00
John Chodera
e6ae96bb3b SystemGenerator should only add barostat if system is periodic 2022-11-30 18:54:24 -05:00
Matt Thompson
d78f2b8258 Update docstrings, run in CI (#240)
* Update docstrings, run in CI

* Do not necessarily assume ff14SB port is installed

* Remove some references to `simtk`

$ grep -r simtk . | wc -l
       0

Co-authored-by: Mike Henry <11765982+mikemhenry@users.noreply.github.com>
2022-10-25 11:27:40 +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
dependabot[bot]
9309ba87b0 Bump codecov/codecov-action from 3.1.0 to 3.1.1 (#238)
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v3.1.0...v3.1.1)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-27 23:14:34 -07: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>
0.11.2
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
e7f2fe34e5 Merge pull request #196 from openmm/dependabot/github_actions/actions/checkout-3.0.2
Bump actions/checkout from 2 to 3.0.2
2022-09-09 22:03:31 -05:00
Matt Thompson
2aba880e16 Merge branch 'main' into dependabot/github_actions/actions/checkout-3.0.2 2022-09-09 20:15:31 -05:00
Matt Thompson
b5be79ebb2 Merge pull request #197 from openmm/dependabot/github_actions/codecov/codecov-action-3.1.0
Bump codecov/codecov-action from 2.1.0 to 3.1.0
2022-09-09 20:15:15 -05:00
Matt Thompson
a5a2f2f11e Merge branch 'main' into dependabot/github_actions/actions/checkout-3.0.2 2022-09-09 18:37:58 -05:00
Matt Thompson
bc278d5127 Merge branch 'main' into dependabot/github_actions/codecov/codecov-action-3.1.0 2022-09-09 18:37:50 -05: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
3e84351578 test branch protection 2022-08-12 15:25:04 -07:00
Mike Henry
b82f1f3780 test branch protection 2022-08-12 15:21:41 -07:00
Mike Henry
cf9abe273b test branch protection 2022-08-12 15:12:00 -07:00
Mike Henry
8901ec45b8 make CI work on 'main' branch 2022-08-12 15:10:23 -07:00
Mike Henry
ad63a3a5ff Merge branch 'main' into dependabot/github_actions/codecov/codecov-action-3.1.0 2022-08-12 14:50:20 -07:00
Mike Henry
7efb0c6cf5 Merge branch 'main' into dependabot/github_actions/actions/checkout-3.0.2 2022-08-12 14:50:13 -07:00
John Chodera
684ec00b10 Merge pull request #223 from openmm/feat/add_openff-toolkit-testing-to-matrix
fix syntax issues
0.11.1
2022-08-05 13:23:44 -07:00
Mike Henry
51d1802bb2 fix Error #15: Initializing libiomp5.dylib, but found libomp.dylib already initialized. 2022-08-05 10:18:18 -07:00
Mike Henry
4834933ba4 fix syntax issues 2022-08-04 10:05:39 -07:00
Mike Henry
ecfa15e34e pull espaloma from conda-froge 2022-08-04 10:00:51 -07:00
Mike Henry
09c9a33eb6 test newest version of the toolkit 2022-08-04 09:59:44 -07:00
John Chodera
a59b1445d8 Merge pull request #219 from rosemary-cresset/fix-#215
Fix #215: Copy gaff dat file to temp dir
2022-08-04 10:52:01 -04:00
John Chodera
23005bd4fc Merge branch 'master' into fix-#215 2022-08-04 00:02:27 -04:00
Rosemary Mantell
459b651a1e Use fixed file name for gaff dat to avoid spaces
When copying the gaff dat file to the temporary directory to avoid
spaces in the path, also use a fixed file name, 'gaff.dat', in case of
spaces in the file name too.
2022-08-03 09:36:30 +01:00
John Chodera
6f1de6fac2 Merge pull request #217 from rosemary-cresset/fix-#216
Fix #216: Remove % sign from parmchk2 command
2022-08-02 14:55:24 -07:00
John Chodera
d5fe5d0d3b Merge pull request #218 from rosemary-cresset/fix-#214
Fix #214: Leave temp dir before raising exceptions
2022-08-02 14:54:40 -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
John Chodera
445c356d9a Merge pull request #191 from mattwthompson/toolkit-update
Update for upcoming OpenFF Toolkit API breaks
2022-08-02 14:04:17 -07:00
Mike Henry
6a19869112 missed a few bits on openeye removal 2022-08-01 14:54:57 -07:00
Mike Henry
f37599b132 Merge branch 'master' into toolkit-update 2022-08-01 10:39:58 -07:00
Mike Henry
f3cafadb3a Merge branch 'master' into dependabot/github_actions/actions/checkout-3.0.2 2022-08-01 10:39:21 -07:00
Mike Henry
7a4c1d99dc Merge branch 'master' into dependabot/github_actions/codecov/codecov-action-3.1.0 2022-08-01 10:39:13 -07:00
Mike Henry
2f151233ae remove oe license check 2022-08-01 10:37:33 -07:00
Rosemary Mantell
5d07fb377d Fix #215: Copy gaff dat file to temp dir
Copy the gaff dat file to the temporary directory before running
parmchk2 to avoid problems with spaces in the path.
2022-07-15 13:22:47 +01:00
Rosemary Mantell
248e7b88e6 Fix #214: Leave temp dir before raising exceptions
Change out of temporary directory before raising an exception that
causes the directory to be deleted as the context manager exits. If not
done, a PermissionError is raised repeatedly on Windows and the
message from the original exception is very difficult to read. This
behaviour was observed for the parmchk2 command, but the fix has also
been applied to the antechamber command.
2022-07-15 12:55:20 +01:00
Rosemary Mantell
7eb612494d Fix #216: Remove % sign from parmchk2 command
Unnecessary % sign in the parmchk2 command string sometimes gets filled
with junk characters on Windows and stops the command from running
successfully. This behaviour only occurs on some Windows systems and
does not occur on Linux or Mac.
2022-07-15 12:33:28 +01:00
John Chodera
068f36fc7f Merge pull request #213 from openmm/fix-#211
Fix #211 : Use basename instead of full path for cache database table names
2022-07-14 10:19:17 +02:00
Mike Henry
3adb413691 Merge branch 'master' into toolkit-update 2022-07-12 13:53:55 -07:00
John Chodera
1bdba6b112 Fix missing import 2022-07-12 12:48:01 -04:00
John Chodera
319ca47d4d Add TODO to use hash in future 2022-07-12 09:45:37 -04:00
John Chodera
eb0f0d0970 Fix #211 : Use basename instead of filepath for cache generation 2022-07-12 09:44:34 -04:00
John Chodera
f9b08ea218 Merge pull request #212 from openmm/fix-gaff2
Fix #210: gaff atom type name is now correctly passed
2022-07-12 06:41:21 -07:00