Skip to content

Commit 64bad64

Browse files
authored
Merge pull request #110 from OpenPIV/cythonize
Cythonize
2 parents 4e8b154 + 71f779d commit 64bad64

File tree

99 files changed

+1301
-8148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+1301
-8148
lines changed

.travis.yml

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,14 @@
1-
os:
2-
- linux
3-
4-
sudo: false
5-
61
language: python
7-
82
python:
9-
- 2.7
10-
- 3.6
3+
- "3.7"
4+
- "3.6"
115

12-
before_install:
13-
# http://conda.pydata.org/docs/travis.html#the-travis-yml-file
14-
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
15-
- bash miniconda.sh -b -p $HOME/miniconda
16-
- export PATH="$HOME/miniconda/bin:$PATH"
17-
- hash -r
18-
- conda config --set always_yes yes --set changeps1 no
19-
- conda update -q conda
20-
- conda env create
21-
- source activate openpiv
6+
notifications:
7+
email: false
228

239
install:
24-
- python setup.py build_ext --inplace
25-
- python setup.py install
10+
- pip install -q numpy cython
11+
- python setup.py develop
2612

2713
script:
28-
- py.test
14+
- pytest openpiv

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"python.pythonPath": "/Users/alex/miniconda3/envs/openpiv3/bin/python"
3+
}

INSTALL

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Dependencies
66
============
77

88
OpenPIV would not have been possible if other great open source projects did not
9-
exist. We make extensive use of code and tools that other people have created, so
9+
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

1212
The dependencies are:
@@ -20,9 +20,9 @@ The dependencies are:
2020
On all the platforms, the binary Anaconda installation is recommended.
2121
Visit https://www.continuum.io/downloads
2222

23-
How to install the dependencies on Linux (detailed)
23+
How to install the dependencies on Linux (detailed)
2424
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
25-
On a Linux platform installing these dependencies should be trick. Often, if not always,
25+
On a Linux platform installing these dependencies should be trick. Often, if not always,
2626
python is installed by default, while the other dependencies should appear in your package
2727
manager.
2828

MANIFEST.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@ include INSTALL
55
include LICENSE.txt
66
include MILESTONES
77
include TODO
8-
recursive-include openpiv *.bat
98
recursive-include openpiv *.bmp
109
recursive-include openpiv *.ipynb
1110
recursive-include openpiv *.pdf
1211
recursive-include openpiv *.png
1312
recursive-include openpiv *.py
1413
recursive-include openpiv *.rst
1514
recursive-include openpiv *.tif
16-
recursive-include openpiv *.ui
1715
recursive-include openpiv *.zip
18-
recursive-include openpiv Makefile

environment.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

makeui.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

openpiv/data/defaults-processing-parameters.cfg

Lines changed: 0 additions & 59 deletions
This file was deleted.

openpiv/data/icons/configure.png

-1.8 KB
Binary file not shown.

openpiv/data/icons/exit.png

-1.87 KB
Binary file not shown.

openpiv/data/icons/filenew.png

-1.34 KB
Binary file not shown.

0 commit comments

Comments
 (0)