fix PyQt installation via requirements files

PyQt is named differently in conda (PyQt) than in pip (PyQt5). This causes problems when assuming a particular package manager. .circleci/config.yaml assumes pip Makefile assumes conda/mamba This solution presents two different requirements files - one for each package manager.
widdowquinn · Mar 15, 2022 · 6ca62da · 6ca62da
1 parent 89955af
commit 6ca62da
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.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:

diff --git a/Makefile b/Makefile
@@ -8,6 +8,7 @@ setup_env:
 	@conda install --file requirements-dev.txt --yes
 	@conda install --file requirements.txt --yes
 	@conda install --file requirements-thirdparty.txt --yes
+	@conda install --file requirements-pyqt-conda.txt --yes
 	@pip install -r requirements-pip.txt
 	@pre-commit install
 	@pip install -U -e .

diff --git a/requirements-pyqt-conda.txt b/requirements-pyqt-conda.txt
@@ -0,0 +1,2 @@
+ete3
+PyQt5
diff --git a/requirements-pyqt-pip.txt b/requirements-pyqt-pip.txt
@@ -0,0 +1,2 @@
+ete3
+PyQt5
diff --git a/requirements.txt b/requirements.txt
@@ -1,13 +1,11 @@
 biopython
-ete3
 matplotlib
 namedlist
 networkx
 numpy
 openpyxl
 pandas
 Pillow
-PyQt
 scipy
 seaborn
 sqlalchemy