Merge pull request #22999 from martyngigg/psutil-developer-package

Add python psutil to developer packages

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

@@ -3,7 +3,7 @@ Priority: optional
 Standards-Version: 3.9.2
 
 Package: mantid-developer
-Version: 1.3.6
+Version: 1.3.7
 Maintainer: Mantid Project <mantid-tech@mantidproject.org>
 Priority: optional
 Architecture: all
@@ -61,6 +61,7 @@ Depends: git,
   python-h5py,
   python-yaml,
   python-mock,
+  python-psutil,
   ipython-qtconsole (>=1.2.0),
   texlive,
   texlive-latex-extra,
@@ -82,7 +83,8 @@ Depends: git,
   ipython3-qtconsole,
   python3-h5py,
   python3-yaml,
-  python3-mock
+  python3-mock,
+  python3-psutil
 Description: Installs all packages required for a Mantid developer
  A metapackage which requires all the dependencies and tools that are
  required for Mantid development. It works for Ubuntu 16.04.

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

@@ -5,7 +5,7 @@
 %endif
 
 Name:           mantid-developer
-Version:        1.27
+Version:        1.28
 Release:        1%{?dist}
 Summary:        Meta Package to install dependencies for Mantid Development
 
@@ -55,6 +55,7 @@ Requires: python-sphinx
 Requires: python2-sphinx-bootstrap-theme
 Requires: PyYAML
 Requires: python2-mock
+Requires: python2-psutil
 Requires: qscintilla-devel
 Requires: qt-devel >= 4.6
 Requires: qwt5-qt4-devel
@@ -103,6 +104,7 @@ Requires: python3-matplotlib
 %{?fedora:Requires: python3-qtconsole}
 Requires: python3-PyYAML
 Requires: python3-mock
+%{?fedora:Requires: python3-psutil}
 Requires: boost-python3-devel
 %endif
 
@@ -128,6 +130,9 @@ required for Mantid development.
 
 %changelog
 
+* Wed Jul 18 2018 Martyn Gigg <martyn.gigg@stfc.ac.uk>
+- Added python-psutil
+
 * Wed Apr 25 2018 Steven Hahn <hahnse@ornl.gov>
 - Add qt5-qtx11extras
 - remove RHEL6-specific packages