updates after code review

Author: dwhswenson

paths_cli/tests/wizard/conftest.py

@@ -3,6 +3,7 @@
 import openpathsampling as paths
 import mdtraj as md
 
+# should be able to remove this try block when we drop OpenMM < 7.6
 try:
     import openmm as mm
     from openmm import unit as u
@@ -22,8 +23,9 @@ def ad_openmm(tmpdir):
     """
     Provide directory with files to start alanine depeptide sim in OpenMM
     """
+    # switch back to importorskip when we drop OpenMM < 7.6
     if not HAS_OPENMM:
-        pytest.skip()
+        pytest.skip("could not import openmm")
     # mm = pytest.importorskip('simtk.openmm')
     # u = pytest.importorskip('simtk.unit')
     openmmtools = pytest.importorskip('openmmtools')

paths_cli/tests/wizard/test_openmm.py

@@ -8,6 +8,7 @@
     _load_openmm_xml, _load_topology, openmm, OPENMM_SERIALIZATION_URL
 )
 
+# should be able to remove this try block when we drop OpenMM < 7.6
 try:
     import openmm as mm
 except ImportError:
@@ -25,8 +26,9 @@ def test_helper_url():
 
 @pytest.mark.parametrize('obj_type', ['system', 'integrator', 'foo'])
 def test_load_openmm_xml(ad_openmm, obj_type):
+    # switch back to importorskip when we drop OpenMM < 7.6
     if not HAS_OPENMM:
-        pytest.skip()
+        pytest.skip("could not import openmm")
     # mm = pytest.importorskip("simtk.openmm")
     filename = f"{obj_type}.xml"
     inputs = [filename]

paths_cli/wizard/openmm.py

@@ -1,5 +1,7 @@
 from paths_cli.wizard.errors import FILE_LOADING_ERROR_MSG, not_installed
 from paths_cli.wizard.core import get_object
+
+# should be able to simplify this try block when we drop OpenMM < 7.6
 try:
     import openmm as mm
 except ImportError: