diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74fd74d66b31508df78f68ce00e8f59b3db361e2..1ae139707ee81d37a1aa019688f57d135afe3866 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -269,7 +269,7 @@ if ( ENABLE_CPACK )
# OCE
set( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},OCE-draw,OCE-foundation,OCE-modeling,OCE-ocaf,OCE-visualization")
set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},poco-crypto,poco-data,poco-mysql,poco-sqlite,poco-odbc,poco-util,poco-xml,poco-zip,poco-net,poco-netssl,poco-foundation,PyQt4,sip" )
- set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},python-six,python-ipython >= 1.1.0,python-ipython-notebook" )
+ set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},python-six,python-ipython >= 1.1.0,python-ipython-notebook,PyYAML" )
# scipy & matplotlib
set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},scipy,python-matplotlib" )
set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},mxml,hdf,hdf5,jsoncpp >= 0.7.0" )
@@ -320,7 +320,8 @@ if ( ENABLE_CPACK )
"python-scipy,"
"libtbb2,"
"libpocofoundation${POCO_SOLIB_VERSION},libpocoutil${POCO_SOLIB_VERSION},libpoconet${POCO_SOLIB_VERSION},libpoconetssl${POCO_SOLIB_VERSION},libpococrypto${POCO_SOLIB_VERSION},libpocoxml${POCO_SOLIB_VERSION},"
- "python-pycifrw (>= 4.2.1)" )
+ "python-pycifrw (>= 4.2.1),"
+ "python-yaml")
set ( PERFTOOLS_DEB_PACKAGE "libgoogle-perftools4 (>= 1.7)" )
if( "${UNIX_CODENAME}" STREQUAL "xenial")
list ( APPEND DEPENDS_LIST ", libhdf5-cpp-11,libnexus0v5 (>= 4.3),libjsoncpp1,libqscintilla2-12v5, libmuparser2v5,libqwtplot3d-qt4-0v5,libgsl2,liboce-foundation10,liboce-modeling10")
diff --git a/MantidPlot/make_package.rb.in b/MantidPlot/make_package.rb.in
index b3680e75b70e92ede43c563f6198befc8513c0f2..58be323a4f5efaf3a4e19090cf363ba0c5938db5 100755
--- a/MantidPlot/make_package.rb.in
+++ b/MantidPlot/make_package.rb.in
@@ -295,7 +295,7 @@ end
#Copy over python libraries not included with OSX.
#currently missing epics
path = "/Library/Python/2.7/site-packages"
-directories = ["sphinx","sphinx_bootstrap_theme","IPython","zmq","pygments","backports","certifi","tornado","markupsafe","jinja2","psutil","jsonschema","functools32","ptyprocess","CifFile"]
+directories = ["sphinx","sphinx_bootstrap_theme","IPython","zmq","pygments","backports","certifi","tornado","markupsafe","jinja2","psutil","jsonschema","functools32","ptyprocess","CifFile","yaml"]
directories.each do |directory|
addPythonLibrary("#{path}/#{directory}","Contents/MacOS/")
end
diff --git a/buildconfig/CMake/Bootstrap.cmake b/buildconfig/CMake/Bootstrap.cmake
index cf21cd8d4a9d1d1e9bcd84f0e00d6a48588d668b..d23336920f9bd8ecb9657c42bcdfc7e1d5b07d5b 100644
--- a/buildconfig/CMake/Bootstrap.cmake
+++ b/buildconfig/CMake/Bootstrap.cmake
@@ -10,7 +10,7 @@ if( MSVC )
include ( ExternalProject )
set( EXTERNAL_ROOT ${PROJECT_SOURCE_DIR}/external )
set( THIRD_PARTY_GIT_URL "https://github.com/mantidproject/thirdparty-msvc2015.git" )
- set ( THIRD_PARTY_GIT_SHA1 68ee6fc88cfaa1c369a5fe8460c52b7bd266d3ad )
+ set ( THIRD_PARTY_GIT_SHA1 d3d733e772a57b18b663f3b79439a068bb00a71c )
set ( THIRD_PARTY_DIR ${EXTERNAL_ROOT}/src/ThirdParty )
# Generates a script to do the clone/update in tmp
set ( _project_name ThirdParty )
diff --git a/buildconfig/dev-packages/deb/mantid-developer/README b/buildconfig/dev-packages/deb/mantid-developer/README
index 45484a4c965290f18bb3e5aa6fa3658f7ad1358f..0b684d4f9f4fe7d604251f4e6d03cc34322f986c 100644
--- a/buildconfig/dev-packages/deb/mantid-developer/README
+++ b/buildconfig/dev-packages/deb/mantid-developer/README
@@ -1,6 +1,12 @@
-This directory contains the structure required to build the simple mantid-developer debian file.
+This directory contains an ns-control file designed to be interpreted with the
+`equivs-build` command from the `equivs` debian package. This will need to be
+install via apt:
+
+```
+apt-get install equivs
+```
To build the package:
* Switch to the directory containing this file
- * Run "dpkg --build mantid-developer/mantid-developer-1.2.7"
- * A file called mantid-developer-1.2.7.deb will appear in the mantid-developer directory.
+ * Run `equivs-build ns-control`
+ * A file called mantid-developer_x.y.z.deb will appear in this directory.
diff --git a/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.1/DEBIAN/control b/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.1/DEBIAN/control
deleted file mode 100644
index 92c2c310e02fe35e7875dc1c55ec1eda16278a13..0000000000000000000000000000000000000000
--- a/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.1/DEBIAN/control
+++ /dev/null
@@ -1,11 +0,0 @@
-Package: mantid-developer
-Version: 1.2.1
-Section: main
-Priority: optional
-Architecture: all
-Depends: git, cmake-qt-gui(>=2.8.12), qt4-qmake, qt4-dev-tools, libpoco-dev, libboost-all-dev, libnexus0-dev, libgoogle-perftools-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, python-qt4-dev, libgsl0-dev, liboce-visualization-dev, libmuparser-dev, python-numpy, libssl-dev, libqscintilla2-dev, texlive,texlive-latex-extra, dvipng, libhdf4-dev, doxygen, python-sphinx, python-scipy, ipython-qtconsole (>=1.2.0), libhdf5-dev, libhdf4-dev, libpococrypto9-dbg, libpocodata9-dbg, libpocofoundation9-dbg, libpocomysql9-dbg, libpoconet9-dbg, libpoconetssl9-dbg, libpocoodbc9-dbg, libpocosqlite9-dbg, libpocoutil9-dbg, libpocoxml9-dbg, libpocozip9-dbg, python-qt4-dbg, qt4-default, ninja-build
-Installed-Size: 0
-Maintainer: Mantid Project <mantid-help@mantidproject.org>
-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 version 14.04
diff --git a/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.2/DEBIAN/control b/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.2/DEBIAN/control
deleted file mode 100644
index 1f541e4af9b7e5d6276d965254550efb2b8d2a25..0000000000000000000000000000000000000000
--- a/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.2/DEBIAN/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Package: mantid-developer
-Version: 1.2.2
-Section: main
-Priority: optional
-Architecture: all
-Depends: git, cmake-qt-gui(>=2.8.12), qt4-qmake, qt4-dev-tools, libqt4-dbg, libpoco-dev(>=1.4.2), libboost-all-dev, libboost-dbg, libnexus0-dev, libgoogle-perftools-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, python-qt4-dev, libgsl0-dev, liboce-visualization-dev, libmuparser-dev, python-numpy, libssl-dev, libqscintilla2-dev, texlive,texlive-latex-extra, dvipng, libhdf4-dev, doxygen, python-sphinx, python-scipy, ipython-qtconsole (>=1.2.0), libhdf5-dev, libhdf4-dev, libpococrypto11-dbg, libpocodata11-dbg, libpocofoundation11-dbg, libpocomysql11-dbg, libpoconet11-dbg, libpoconetssl11-dbg, libpocoodbc11-dbg, libpocosqlite11-dbg, libpocoutil11-dbg, libpocoxml11-dbg, libpocozip11-dbg, python-qt4-dbg, qt4-default, ninja-build, libjsoncpp-dev, python-dateutil
-Installed-Size: 0
-Maintainer: Mantid Project <mantid-help@mantidproject.org>
-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 version 14.04, 14.10
- Some packages (poco) must be newer than thiose in the Ubuntu repository. Please
- follow instructions at http://www.mantidproject.org/Mantid_Prerequisites#Repositories
diff --git a/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.3/DEBIAN/control b/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.3/DEBIAN/control
deleted file mode 100644
index 5d0abce474b78c18fa84bc3d1fd744ec2304d911..0000000000000000000000000000000000000000
--- a/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.3/DEBIAN/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Package: mantid-developer
-Version: 1.2.3
-Section: main
-Priority: optional
-Architecture: all
-Depends: git, clang, cmake-qt-gui(>=2.8.12), qt4-qmake, qt4-dev-tools, libqt4-dbg, libpoco-dev(>=1.4.2), libboost-all-dev, libboost-dbg, libnexus0-dev, libgoogle-perftools-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, python-qt4-dev, libgsl0-dev, liboce-visualization-dev, libmuparser-dev, python-numpy, libssl-dev, libqscintilla2-dev, texlive, texlive-latex-extra, dvipng, libhdf4-dev, doxygen, python-sphinx, python-scipy, ipython-qtconsole (>=1.2.0), libhdf5-dev, libhdf4-dev, libpococrypto11-dbg, libpocodata11-dbg, libpocofoundation11-dbg, libpocomysql11-dbg, libpoconet11-dbg, libpoconetssl11-dbg, libpocoodbc11-dbg, libpocosqlite11-dbg, libpocoutil11-dbg, libpocoxml11-dbg, libpocozip11-dbg, python-qt4-dbg, qt4-default, ninja-build, libjsoncpp-dev, python-dateutil, python-sphinx-bootstrap-theme
-Installed-Size: 0
-Maintainer: Mantid Project <mantid-help@mantidproject.org>
-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 version 14.04, 14.10
- Some packages (poco) must be newer than thiose in the Ubuntu repository. Please
- follow instructions at http://www.mantidproject.org/Mantid_Prerequisites#Repositories
diff --git a/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.4/DEBIAN/control b/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.4/DEBIAN/control
deleted file mode 100644
index 469c1f027e338df71632c5bb7c14508ac7ad38db..0000000000000000000000000000000000000000
--- a/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.4/DEBIAN/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Package: mantid-developer
-Version: 1.2.4
-Section: main
-Priority: optional
-Architecture: all
-Depends: g++, git, clang, cmake-qt-gui(>=2.8.12), qt4-qmake, qt4-dev-tools, libqt4-dbg, libpoco-dev(>=1.4.2), libboost-all-dev, libboost-dbg, libnexus0-dev, libgoogle-perftools-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, python-qt4-dev, libgsl0-dev, liboce-visualization-dev, libmuparser-dev, python-numpy, libssl-dev, libqscintilla2-dev, texlive,texlive-latex-extra, dvipng, libhdf4-dev, doxygen, python-sphinx, python-scipy, ipython-qtconsole (>=1.2.0), libhdf5-dev, libhdf4-dev, libpococrypto11-dbg, libpocodata11-dbg, libpocofoundation11-dbg, libpocomysql11-dbg, libpoconet11-dbg, libpoconetssl11-dbg, libpocoodbc11-dbg, libpocosqlite11-dbg, libpocoutil11-dbg, libpocoxml11-dbg, libpocozip11-dbg, python-qt4-dbg, qt4-default, ninja-build, libjsoncpp-dev, python-dateutil, python-sphinx-bootstrap-theme, graphviz
-Installed-Size: 0
-Maintainer: Mantid Project <mantid-help@mantidproject.org>
-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 version 14.04, 14.10
- Some packages (poco) must be newer than those in the Ubuntu repository. Please
- follow instructions at http://www.mantidproject.org/Mantid_Prerequisites#Repositories
diff --git a/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.5/DEBIAN/control b/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.5/DEBIAN/control
deleted file mode 100644
index 58b0055b7d4190626264169468d9cff5a00aad29..0000000000000000000000000000000000000000
--- a/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.5/DEBIAN/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Package: mantid-developer
-Version: 1.2.5
-Section: main
-Priority: optional
-Architecture: all
-Depends: g++, git, clang, cmake-qt-gui(>=2.8.12), qt4-qmake, qt4-dev-tools, libqt4-dbg, libpoco-dev(>=1.4.2), libboost-all-dev, libboost-dbg, libnexus0-dev, libgoogle-perftools-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, python-qt4-dev, libgsl0-dev, liboce-visualization-dev, libmuparser-dev, python-numpy, libssl-dev, libqscintilla2-dev, texlive,texlive-latex-extra, dvipng, libhdf4-dev, doxygen, python-sphinx, python-scipy, ipython-qtconsole (>=1.2.0), libhdf5-dev, libhdf4-dev, libpococrypto11-dbg, libpocodata11-dbg, libpocofoundation11-dbg, libpocomysql11-dbg, libpoconet11-dbg, libpoconetssl11-dbg, libpocoodbc11-dbg, libpocosqlite11-dbg, libpocoutil11-dbg, libpocoxml11-dbg, libpocozip11-dbg, python-qt4-dbg, qt4-default, ninja-build, libjsoncpp-dev, python-dateutil, python-sphinx-bootstrap-theme, graphviz, python-matplotlib
-Installed-Size: 0
-Maintainer: Mantid Project <mantid-help@mantidproject.org>
-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 version 14.04, 14.10
- Some packages (poco) must be newer than those in the Ubuntu repository. Please
- follow instructions at http://www.mantidproject.org/Mantid_Prerequisites#Repositories
diff --git a/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.6/DEBIAN/control b/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.6/DEBIAN/control
deleted file mode 100644
index 5366d7ae0ba161f0f8836bddf2708ec50eca9d83..0000000000000000000000000000000000000000
--- a/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.6/DEBIAN/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Package: mantid-developer
-Version: 1.2.6
-Section: main
-Priority: optional
-Architecture: all
-Depends: g++, git, clang, cmake-qt-gui(>=2.8.12), qt4-qmake, qt4-dev-tools, libqt4-dbg, libpoco-dev(>=1.4.2), libboost-all-dev, libboost-dbg, libnexus0-dev, libgoogle-perftools-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, python-qt4-dev, libgsl0-dev, liboce-visualization-dev, libmuparser-dev, python-numpy, libssl-dev, libqscintilla2-dev, texlive,texlive-latex-extra, dvipng, libhdf4-dev, doxygen, python-sphinx, python-scipy, ipython-qtconsole (>=1.2.0), libhdf5-dev, libhdf4-dev, libpococrypto11-dbg, libpocodata11-dbg, libpocofoundation11-dbg, libpocomysql11-dbg, libpoconet11-dbg, libpoconetssl11-dbg, libpocoodbc11-dbg, libpocosqlite11-dbg, libpocoutil11-dbg, libpocoxml11-dbg, libpocozip11-dbg, python-qt4-dbg, qt4-default, ninja-build, libjsoncpp-dev(>=0.7.0), python-dateutil, python-sphinx-bootstrap-theme, graphviz, python-matplotlib
-Installed-Size: 0
-Maintainer: Mantid Project <mantid-help@mantidproject.org>
-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 version 14.04, 14.10
- Some packages (poco) must be newer than those in the Ubuntu repository. Please
- follow instructions at http://www.mantidproject.org/Mantid_Prerequisites#Repositories
diff --git a/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2/DEBIAN/control b/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2/DEBIAN/control
deleted file mode 100644
index dd5fd1fd043e3439fdc18befa2b845e998c2f6e2..0000000000000000000000000000000000000000
--- a/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2/DEBIAN/control
+++ /dev/null
@@ -1,11 +0,0 @@
-Package: mantid-developer
-Version: 1.2
-Section: main
-Priority: optional
-Architecture: all
-Depends: git, cmake-qt-gui(>=2.8.12), qt4-qmake, qt4-dev-tools, libpoco-dev, libboost-all-dev, libnexus0-dev, libgoogle-perftools-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, python-qt4-dev, libgsl0-dev, liboce-visualization-dev, libmuparser-dev, python-numpy, libssl-dev, libqscintilla2-dev, texlive-latex-extra, dvipng, libhdf4-dev, doxygen, python-sphinx, python-scipy, ipython-qtconsole (>=1.2.0), libhdf5-dev, libhdf4-dev, libpococrypto9-dbg, libpocodata9-dbg, libpocofoundation9-dbg, libpocomysql9-dbg, libpoconet9-dbg, libpoconetssl9-dbg, libpocoodbc9-dbg, libpocosqlite9-dbg, libpocoutil9-dbg, libpocoxml9-dbg, libpocozip9-dbg, python-qt4-dbg, qt4-default, ninja-build
-Installed-Size: 0
-Maintainer: Mantid Project <mantid-help@mantidproject.org>
-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 version 14.04
diff --git a/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.7/DEBIAN/control b/buildconfig/dev-packages/deb/mantid-developer/ns-control
similarity index 89%
rename from buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.7/DEBIAN/control
rename to buildconfig/dev-packages/deb/mantid-developer/ns-control
index 1e53974118c58f8fd376201f1311bfe5278d3a24..e23b3457d014603c4415c83ba03667a110d9d841 100644
--- a/buildconfig/dev-packages/deb/mantid-developer/mantid-developer-1.2.7/DEBIAN/control
+++ b/buildconfig/dev-packages/deb/mantid-developer/ns-control
@@ -1,13 +1,17 @@
-Package: mantid-developer
-Version: 1.2.7
Section: main
Priority: optional
-Architecture: all
-Depends: g++, git, clang, cmake-qt-gui(>=2.8.12), qt4-qmake, qt4-dev-tools, libqtwebkit-dev, libqt4-dbg, libpoco-dev(>=1.4.6), libboost-all-dev, libboost-dbg, libnexus0-dev, libgoogle-perftools-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, python-qt4-dev, libgsl0-dev, liboce-visualization-dev, libmuparser-dev, python-numpy, libssl-dev, libqscintilla2-dev, texlive,texlive-latex-extra, dvipng, libhdf4-dev, doxygen, python-sphinx, python-scipy, ipython-qtconsole (>=1.2.0), libhdf5-dev, libhdf4-dev, libpococrypto11-dbg, libpocodata11-dbg, libpocofoundation11-dbg, libpocomysql11-dbg, libpoconet11-dbg, libpoconetssl11-dbg, libpocoodbc11-dbg, libpocosqlite11-dbg, libpocoutil11-dbg, libpocoxml11-dbg, libpocozip11-dbg, python-qt4-dbg, qt4-default, ninja-build, libjsoncpp-dev(>=0.7.0), python-dateutil, python-sphinx-bootstrap-theme, graphviz, python-matplotlib, python-h5py
-Installed-Size: 0
+Standards-Version: 3.9.2
+
+Package: mantid-developer
+Version: 1.2.8
Maintainer: Mantid Project <mantid-help@mantidproject.org>
+Priority: optional
+Architecture: all
+Depends: g++, git, clang, cmake-qt-gui(>=2.8.12), qt4-qmake, qt4-dev-tools, libqtwebkit-dev, libqt4-dbg, libpoco-dev(>=1.4.6), libboost-all-dev, libboost-dbg, libnexus0-dev, libgoogle-perftools-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, python-qt4-dev, libgsl0-dev, liboce-visualization-dev, libmuparser-dev, python-numpy, libssl-dev, libqscintilla2-dev, texlive,texlive-latex-extra, dvipng, libhdf4-dev, doxygen, python-sphinx, python-scipy, ipython-qtconsole (>=1.2.0), libhdf5-dev, libhdf4-dev, libpococrypto11-dbg, libpocodata11-dbg, libpocofoundation11-dbg, libpocomysql11-dbg, libpoconet11-dbg, libpoconetssl11-dbg, libpocoodbc11-dbg, libpocosqlite11-dbg, libpocoutil11-dbg, libpocoxml11-dbg, libpocozip11-dbg, python-qt4-dbg, qt4-default, ninja-build, libjsoncpp-dev(>=0.7.0), python-dateutil, python-sphinx-bootstrap-theme, graphviz, python-matplotlib, python-h5py, python-yaml
+Architecture: all
Description: Installs all packages required for a Mantid developer
- A metapackage which requires all the dependencies and tools that are
+ A metapackage which requires all the dependencies and tools that are
required for Mantid development. It works for Ubuntu versions 14.04 and 16.04
- Some packages (poco) must be newer than those in the Ubuntu repository. Please
+ Some packages (poco) must be newer than those in the Ubuntu repository. Please
follow instructions at http://www.mantidproject.org/Mantid_Prerequisites#Repositories
+Installed-Size: 0
diff --git a/buildconfig/dev-packages/rpm/mantid-developer/mantid-developer.spec b/buildconfig/dev-packages/rpm/mantid-developer/mantid-developer.spec
index 1224556100e5e39069e98b6e675f30464951b4eb..6c9cda162334138f0016646dc2475d9e8c6ac119 100644
--- a/buildconfig/dev-packages/rpm/mantid-developer/mantid-developer.spec
+++ b/buildconfig/dev-packages/rpm/mantid-developer/mantid-developer.spec
@@ -1,5 +1,5 @@
Name: mantid-developer
-Version: 1.19
+Version: 1.20
Release: 1%{?dist}
Summary: Meta Package to install dependencies for Mantid Development
@@ -49,6 +49,7 @@ Requires: python-matplotlib
Requires: python-pip
Requires: python-sphinx
Requires: python-sphinx-theme-bootstrap
+Requires: PyYAML
Requires: qscintilla-devel
Requires: qt-devel >= 4.6
%if 0%{?el6}
@@ -118,6 +119,9 @@ required for Mantid development.
%files
%changelog
+* Fri Nov 18 2016 Martyn Gigg <martyn.gigg@stfc.ac.uk>
+- Require PyYAML
+
* Fri Sep 23 2016 Stuart Campbell <campbellsi@ornl.gov>
- Require poco >= 1.4.6