Unverified Commit e53bdc5e authored by Peter Eastman's avatar Peter Eastman Committed by GitHub
Browse files

Top level Python module is now "openmm" (#3000)

* Top level Python module is now "openmm"

* Updated module names in examples

* Updated module names in documentation

* Updated module in CI scripts

* Added deprecation warning
parent eff1f26e
...@@ -34,7 +34,7 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE ...@@ -34,7 +34,7 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
USE OR OTHER DEALINGS IN THE SOFTWARE. USE OR OTHER DEALINGS IN THE SOFTWARE.
""" """
from __future__ import absolute_import from __future__ import absolute_import
from simtk.openmm.app.internal.charmm.exceptions import CharmmFileError from openmm.app.internal.charmm.exceptions import CharmmFileError
import sys import sys
if sys.version_info < (3, 0): if sys.version_info < (3, 0):
from codecs import open from codecs import open
......
...@@ -33,10 +33,10 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE ...@@ -33,10 +33,10 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
USE OR OTHER DEALINGS IN THE SOFTWARE. USE OR OTHER DEALINGS IN THE SOFTWARE.
""" """
from __future__ import absolute_import from __future__ import absolute_import
from simtk.openmm.app.internal.charmm.exceptions import ( from openmm.app.internal.charmm.exceptions import (
SplitResidueWarning, BondError, ResidueError, CmapError, SplitResidueWarning, BondError, ResidueError, CmapError,
MissingParameter) MissingParameter)
import simtk.unit as u import openmm.unit as u
import warnings import warnings
TINY = 1e-8 TINY = 1e-8
......
...@@ -34,9 +34,9 @@ from __future__ import division, absolute_import ...@@ -34,9 +34,9 @@ from __future__ import division, absolute_import
from collections import defaultdict from collections import defaultdict
import copy import copy
from simtk.openmm.app import element as E from openmm.app import element as E
from simtk.openmm import CustomGBForce, Discrete2DFunction from openmm import CustomGBForce, Discrete2DFunction
import simtk.unit as u import openmm.unit as u
from math import floor from math import floor
_have_numpy = False _have_numpy = False
...@@ -486,7 +486,7 @@ class CustomAmberGBForceBase(CustomGBForce): ...@@ -486,7 +486,7 @@ class CustomAmberGBForceBase(CustomGBForce):
Parameters Parameters
---------- ----------
topology : simtk.openmm.app.Topology topology : openmm.app.Topology
Topology of the system to get parameters for Topology of the system to get parameters for
Returns Returns
...@@ -558,7 +558,7 @@ class GBSAHCTForce(CustomAmberGBForceBase): ...@@ -558,7 +558,7 @@ class GBSAHCTForce(CustomAmberGBForceBase):
Parameters Parameters
---------- ----------
topology : simtk.openmm.app.Topology topology : openmm.app.Topology
Topology of the system to get parameters for Topology of the system to get parameters for
Returns Returns
...@@ -624,7 +624,7 @@ class GBSAOBC1Force(CustomAmberGBForceBase): ...@@ -624,7 +624,7 @@ class GBSAOBC1Force(CustomAmberGBForceBase):
Parameters Parameters
---------- ----------
topology : simtk.openmm.app.Topology topology : openmm.app.Topology
Topology of the system to get parameters for Topology of the system to get parameters for
Returns Returns
...@@ -754,7 +754,7 @@ class GBSAGBnForce(CustomAmberGBForceBase): ...@@ -754,7 +754,7 @@ class GBSAGBnForce(CustomAmberGBForceBase):
Parameters Parameters
---------- ----------
topology : simtk.openmm.app.Topology topology : openmm.app.Topology
Topology of the system to get parameters for Topology of the system to get parameters for
Returns Returns
...@@ -892,7 +892,7 @@ class GBSAGBn2Force(GBSAGBnForce): ...@@ -892,7 +892,7 @@ class GBSAGBn2Force(GBSAGBnForce):
Parameters Parameters
---------- ----------
topology : simtk.openmm.app.Topology topology : openmm.app.Topology
Topology of the system to get parameters for Topology of the system to get parameters for
Returns Returns
......
...@@ -34,8 +34,8 @@ __author__ = "Christopher M. Bruns" ...@@ -34,8 +34,8 @@ __author__ = "Christopher M. Bruns"
__version__ = "1.0" __version__ = "1.0"
from simtk.openmm.vec3 import Vec3 from openmm.vec3 import Vec3
import simtk.unit as unit import openmm.unit as unit
from .. import element from .. import element
from .unitcell import computePeriodicBoxVectors from .unitcell import computePeriodicBoxVectors
import warnings import warnings
...@@ -80,13 +80,13 @@ class PdbStructure(object): ...@@ -80,13 +80,13 @@ class PdbStructure(object):
[13.768, -8.431, 11.865] A [13.768, -8.431, 11.865] A
Strip the length units from an atomic position: Strip the length units from an atomic position:
> import simtk.unit > import openmm.unit
> pos = pdb.iter_positions().next() > pos = pdb.iter_positions().next()
> print pos > print pos
[13.768, -8.431, 11.865] A [13.768, -8.431, 11.865] A
> print pos / simtk.unit.angstroms > print pos / openmm.unit.angstroms
[13.768, -8.431, 11.865] [13.768, -8.431, 11.865]
> print pos / simtk.unit.nanometers > print pos / openmm.unit.nanometers
[1.3768, -0.8431, 1.1865] [1.3768, -0.8431, 1.1865]
...@@ -967,8 +967,8 @@ class Atom(object): ...@@ -967,8 +967,8 @@ class Atom(object):
""" """
Examples Examples
>>> from simtk.openmm.vec3 import Vec3 >>> from openmm.vec3 import Vec3
>>> import simtk.unit as unit >>> import openmm.unit as unit
>>> l = Atom.Location(' ', Vec3(1,2,3)*unit.angstroms, 1.0, 20.0*unit.angstroms**2, "XXX") >>> l = Atom.Location(' ', Vec3(1,2,3)*unit.angstroms, 1.0, 20.0*unit.angstroms**2, "XXX")
>>> for c in l: >>> for c in l:
... print c ... print c
......
...@@ -36,7 +36,7 @@ __license__ = "Creative Commons Attribution 3.0 Unported" ...@@ -36,7 +36,7 @@ __license__ = "Creative Commons Attribution 3.0 Unported"
__version__ = "V0.01" __version__ = "V0.01"
import re,sys import re,sys
from simtk.openmm.app.internal.pdbx.reader.PdbxContainers import * from openmm.app.internal.pdbx.reader.PdbxContainers import *
class PdbxError(Exception): class PdbxError(Exception):
""" Class for catch general errors """ Class for catch general errors
......
...@@ -21,9 +21,9 @@ __version__ = "V0.01" ...@@ -21,9 +21,9 @@ __version__ = "V0.01"
import sys, unittest, traceback import sys, unittest, traceback
import sys, time, os, os.path, shutil import sys, time, os, os.path, shutil
from simtk.openmm.app.internal.pdbx.reader.PdbxReader import PdbxReader from openmm.app.internal.pdbx.reader.PdbxReader import PdbxReader
from simtk.openmm.app.internal.pdbx.writer.PdbxWriter import PdbxWriter from openmm.app.internal.pdbx.writer.PdbxWriter import PdbxWriter
from simtk.openmm.app.internal.pdbx.reader.PdbxContainers import * from openmm.app.internal.pdbx.reader.PdbxContainers import *
class PdbxReadWriteTests(unittest.TestCase): class PdbxReadWriteTests(unittest.TestCase):
......
...@@ -25,7 +25,7 @@ Acknowledgements: ...@@ -25,7 +25,7 @@ Acknowledgements:
from __future__ import absolute_import from __future__ import absolute_import
import re,sys import re,sys
from simtk.openmm.app.internal.pdbx.reader.PdbxContainers import * from openmm.app.internal.pdbx.reader.PdbxContainers import *
class PdbxError(Exception): class PdbxError(Exception):
""" Class for catch general errors """ Class for catch general errors
......
...@@ -16,8 +16,8 @@ from __future__ import absolute_import ...@@ -16,8 +16,8 @@ from __future__ import absolute_import
import sys, unittest, traceback import sys, unittest, traceback
import sys, time, os, os.path, shutil import sys, time, os, os.path, shutil
from simtk.openmm.app.internal.pdbx.reader.PdbxReader import PdbxReader from openmm.app.internal.pdbx.reader.PdbxReader import PdbxReader
from simtk.openmm.app.internal.pdbx.reader.PdbxContainers import * from openmm.app.internal.pdbx.reader.PdbxContainers import *
class PdbxReaderTests(unittest.TestCase): class PdbxReaderTests(unittest.TestCase):
def setUp(self): def setUp(self):
......
...@@ -19,7 +19,7 @@ __license__ = "Creative Commons Attribution 3.0 Unported" ...@@ -19,7 +19,7 @@ __license__ = "Creative Commons Attribution 3.0 Unported"
__version__ = "V0.01" __version__ = "V0.01"
from simtk.openmm.app.internal.pdbx.reader.PdbxContainers import * from openmm.app.internal.pdbx.reader.PdbxContainers import *
class PdbxError(Exception): class PdbxError(Exception):
""" Class for catch general errors """ Class for catch general errors
......
...@@ -24,9 +24,9 @@ __version__ = "V0.01" ...@@ -24,9 +24,9 @@ __version__ = "V0.01"
import sys, unittest, traceback import sys, unittest, traceback
import sys, time, os, os.path, shutil import sys, time, os, os.path, shutil
from simtk.openmm.app.internal.pdbx.reader.PdbxReader import PdbxReader from openmm.app.internal.pdbx.reader.PdbxReader import PdbxReader
from simtk.openmm.app.internal.pdbx.writer.PdbxWriter import PdbxWriter from openmm.app.internal.pdbx.writer.PdbxWriter import PdbxWriter
from simtk.openmm.app.internal.pdbx.reader.PdbxContainers import * from openmm.app.internal.pdbx.reader.PdbxContainers import *
class PdbxWriterTests(unittest.TestCase): class PdbxWriterTests(unittest.TestCase):
def setUp(self): def setUp(self):
......
...@@ -32,8 +32,8 @@ from __future__ import absolute_import ...@@ -32,8 +32,8 @@ from __future__ import absolute_import
__author__ = "Peter Eastman" __author__ = "Peter Eastman"
__version__ = "1.0" __version__ = "1.0"
from simtk.openmm import Vec3 from openmm import Vec3
from simtk.unit import nanometers, is_quantity, norm, dot, radians from openmm.unit import nanometers, is_quantity, norm, dot, radians
import math import math
......
...@@ -27,8 +27,8 @@ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR ...@@ -27,8 +27,8 @@ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
USE OR OTHER DEALINGS IN THE SOFTWARE. USE OR OTHER DEALINGS IN THE SOFTWARE.
""" """
import simtk.openmm as mm import openmm as mm
import simtk.unit as unit import openmm.unit as unit
from collections import namedtuple from collections import namedtuple
from functools import reduce from functools import reduce
import os import os
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment