Merge pull request #1074 from CodeMonkeyJan/NEW_scikit-image_dependency

Added dependency for scikit-image.

.travis.yml

@@ -24,7 +24,7 @@ before_install:
   - conda update --yes conda
 
 install:
-  - DEPS="nose numpy scipy matplotlib ipython h5py sympy scikit-learn dill natsort mock setuptools"
+  - DEPS="nose numpy scipy matplotlib ipython h5py sympy scikit-learn dill natsort mock setuptools scikit-image"
   - conda create -n testenv --yes python=$TRAVIS_PYTHON_VERSION $DEPS
   - source activate testenv
   - conda install pip

appveyor.yml

@@ -20,7 +20,7 @@ environment:
       CONDA_NPY: "19"
       WP_URL: 'https://github.com/winpython/winpython/releases/download/1.3.20160209/WinPython-32bit-3.5.1.2.exe'
       WP_CRC: '172d19a743ccfaf55af779d15f29f67fca83a46f08b0af855dfaf809b4184c0d'
-      DEPS: "numpy scipy matplotlib ipython h5py sympy scikit-learn dill mock setuptools natsort"
+      DEPS: "numpy scipy matplotlib ipython h5py sympy scikit-learn dill mock setuptools natsort scikit-image"
 
     - PYTHON: "C:\\Miniconda35-x64"
       PYTHON_VERSION: "3.5.x"
@@ -30,7 +30,7 @@ environment:
       CONDA_NPY: "19"
       WP_URL: 'https://github.com/winpython/winpython/releases/download/1.3.20160209/WinPython-64bit-3.5.1.2.exe'
       WP_CRC: '07e854b9aa7a31d8bbf7829d04a45b6d6266603690520e365199af2d98751ab1'
-      DEPS: "numpy scipy matplotlib ipython h5py sympy scikit-learn dill mock setuptools natsort"
+      DEPS: "numpy scipy matplotlib ipython h5py sympy scikit-learn dill mock setuptools natsort scikit-image"
 
 
 

doc/user_guide/install.rst

@@ -209,10 +209,10 @@ Installing the required libraries
 When installing HyperSpy using Python installers or from source the Python
 programming language and the following libraries must be installed in the
 system: numpy, scipy, matplotlib (>= 1.2), ipython, natsort, tqdm, traits and
-traitsui. For full functionality it is recommended to also install h5py and
-scikit-learn. In addition, since version 0.7.2 the lowess filter requires
-statsmodels. In Windows HyperSpy uses the Ipython's QtConsole and therefore Qt
-and PyQt or PySide are also required.
+traitsui. For full functionality it is recommended to also install h5py,
+scikit-image and scikit-learn. In addition, since version 0.7.2 the lowess
+filter requires statsmodels. In Windows HyperSpy uses the Ipython's 
+QtConsole and therefore Qt and PyQt or PySide are also required.
 
 
 In Debian/Ubuntu you can install the libraries as follows:
@@ -221,7 +221,8 @@ In Debian/Ubuntu you can install the libraries as follows:
 
     $ sudo apt-get install python-numpy python-matplotlib ipython
     ipython-notebook python-traits python-traitsui python-h5py
-    python-scikits-learn python-nose python-statsmodels python3-tqdm
+    python-scikit-learn python-scikit-image python-nose
+    python-statsmodels python3-tqdm
 
 In Arch Linux, the following command should install the required packages to
 get a fully functional installation:
@@ -232,7 +233,7 @@ get a fully functional installation:
     python2-traits python2-traitsui python2-h5py python2-scikit-learn python2-nose
     python2-statsmodels python2-pillow python2-pyqt4 python2-pyqt5 python2-scipy
     python2-pandas python2-setuptools ipython2	python2-jinja python2-pyzmq
-    python2-pyqt4 python2-tornado python2-sip python2-pygments
+    python2-pyqt4 python2-tornado python2-sip python2-pygments python2-scikit-image
 
     # Or, just run this command from the root hyperspy directory to import the
     # list of packages and install automatically:

stdeb.cfg

@@ -11,6 +11,7 @@ Depends:
     ipython-notebook,
     python-h5py,
     python-sklearn,
+    python-skimage,
     python-requests,
     python-sympy,
     python-setuptools,