Merge branch 'master' into issue_377

.circleci/config.yml

@@ -79,6 +79,7 @@ jobs:
             pip install -r requirements.txt
             pip install -r requirements-dev.txt
             pip install -r requirements-pip.txt
+            pip install -r requirements-pyqt-pip.txt
 
       - save_cache:
           paths:

Makefile

@@ -9,6 +9,7 @@ setup_env:
 	@conda install --file requirements.txt --yes
 	@conda install --file requirements-thirdparty.txt --yes
 	@conda install --file requirements-fastani.txt --yes
+	@conda install --file requirements-pyqt-conda.txt --yes
 	@pip install -r requirements-pip.txt
 	@pre-commit install
 	@pip install -U -e .

pyani/dependencies.py

@@ -43,6 +43,7 @@
 from .anib import get_version as get_blast_version
 from .aniblastall import get_version as get_blastall_version
 from .anim import get_version as get_nucmer_version
+from .fastani import get_version as get_fastani_version
 
 # Dict of dependencies that support pyani
 REQUIREMENTS = [
@@ -113,5 +114,6 @@ def get_tool_versions() -> Generator:
         ("blast+", get_blast_version),
         ("nucmer", get_nucmer_version),
         ("blastall", get_blastall_version),
+        ("fastani", get_fastani_version),
     ]:
         yield (name, func())

requirements-pyqt-conda.txt

@@ -0,0 +1,3 @@
+ete3
+pyqt
+

requirements-pyqt-pip.txt

@@ -0,0 +1,2 @@
+ete3
+PyQt5

requirements.txt

@@ -1,13 +1,11 @@
 biopython
-ete3
 matplotlib
 namedlist
 networkx
 numpy
 openpyxl
 pandas
 Pillow
-PyQt5
 scipy
 seaborn
 sqlalchemy