Merge pull request #999 from ericpre/fix_dependency

add h5py dependency and numpy version >1.10 in setup.py
hyperspy · May 25, 2016 · 28a1120 · 28a1120
2 parents 41a834c + 1a07c74
commit 28a1120
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -45,13 +45,14 @@
 install_req = ['scipy',
                'ipython>=2.0',
                'matplotlib>=1.2',
-               'numpy',
+               'numpy>=1.10',
                'traits>=4.5.0',
                'traitsui>=5.0',
                'natsort',
                'requests',
                'setuptools',
-               'sympy']
+               'sympy',
+               'h5py']
 
 
 class update_version_when_dev:

diff --git a/stdeb.cfg b/stdeb.cfg
@@ -1,6 +1,6 @@
 [hyperspy]
 Depends:
-    python-numpy,
+    python-numpy (>= 1.10),
     python-scipy,
     python-matplotlib (>= 1.2),
     ipython (>= 2.0),
@@ -11,7 +11,6 @@ Depends:
     ipython-notebook,
     python-h5py,
     python-sklearn,
-    python-h5py
     python-requests
     python-sympy
     python-setuptools