Skip to content

Commit 6aa3335

Browse files
authored
Merge pull request #29 from calpolyccg/optional-nglview
Make NGLView an optional dependency
2 parents 2327cd4 + 32ef67b commit 6aa3335

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

environment.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ channels:
66
- conda-forge
77
- defaults
88
dependencies:
9-
- mdanalysis>=2.0.0, <2.1
10-
- nglview>=3.0.3, <3.1
9+
- mdanalysis
10+
- nglview
1111
- numpy
1212
- openmm
1313
- pandas
1414
- pdbfixer
1515
- psi4
16+
- pytest
1617
- pytest-cov
1718
- pyyaml
1819
- rdkit

mdsapt/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from .reader import InputReader
88
from .optimizer import Optimizer
99
from .sapt import TrajectorySAPT
10-
from .viewer import Viewer
1110

1211
# Handle versioneer
1312
from ._version import get_versions

mdsapt/viewer.py

+12-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
Allows for visualization of trajectories using `NGLView <http://nglviewer.org>`_
66
in a Jupyter Notebook.
77
8+
.. note::
9+
This module only works if NGLView is installed. It is likely not
10+
automatically installed by your package manager because it is an optional
11+
dependency.
12+
813
Required Input:
914
1015
- :class:`-mdsapt.reader.InputReader
@@ -17,7 +22,13 @@
1722

1823
from typing import Union
1924

20-
import nglview as nv
25+
try:
26+
import nglview as nv
27+
except ImportError:
28+
raise ImportError(
29+
"nglview is not installed! Please install it to use the viewer module."
30+
)
31+
2132
import numpy as np
2233

2334
from .sapt import TrajectorySAPT

meta.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ requirements:
2323
run:
2424
- psi4
2525
- mdanalysis
26-
- nglview
2726
- numpy
2827
- openmm
2928
- pandas
@@ -39,6 +38,7 @@ test:
3938
requires:
4039
- pip
4140
- pytest
41+
- nglview
4242
commands:
4343
- pip check
4444
# This is currently disabled because it does not work.

0 commit comments

Comments
 (0)