Merge pull request #27256 from mantidproject/develop-rpm-python2-qt5-devel

Switch to custom python2-qt5-devel for RHEL

CMakeLists.txt

@@ -387,7 +387,7 @@ if(ENABLE_CPACK)
       "sip >= 4.18,"
       "python-six,python-ipython >= 1.1.0,python-ipython-notebook,PyYAML,"
       "python-requests,"
-      "scipy,python2-scikit-image,"
+      "scipy,"
       "hdf,hdf5,jsoncpp >= 0.7.0")
     if(ENABLE_MANTIDPLOT)
       set(CPACK_RPM_PACKAGE_REQUIRES
@@ -395,7 +395,7 @@ if(ENABLE_CPACK)
     endif()
     if(ENABLE_WORKBENCH)
       set(CPACK_RPM_PACKAGE_REQUIRES
-          "${CPACK_RPM_PACKAGE_REQUIRES},qt5-qtbase,python-qt5")
+          "${CPACK_RPM_PACKAGE_REQUIRES},qt5-qtbase,python2-qt5")
     endif()
 
     if("${UNIX_CODENAME}" MATCHES "Santiago") # RHEL6
@@ -498,7 +498,6 @@ if(ENABLE_CPACK)
           "python3-matplotlib,"
           "python3-qtpy,"
           "python3-scipy,"
-          "python3-skimage,"
           "python3-pycifrw (>= 4.2.1),"
           "python3-yaml,"
           "ipython3-qtconsole") # transitional package for bionic
@@ -521,7 +520,6 @@ if(ENABLE_CPACK)
           "python-matplotlib,"
           "python-qtpy,"
           "python-scipy,"
-          "python-skimage,"
           "python-pycifrw (>= 4.2.1),"
           "python-yaml,"
           "ipython-qtconsole")

buildconfig/dev-packages/deb/mantid-developer/ns-control

@@ -42,7 +42,6 @@ Depends: git,
   python-setuptools,
   python-numpy,
   python-scipy,
-  python-skimage,
   python-qt4-dev,
   python-qt4-dbg,
   pyqt5-dev,
@@ -70,7 +69,6 @@ Depends: git,
   python3-qtpy,
   python3-numpy,
   python3-scipy,
-  python3-skimage,
   python3-sphinx,
   python3-sphinx-bootstrap-theme,
   python3-dateutil,

buildconfig/dev-packages/rpm/mantid-developer/mantid-developer.spec

@@ -5,7 +5,7 @@
 %endif
 
 Name:           mantid-developer
-Version:        1.33
+Version:        1.34
 Release:        1%{?dist}
 Summary:        Meta Package to install dependencies for Mantid Development
 
@@ -19,7 +19,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: clang
 %{?fedora:Requires: cmake-gui}
 %{?rhel:Requires: cmake3-gui}
-Requires: boost-devel
+Requires: boost169-devel
+Requires: boost169-python2-devel
 Requires: doxygen
 Requires: gperftools-devel
 Requires: gperftools-libs
@@ -40,15 +41,15 @@ Requires: numpy
 Requires: OCE-devel
 Requires: poco-devel >= 1.4.6
 Requires: PyQt4-devel
-Requires: python-qt5-devel
+Requires: python2-qt5-devel
 Requires: python-QtPy
 Requires: python-requests
 Requires: python-devel
 Requires: python-setuptools
 Requires: python-ipython >= 1.1
-Requires: python-matplotlib
-%{?fedora:Requires: python2-matplotlib-qt4}
-%{?el7:Requires: python-matplotlib-qt4}
+Requires: python2-matplotlib
+Requires: python2-matplotlib-qt4
+Requires: python2-matplotlib-qt4
 Requires: python-pip
 %{?fedora:Requires: python2-qtconsole}
 Requires: python-sphinx
@@ -63,7 +64,6 @@ Requires: qwtplot3d-qt4-devel
 Requires: redhat-lsb
 Requires: rpmdevtools
 Requires: scipy
-Requires: python2-scikit-image
 Requires: sip-devel
 Requires: tbb
 Requires: tbb-devel
@@ -91,7 +91,7 @@ Requires: graphviz
 Requires: python3-setuptools
 Requires: python3-sip-devel
 Requires: python3-PyQt4-devel
-Requires: python-qt5-devel
+Requires: python3-qt5-devel
 Requires: python3-QtPy
 Requires: python3-numpy
 Requires: python3-scipy
@@ -111,11 +111,17 @@ Requires: boost-python3-devel
 %endif
 
 %if 0%{?el7}
-Requires: boost-python36-devel
-Requires: python36-devel
-Requires: python36-h5py
+Requires: python36-setuptools
+Requires: python36-qt5-devel
 Requires: python36-numpy
+Requires: python36-scipy
+Requires: python36-sphinx
+Requires: python36-dateutil
 Requires: python36-PyYAML
+Requires: python36-mock
+Requires: python36-psutil
+Requires: python36-requests
+Requires: boost169-python3-devel
 %endif
 
 BuildArch: noarch
@@ -140,6 +146,19 @@ required for Mantid development.
 
 %changelog
 
+* Tue Nov 5 2019 Martyn Gigg <martyn.gigg@stfc.ac.uk>
+- Switch to python{2,3}-qt5-devel
+- Remove python2-scikit-image
+- Add remaining python36 packages that exist.
+  Missing:
+    * python36-h5py
+    * python36-qt4
+    * python36-QtPy
+    * python36-sphinx-bootstrap-theme
+    * python36-matplotlib
+    * python36-ipython-gui
+- Add boost169
+
 * Thu Jun 27 2019 Peter Peterson <petersonpf@ornl.gov>
 - Added python3 dependencies for framework on rhel7