Merge branch 'master' into sy-align-nosensitive

broadinstitute · Jan 18, 2017 · 8e2f230 · 8e2f230
2 parents 2bb5845 + a9f580f
commit 8e2f230
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/requirements-conda.txt b/requirements-conda.txt
@@ -2,6 +2,7 @@ blast=2.2.31
 bmtagger=3.101
 bwa=0.7.15
 diamond=0.8.22=2
+gatk=3.7
 kraken-all=0.10.6_eaf8fb68
 krona=2.7
 last=719
@@ -27,6 +28,6 @@ pysam=0.9.1
 pycodestyle
 mock==2.0.0
 six<2
-pytest=2.9.1
-pytest-cov=2.2.1
-pytest-xdist=1.14
+pytest=3.0.5
+pytest-cov=2.4.0
+pytest-xdist=1.15.0
diff --git a/requirements-tests.txt b/requirements-tests.txt
@@ -1,8 +1,8 @@
-pytest==3.0.3
+pytest==3.0.5
 coveralls==1.1
 pycodestyle
 mock==2.0.0
 six<2
-pytest-cov==2.2.1
+pytest-cov==2.4.0
 pytest-logging==2015.11.4
-pytest-xdist==1.14
+pytest-xdist==1.15.0
diff --git a/tools/__init__.py b/tools/__init__.py
@@ -475,7 +475,10 @@ def get_installed_version(self):
                 return # return rather than raise so we can fall back to the next install method
 
             if data and len(data):
-                installed_package_string = data[0]
+                if isinstance(data[0], dict):
+                    installed_package_string = data[0]["dist_name"]
+                else:
+                    installed_package_string = data[0]
                 package_info_re = re.compile(r"(?P<package_name>.*)-(?P<version>.*)-(?P<build_type>.*)")
                 matches = package_info_re.match(installed_package_string)
                 if matches: