Merge pull request #732 from mantidproject/remove_qt_from_meta_yaml

Removes pyqt and pyqt5 from meta.yaml for conda builds

Makefile

@@ -1,11 +1,7 @@
 AUTHENTICATION_PARAMS=--user $$UPLOAD_USER --token $$ANACONDA_API_TOKEN
 
 install-conda-env:
-	conda config --prepend channels conda-forge
-	conda config --prepend channels defaults
-	conda create -n mantidimaging -c mantid mantidimaging python=3.7
-	conda activate mantidimaging
-	pip install -U -r deps/pip-requirements.txt
+	source <(curl -s https://raw.githubusercontent.com/mantidproject/mantidimaging/master/install.sh)
 
 install-run-requirements:
 	conda install --yes --only-deps -c $$UPLOAD_USER mantidimaging

conda/meta.yaml

@@ -34,13 +34,11 @@ requirements:
     - requests-futures
     - python-socketio
     - h5py
-    - pyqt
-    - pyqtgraph=0.11
     - sarepy
     - psutil
 
 build:
-  number: 0
+  number: 1
   script:
     - {{ PYTHON }} -m pip install --ignore-installed .
 

docker/Dockerfile

@@ -6,14 +6,13 @@ RUN wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh &
     rm Miniconda3-latest-Linux-x86_64.sh
 
 # Copy the requirement files into the docker image for installing the dependencies
-COPY deps/pip-requirements.txt deps/dev-requirements.pip /opt/mantidimaging-deps/
+COPY deps/dev-requirements.pip /opt/mantidimaging-deps/
 
 SHELL ["/bin/bash", "-c"]
 
 RUN eval "$(/opt/miniconda/bin/conda shell.bash hook)" &&\
     ENVIRONMENT_NAME=mantidimaging_test REPO_LABEL=unstable source <(curl -s https://raw.githubusercontent.com/mantidproject/mantidimaging/master/install.sh) &&\
     conda activate mantidimaging_test &&\
-    pip install -r /opt/mantidimaging-deps/pip-requirements.txt &&\
     pip install -r /opt/mantidimaging-deps/dev-requirements.pip &&\
     conda clean --all
 

environment.yml

@@ -12,11 +12,11 @@ dependencies:
   - sarepy
   - astra-toolbox
   - pip:
-      - pyqtgraph
       - pytest
       - pytest-cov
       - coveralls
       - pyqt5==5.15
+      - pyqtgraph==0.11
       - yapf
       - mypy
       - flake8

install.sh

@@ -31,6 +31,6 @@ conda config --prepend channels mantid # for mantidimaging
 conda create -c mantid/label/${repo_label} -n ${env_name} mantidimaging
 
 conda activate ${env_name}
-pip install pyqt5==5.15
+pip install pyqt5==5.15 pyqtgraph==0.11
 
 conda config --set always_yes no

mantidimaging/__init__.py

@@ -1,8 +1,6 @@
 # Copyright (C) 2020 ISIS Rutherford Appleton Laboratory UKRI
 # SPDX - License - Identifier: GPL-3.0-or-later
 
-from mantidimaging import core, main, ipython  # noqa: F401
-
 __version__ = '1.1.0'
 """
 The gui package is not imported here, because it will pull in all of PyQt