Skip to content

Commit 2e8ab30

Browse files
authored
Merge pull request #216 from alexlib/master
merge the textual changes to readme and changes
2 parents 974151b + d4545be commit 2e8ab30

File tree

3 files changed

+5
-38
lines changed

3 files changed

+5
-38
lines changed

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ v0.23.2 - added mask_coordinats to preprocess, allows to use dynamic_masking to
1616
with the first_pass. Both first_pass and multi_pass now apply filtering externally
1717

1818
v0.23.6 - removed widim.pyx, no Cython modules anymore
19+
v0.23.7 - @ErichZimmer provided rectangular windows and we moved the test cases to another repo openpiv-python-examples
1920

INSTALL

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
========================
2-
Installation instruction
3-
========================
1+
=========================
2+
Installation instructions
3+
=========================
44

55
Dependencies
66
============
@@ -9,50 +9,16 @@ OpenPIV would not have been possible if other great open source projects did not
99
exist. We make extensive use of code and tools that other people have created, so
1010
you should install them before you can use OpenPIV.
1111

12-
The dependencies are:
12+
The main dependencies are:
1313

1414
* `python <http://python.org/>`_
1515
* `scipy <http://numpy.scipy.org/>`_
1616
* `numpy <http://www.scipy.org/>`_
17-
* `cython <http://cython.org/>`_
1817
* `scikit-image <http://scikit-image.org/>`_
1918

2019
On all the platforms, the binary Anaconda installation is recommended.
2120
Visit https://www.continuum.io/downloads
2221

23-
How to install the dependencies on Linux (detailed)
24-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
25-
On a Linux platform installing these dependencies should be trick. Often, if not always,
26-
python is installed by default, while the other dependencies should appear in your package
27-
manager.
28-
29-
/**
30-
Example of installation procedure on Ubuntu
31-
(tested for version 10.04 to 12.10)
32-
*open a terminal & install modules
33-
sudo apt-get install python-pip
34-
sudo apt-get install python-setuptools python-dev build-essential
35-
sudo pip install numpy
36-
sudo pip install
37-
sudo apt-get install libatlas-base-dev gfortran
38-
sudo pip install scipy
39-
sudo pip install cython
40-
sudo apt-get install python-matplotlib
41-
pip install -U scikit-image
42-
*you will need version 1.6.0 or later of the numpy module.
43-
*If pip cannot find the right version, easyinstall should work:
44-
sudo easyinstall numpy
45-
*now download openpiv source code and move to the openpiv directory
46-
*then install openpiv:
47-
sudo python setup.py install
48-
*open a new terminal & test openpiv
49-
openpiv
50-
*if you get an error such as "unknown module lib" try to logout or try to modify the PYTHONPATH variable by adding
51-
export PYTHONPATH=$PYTHONPATH:[path-to-openpiv-directory]
52-
to your ~/.bashrc file and then logout or:
53-
source ~/.bashrc
54-
**/
55-
5622

5723
Get OpenPIV source code!
5824
========================

openpiv/test/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)