From 733090daec86648099262d427d9d95fb54b4ada0 Mon Sep 17 00:00:00 2001 From: Alex Liberzon Date: Thu, 14 Apr 2022 22:46:26 +0300 Subject: [PATCH] using Python 3.8, conda installation of swig --- README.md | 9 +++++++-- conda.recipe/meta.yaml | 2 +- pyptv/calibration_gui.py | 3 ++- requirements.txt | 22 ---------------------- setup.py | 18 ++++++++++-------- 5 files changed, 20 insertions(+), 34 deletions(-) delete mode 100644 requirements.txt diff --git a/README.md b/README.md index ef28cc7..223e1de 100644 --- a/README.md +++ b/README.md @@ -22,9 +22,14 @@ Both PyPTV and the OpenPTV library are in the development phase and continuously https://openptv-python.readthedocs.io/en/latest/installation_instruction.html - python -m pip install --upgrade pip + # python -m pip install --upgrade pip + conda create -n pyptv_py39 python=3.9 -y + conda activate pyptv_py39 + conda install swig -y pip install numpy - pip install pyptv --index-url https://pypi.fury.io/pyptv --extra-index-url https://pypi.org/simple + pip install git+https://github.com/enthought/enable + pip install optv --index-url https://pypi.fury.io/pyptv + pip install pyptv Follow the instructions in our **screencasts and tutorials**: diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index b0181b3..b7f3f20 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -1,6 +1,6 @@ package: name: pyptv - version: 0.2.1 + version: 0.1.7 source: path: .. diff --git a/pyptv/calibration_gui.py b/pyptv/calibration_gui.py index e66e359..143db59 100644 --- a/pyptv/calibration_gui.py +++ b/pyptv/calibration_gui.py @@ -15,7 +15,8 @@ ImagePlot, ArrayDataSource, LinearMapper # from traitsui.menu import MenuBar, ToolBar, Menu, Action from chaco.tools.image_inspector_tool import ImageInspectorTool -from chaco.tools.simple_zoom import SimpleZoom +from chaco.tools.better_zoom import BetterZoom as SimpleZoom +# from chaco.tools.simple_zoom import SimpleZoom from pyptv.text_box_overlay import TextBoxOverlay from pyptv.code_editor import codeEditor from pyptv.quiverplot import QuiverPlot diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 462d867..0000000 --- a/requirements.txt +++ /dev/null @@ -1,22 +0,0 @@ -chaco==4.8.0 -cycler==0.10.0 -decorator==4.4.1 -enable==4.8.1 -fonttools==4.0.2 -imageio==2.6.1 -kiwisolver==1.1.0 -matplotlib==3.1.1 -networkx==2.4 -numpy==1.17.3 -optv==0.2.6 -Pillow>=6.2.2 -pyface==6.1.2 -pyparsing==2.4.2 -python-dateutil==2.8.0 -PyWavelets==1.1.1 -PyYAML==5.4 -Pygments==2.7.4 -scikit-image==0.16.2 -scipy==1.3.1 -six==1.12.0 -traits==5.1.2 diff --git a/setup.py b/setup.py index b783fa7..907a133 100644 --- a/setup.py +++ b/setup.py @@ -1,18 +1,20 @@ from setuptools import setup requirements = [ -'chaco==4.8.0', -'enable==4.8.1', -'numpy==1.17.3', -'optv==0.2.6', -'PyQt5==5.12.2', -'scikit-image==0.16.2', -'Pygments==2.7.4', +'chaco', +'enable', +'numpy', +'optv', +'PyQt5', +'scikit-image', +'Pygments', +'six', +'imagecodecs' ] setup( name='pyptv', - version='0.1.4', + version='0.1.7', description='Python GUI for the OpenPTV library `liboptv`', author="Alex Liberzon", author_email='alex.liberzon@gmail.com',