Update installation_instruction.rst

Author: alexlib

openpiv/docs/src/installation_instruction.rst

@@ -15,60 +15,17 @@ you should install them before you can use OpenPIV.
 
 The dependencies are:
 
-<<<<<<< HEAD
-* `Python 2.7 or 3.6 <http://python.org/>`_
-=======
+
 * `Python <http://python.org/>`_
->>>>>>> 2d4f48449c80e4fc0fd28dbaa87727a03ce5a992
 * `Scipy <http://numpy.scipy.org/>`_
 * `Numpy <http://www.scipy.org/>`_
 * `Cython <http://cython.org/>`_
 * `scikit-image <http://scikit-image.org/>`_
 
-<<<<<<< HEAD
-The following distributions that include Python with the required libraries are recommended for easy installations of dependencies:
-=======
 On all platforms, the following Python distribution is recommended:
->>>>>>> 2d4f48449c80e4fc0fd28dbaa87727a03ce5a992
-
-* Anaconda <https://store.continuum.io/cshop/anaconda/>  
-<<<<<<< HEAD
-* PythonXY <https://code.google.com/p/pythonxy/>  
-* WinPython <http://winpython.sourceforge.net/>  
-
-How to install the dependencies on Linux
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-On a Linux platform installing these dependencies should not be tricky. Often, if not always, 
-python is installed by default, while the other dependencies should appear in your package
-manager. 
-
-Thanks for the issue raised on our Github page, the Ubuntu installation should work as:   
-
-    sudo apt-get install cython python-numpy python-scipy
-    
-    pip2.7 install OpenPIV
-
-
-Using Conda 
-^^^^^^^^^^^
-
-    conda install -c conda-forge openpiv
- 
-Should include all the missing packages and automatically build the dependenices. 
-
-
-How to install the dependencies on Windows
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-On Windows all these dependencies, as well as several other useful packages, can be installed
-using one of the aforementioned distributions, e.g. Anaconda, PythonXY. Note: Install it in Custom Directories, 
-without spaces in the directory names (i.e. Program Files are prohibited), e.g. `C:\Pythonxy\`
 
+* Anaconda <https://store.continuum.io/cshop/anaconda/>   
 
-How to install the dependencies on a Mac
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-The binary (32 or 64 bit) Enthought Python Distribution (EPD) or Anaconda are recommended.  Note: if you use EPD Free distribution, you need to add and install Cython from http://www.cython.org
-=======
->>>>>>> 2d4f48449c80e4fc0fd28dbaa87727a03ce5a992
 
 Installation
 ============