Merge branch 'master' into sy-update-pytest

broadinstitute · Jan 18, 2017 · 9709e0b · 9709e0b
2 parents ad26499 + 59d9b54
commit 9709e0b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
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

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: