Merge pull request #36 from calpolyccg/resolve_env_for_develop

Merge PR dropping 3.7 into Develop

environment.yml

@@ -12,6 +12,7 @@ dependencies:
   - pandas
   - pdbfixer
   - psi4
+  - pytest
   - pydantic
   - pytest-cov
   - pyyaml

mdsapt/__init__.py

@@ -7,7 +7,6 @@
 from .config import Config
 from .optimizer import Optimizer
 from .sapt import TrajectorySAPT
-from .viewer import Viewer
 
 # Handle versioneer
 from ._version import get_versions

mdsapt/viewer.py

@@ -5,6 +5,11 @@
 Allows for visualization of trajectories using `NGLView <http://nglviewer.org>`_
 in a Jupyter Notebook.
 
+.. note::
+    This module only works if NGLView is installed. It is likely not
+    automatically installed by your package manager because it is an optional
+    dependency.
+
 Required Input:
 
 - :class:`-mdsapt.reader.InputReader
@@ -17,7 +22,13 @@
 
 from typing import Union
 
-import nglview as nv
+try:
+    import nglview as nv
+except ImportError:
+    raise ImportError(
+        "nglview is not installed! Please install it to use the viewer module."
+    )
+
 import numpy as np
 
 from .sapt import TrajectorySAPT

meta.yaml

@@ -23,7 +23,6 @@ requirements:
   run:
     - psi4
     - mdanalysis
-    - nglview
     - numpy
     - openmm
     - pandas
@@ -39,6 +38,7 @@ test:
   requires:
     - pip
     - pytest
+    - nglview
   commands:
     - pip check
     # This is currently disabled because it does not work.