Skip to content

Commit

Permalink
Merge branch 'master' into openpiv_updated
Browse files Browse the repository at this point in the history
  • Loading branch information
eguvep authored May 28, 2024
2 parents c7d72b3 + b1c3f65 commit 899e02b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,20 @@ Alternatively, Conda may also work:

```
conda install -c conda-forge openpivgui
```

### If you get an error about `np.int` consider this installation workaround:

```
conda create -n openpivgui python=3.12
conda activate openpivgui
pip install git+https://github.com/alexlib/openpiv-python-0.23.8
pip install openpivgui
python -m openpivgui.OpenPivGui
````
## Launching <a id=launching></a>
Launch `OpenPivGui` by executing:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
setuptools.setup(
name="openpivgui",
version="0.4.15",
install_requires=['OpenPiv', 'pandas'],
install_requires=['OpenPiv==0.25.3', 'pandas'],
author="P. Vennemann and contributors.",
author_email="[email protected]",
description="A simple GUI for Open PIV.",
Expand Down

0 comments on commit 899e02b

Please sign in to comment.