From bb2a857ecf19e7178cc2281c17f46df627b2d0cb Mon Sep 17 00:00:00 2001 From: ingvar1995 Date: Fri, 26 Jan 2018 18:43:19 +0300 Subject: [PATCH] use opencv-python module on linux --- docs/install.md | 4 ++-- docs/plugins.md | 2 +- setup.py | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/install.md b/docs/install.md index 3f29b79..00f8188 100644 --- a/docs/install.md +++ b/docs/install.md @@ -17,7 +17,7 @@ Run app using ``toxygen`` command. 2. Install PortAudio: ``sudo apt-get install portaudio19-dev`` 3. For 32-bit Linux install PyQt5: ``sudo apt-get install python3-pyqt5`` -4. Install [OpenCV](http://docs.opencv.org/trunk/d7/d9f/tutorial_linux_install.html) or via ``sudo apt-get install python3-opencv`` +4. Install [OpenCV](http://docs.opencv.org/trunk/d7/d9f/tutorial_linux_install.html) or via ``sudo pip3 install opencv-python`` 5. Install toxygen: ``sudo pip3 install toxygen`` 6. Run toxygen using ``toxygen`` command. @@ -63,7 +63,7 @@ Optional: install toxygen using setup.py: ``python setup.py install`` 4. Install PyAudio: ``sudo apt-get install portaudio19-dev`` and ``sudo apt-get install python3-pyaudio`` (or ``sudo pip3 install pyaudio``) 5. Install NumPy: ``sudo pip3 install numpy`` -6. Install [OpenCV](http://docs.opencv.org/trunk/d7/d9f/tutorial_linux_install.html) or via ``sudo apt-get install python3-opencv`` +6. Install [OpenCV](http://docs.opencv.org/trunk/d7/d9f/tutorial_linux_install.html) or via ``sudo pip3 install opencv-python`` 7. [Download toxygen](https://github.com/toxygen-project/toxygen/archive/master.zip) 8. Unpack archive 9. Run app: diff --git a/docs/plugins.md b/docs/plugins.md index dc8c38d..98fbac8 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -1,6 +1,6 @@ # Plugins -Toxygen is the first [Tox](https://tox.chat/) client with plugins support. Plugin is Python 3.4 - 3.6 module (.py file) and directory with plugin's data which provide some additional functionality. +Toxygen is the first [Tox](https://tox.chat/) client with plugins support. Plugin is Python 3.5 - 3.6 module (.py file) and directory with plugin's data which provide some additional functionality. # How to write plugin diff --git a/setup.py b/setup.py index bc06944..746163e 100644 --- a/setup.py +++ b/setup.py @@ -25,6 +25,10 @@ else: import numpy except ImportError: MODULES.append('numpy') + try: + import cv2 + except ImportError: + MODULES.append('opencv-python') class InstallScript(install):