Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
a810612e
Commit
a810612e
authored
6 years ago
by
Martyn Gigg
Browse files
Options
Downloads
Patches
Plain Diff
Add python psutil to developer packages
parent
495ae99d
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
buildconfig/dev-packages/deb/mantid-developer/ns-control
+4
-2
4 additions, 2 deletions
buildconfig/dev-packages/deb/mantid-developer/ns-control
buildconfig/dev-packages/rpm/mantid-developer/mantid-developer.spec
+6
-1
6 additions, 1 deletion
...g/dev-packages/rpm/mantid-developer/mantid-developer.spec
with
10 additions
and
3 deletions
buildconfig/dev-packages/deb/mantid-developer/ns-control
+
4
−
2
View file @
a810612e
...
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
buildconfig/dev-packages/rpm/mantid-developer/mantid-developer.spec
+
6
−
1
View file @
a810612e
...
...
@@ -5,7 +5,7 @@
%endif
Name: mantid-developer
Version: 1.2
7
Version: 1.2
8
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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment