Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove simtk references for openmm 7.6 #457

Merged
merged 3 commits into from
Sep 7, 2021
Merged
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
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@ file, annotated with SMARTS-based atomtypes, e.g.:

Foyer can apply the forcefield to arbitrary chemical topologies. We currently support:

* [OpenMM.Topology](http://docs.openmm.org/7.0.0/api-python/generated/simtk.openmm.app.topology.Topology.html#)
* [OpenMM.Topology](https://github.com/openmm/openmm/blob/7.6.0/wrappers/python/openmm/app/topology.py#L70)
* [ParmEd.Structure](http://parmed.github.io/ParmEd/html/structure.html)
* [mBuild.Compound](http://mosdef-hub.github.io/mbuild/data_structures.html)
* [gmso.Topology](https://gmso.mosdef.org/en/stable/data_structures.html#gmso.Topology)
* [openff.tookit.topology.Topology](https://open-forcefield-toolkit.readthedocs.io/en/0.9.2/api/generated/openff.toolkit.topology.Topology.html#openff-toolkit-topology-topology)

Application of a force field can be as simple as:
```python
Expand Down
4 changes: 2 additions & 2 deletions docs/docs-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ channels:
dependencies:
- python=3.7
- gmso
- openmm =7.5
- parmed
- openmm>=7.6
- parmed>=3.4.3
- ele
- pip:
- sphinx
Expand Down
4 changes: 2 additions & 2 deletions environment-dev-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ dependencies:
- mbuild
- gmso
- networkx>=2.5
- openmm=7.5
- parmed
- openmm>=7.6
- parmed>=3.4.3
- pip
- pytest
- pytest-azurepipelines
Expand Down
4 changes: 2 additions & 2 deletions environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ dependencies:
- mbuild
- gmso
- networkx>=2.5
- openmm=7.5
- parmed
- openmm>=7.6
- parmed>=3.4.3
- ele
- openff-toolkit
- gmso
Expand Down
4 changes: 2 additions & 2 deletions environment-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ dependencies:
- lark-parser
- lxml
- networkx>=2.5
- openmm=7.5
- parmed
- openmm>=7.6
- parmed>=3.4.3
- ele
- requests
- pip
Expand Down
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ dependencies:
- lxml
- gmso
- networkx>=2.5
- openmm=7.5
- parmed
- openmm>=7.6
- parmed>=3.4.3
- ele
- requests
- python<=3.8
4 changes: 2 additions & 2 deletions foyer/element.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"""Element support in foyer."""
import simtk.openmm.app.element as elem
import openmm.app.element as elem


class Element(elem.Element):
"""An Element represents a chemical element.

The simtk.openmm.app.element module contains objects for all the standard chemical elements,
The openmm.app.element module contains objects for all the standard chemical elements,
such as element.hydrogen or element.carbon. You can also call the static method Element.getBySymbol() to
look up the Element with a particular chemical symbol.

Expand Down
12 changes: 6 additions & 6 deletions foyer/forcefield.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@
from typing import Callable, Iterable, List

import numpy as np
import openmm as mm
import openmm.app.element as elem
import openmm.unit as u
import parmed as pmd
import simtk.openmm.app.element as elem
import simtk.unit as u
from pkg_resources import iter_entry_points, resource_filename
from simtk import openmm as mm
from simtk.openmm import app
from simtk.openmm.app.forcefield import (
from openmm import app
from openmm.app.forcefield import (
AllBonds,
CutoffNonPeriodic,
HAngles,
Expand All @@ -30,6 +29,7 @@
RBTorsionGenerator,
_convertParameterToNumber,
)
from pkg_resources import iter_entry_points, resource_filename

import foyer.element as custom_elem
from foyer import smarts
Expand Down