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
import os import os
import unittest import unittest
from simtk.openmm.app import * from openmm.app import *
from simtk.openmm import * from openmm import *
from simtk.unit import * from openmm.unit import *
import simtk.openmm.app.element as elem import openmm.app.element as elem
class TestDesmondDMSFile(unittest.TestCase): class TestDesmondDMSFile(unittest.TestCase):
def setUp(self): def setUp(self):
......
import pickle import pickle
import random import random
from simtk.unit import dalton, is_quantity from openmm.unit import dalton, is_quantity
from simtk.openmm.app import element from openmm.app import element
import unittest import unittest
class TestElement(unittest.TestCase): class TestElement(unittest.TestCase):
......
import unittest import unittest
from validateConstraints import * from validateConstraints import *
from simtk.openmm.app import * from openmm.app import *
from simtk.openmm import * from openmm import *
from simtk.unit import * from openmm.unit import *
import simtk.openmm.app.element as elem import openmm.app.element as elem
import simtk.openmm.app.forcefield as forcefield import openmm.app.forcefield as forcefield
import math import math
import textwrap import textwrap
try: try:
...@@ -404,7 +404,7 @@ class TestForceField(unittest.TestCase): ...@@ -404,7 +404,7 @@ class TestForceField(unittest.TestCase):
from uuid import uuid4 from uuid import uuid4
template_name = uuid4() template_name = uuid4()
# Create residue template. # Create residue template.
from simtk.openmm.app.forcefield import _createResidueTemplate from openmm.app.forcefield import _createResidueTemplate
template = _createResidueTemplate(residue) # use helper function template = _createResidueTemplate(residue) # use helper function
template.name = template_name # replace template name template.name = template_name # replace template name
for (template_atom, residue_atom) in zip(template.atoms, residue.atoms()): for (template_atom, residue_atom) in zip(template.atoms, residue.atoms()):
......
import unittest import unittest
import itertools import itertools
import simtk.openmm as mm import openmm as mm
class TestForceGroups(unittest.TestCase): class TestForceGroups(unittest.TestCase):
......
import unittest import unittest
from validateConstraints import * from validateConstraints import *
from simtk.openmm.app import * from openmm.app import *
from simtk.openmm import * from openmm import *
from simtk.unit import * from openmm.unit import *
import simtk.openmm.app.element as elem import openmm.app.element as elem
import simtk.openmm.app.forcefield as forcefield import openmm.app.forcefield as forcefield
import math import math
try: try:
from cStringIO import StringIO from cStringIO import StringIO
......
import unittest import unittest
from simtk.openmm.app import * from openmm.app import *
from simtk.openmm import * from openmm import *
from simtk.unit import * from openmm.unit import *
import simtk.openmm.app.element as elem import openmm.app.element as elem
class TestGromacsGroFile(unittest.TestCase): class TestGromacsGroFile(unittest.TestCase):
"""Test the Gromacs GRO file parser""" """Test the Gromacs GRO file parser"""
......
import unittest import unittest
from validateConstraints import * from validateConstraints import *
from simtk.openmm.app import * from openmm.app import *
from simtk.openmm import * from openmm import *
from simtk.unit import * from openmm.unit import *
from simtk.openmm.app.gromacstopfile import _defaultGromacsIncludeDir from openmm.app.gromacstopfile import _defaultGromacsIncludeDir
import simtk.openmm.app.element as elem import openmm.app.element as elem
GROMACS_INCLUDE = _defaultGromacsIncludeDir() GROMACS_INCLUDE = _defaultGromacsIncludeDir()
......
...@@ -2,9 +2,9 @@ import unittest ...@@ -2,9 +2,9 @@ import unittest
import warnings import warnings
import tempfile import tempfile
from datetime import datetime, timedelta from datetime import datetime, timedelta
from simtk.openmm import * from openmm import *
from simtk.openmm.app import * from openmm.app import *
from simtk.unit import * from openmm.unit import *
import math, random import math, random
class TestIntegrators(unittest.TestCase): class TestIntegrators(unittest.TestCase):
......
import unittest import unittest
from simtk.openmm import * from openmm import *
from simtk.openmm.app import * from openmm.app import *
from simtk.unit import * from openmm.unit import *
class TestMetadynamics(unittest.TestCase): class TestMetadynamics(unittest.TestCase):
"""Test the Metadynamics class""" """Test the Metadynamics class"""
......
...@@ -4,9 +4,9 @@ import math ...@@ -4,9 +4,9 @@ import math
import sys import sys
from validateModeller import * from validateModeller import *
from simtk.openmm.app import * from openmm.app import *
from simtk.openmm import * from openmm import *
from simtk.unit import * from openmm.unit import *
if sys.version_info >= (3, 0): if sys.version_info >= (3, 0):
from io import StringIO from io import StringIO
......
import unittest import unittest
from simtk.openmm import app from openmm import app
import simtk.openmm as mm import openmm as mm
from simtk import unit from openmm import unit
try: try:
import numpy as np import numpy as np
NUMPY_IMPORT_FAILED = False NUMPY_IMPORT_FAILED = False
......
import unittest import unittest
from simtk.openmm.app import * from openmm.app import *
from simtk.openmm import * from openmm import *
from simtk.unit import * from openmm.unit import *
import simtk.openmm.app.forcefield as forcefield import openmm.app.forcefield as forcefield
import math import math
try: try:
from cStringIO import StringIO from cStringIO import StringIO
......
import sys import sys
import unittest import unittest
from simtk.openmm.app import * from openmm.app import *
from simtk.openmm import * from openmm import *
from simtk.unit import * from openmm.unit import *
import simtk.openmm.app.element as elem import openmm.app.element as elem
if sys.version_info >= (3, 0): if sys.version_info >= (3, 0):
from io import StringIO from io import StringIO
else: else:
......
import unittest import unittest
from simtk.openmm.app import * from openmm.app import *
from simtk.openmm import * from openmm import *
from simtk.unit import * from openmm.unit import *
import simtk.openmm.app.element as elem import openmm.app.element as elem
import os import os
if sys.version_info >= (3, 0): if sys.version_info >= (3, 0):
from io import StringIO from io import StringIO
......
import unittest import unittest
from validateConstraints import * from validateConstraints import *
from simtk.openmm.app import * from openmm.app import *
from simtk.openmm import * from openmm import *
from simtk.unit import * from openmm.unit import *
import simtk.openmm import openmm
import simtk.openmm.app.element as elem import openmm.app.element as elem
import simtk.openmm.app.forcefield as forcefield import openmm.app.forcefield as forcefield
import copy import copy
import pickle import pickle
......
import unittest import unittest
from simtk.openmm import * from openmm import *
from simtk.openmm.app import * from openmm.app import *
from simtk.unit import * from openmm.unit import *
class TestSimulatedTempering(unittest.TestCase): class TestSimulatedTempering(unittest.TestCase):
"""Test the SimulatedTempering class""" """Test the SimulatedTempering class"""
......
import unittest import unittest
import tempfile import tempfile
from datetime import datetime, timedelta from datetime import datetime, timedelta
from simtk.openmm import * from openmm import *
from simtk.openmm.app import * from openmm.app import *
from simtk.unit import * from openmm.unit import *
class TestSimulation(unittest.TestCase): class TestSimulation(unittest.TestCase):
"""Test the Simulation class""" """Test the Simulation class"""
......
import unittest import unittest
import simtk.openmm as mm import openmm as mm
class TestSwigWrappers(unittest.TestCase): class TestSwigWrappers(unittest.TestCase):
......
import pickle import pickle
import sys import sys
import unittest import unittest
from simtk.openmm.app import * from openmm.app import *
from simtk.openmm import * from openmm import *
from simtk.unit import * from openmm.unit import *
import simtk.openmm.app.element as elem import openmm.app.element as elem
if sys.version_info >= (3, 0): if sys.version_info >= (3, 0):
from io import StringIO from io import StringIO
else: else:
......
import unittest import unittest
import math import math
from simtk.openmm import Vec3 from openmm import Vec3
from simtk.unit import * from openmm.unit import *
from simtk.openmm.app.internal.unitcell import computePeriodicBoxVectors from openmm.app.internal.unitcell import computePeriodicBoxVectors
from simtk.openmm.app.internal.unitcell import computeLengthsAndAngles from openmm.app.internal.unitcell import computeLengthsAndAngles
from simtk.openmm.app.internal.unitcell import reducePeriodicBoxVectors from openmm.app.internal.unitcell import reducePeriodicBoxVectors
def strip_units(x): def strip_units(x):
if is_quantity(x): return x.value_in_unit_system(md_unit_system) if is_quantity(x): return x.value_in_unit_system(md_unit_system)
......
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