Merge pull request #551 into develop

jtriley · Dec 7, 2016 · 26fd305 · 26fd305
2 parents 54a61fd + 2ae2f91
commit 26fd305
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/starcluster/tests/conftest.py b/starcluster/tests/conftest.py
@@ -16,7 +16,10 @@
 # along with StarCluster. If not, see <http://www.gnu.org/licenses/>.
 
 import pytest
-from pytest_cov import CovPlugin
+try:
+    from pytest_cov.plugin import CovPlugin
+except:
+    from pytest_cov import CovPlugin
 
 from starcluster import static
 from starcluster import config as sconfig