From 5932d8cb847e7327100b1845e5e880c8008f5d52 Mon Sep 17 00:00:00 2001 From: ingvar1995 Date: Sat, 24 Jun 2017 15:44:55 +0300 Subject: [PATCH] installation docs update --- docs/install.md | 69 +++++++++++++++++++------------------------------ setup.py | 17 ++++-------- 2 files changed, 31 insertions(+), 55 deletions(-) diff --git a/docs/install.md b/docs/install.md index 808eb93..589d559 100644 --- a/docs/install.md +++ b/docs/install.md @@ -1,13 +1,13 @@ # How to install Toxygen -## Use precompiled binary: +## Use precompiled binary (recommended for users): [Check our releases page](https://github.com/toxygen-project/toxygen/releases) ## Using pip3 ### Windows -``pip3.4 install toxygen`` +``pip install toxygen`` Run app using ``toxygen`` command. @@ -16,19 +16,11 @@ Run app using ``toxygen`` command. 1. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system (install in /usr/lib/) 2. Install PortAudio: ``sudo apt-get install portaudio19-dev`` -3. Install PySide: ``sudo apt-get install python3-pyside`` -4. Install toxygen: -``sudo pip3.4 install toxygen`` -5. Run toxygen using ``toxygen`` command. - -### OS X - -1. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system -2. Install PortAudio: -``brew install portaudio`` -3. Install toxygen: -``pip3.4 install toxygen`` -4. Run toxygen using ``toxygen`` command. +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) +5. Install toxygen: +``sudo pip3 install toxygen`` +6. Run toxygen using ``toxygen`` command. ## Packages @@ -40,15 +32,18 @@ Debian/Ubuntu: [tox.chat](https://tox.chat/download.html#gnulinux) ### Windows -1. [Download and install latest Python 3.4](https://www.python.org/downloads/windows/) -2. [Install PySide](https://pypi.python.org/pypi/PySide/1.2.4#installing-pyside-on-a-windows-system) (recommended) or [PyQt4](https://riverbankcomputing.com/software/pyqt/download) -3. Install PyAudio: ``pip3.4 install pyaudio`` -4. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip) -5. Unpack archive -6. Download latest libtox.dll build, download latest libsodium.a build, put it into \src\libs\ -7. Run \toxygen\main.py. +Note: 32-bit Python isn't supported due to bug with videocalls. It is strictly recommended to use 64-bit Python. -Optional: install toxygen using setup.py: ``python3.4 setup.py install`` +1. [Download and install latest Python 3 64-bit](https://www.python.org/downloads/windows/) +2. Install PyQt5: ``pip install pyqt5`` +3. Install PyAudio: ``pip install pyaudio`` +4. Download [numpy](http://www.lfd.uci.edu/~gohlke/pythonlibs/#numpy) and [OpenCV](http://www.lfd.uci.edu/~gohlke/pythonlibs/#opencv). Install it using ``pip install ``. +5. [Download toxygen](https://github.com/toxygen-project/toxygen/archive/master.zip) +6. Unpack archive +7. Download latest libtox.dll build, download latest libsodium.a build, put it into \src\libs\ +8. Run \toxygen\main.py. + +Optional: install toxygen using setup.py: ``python setup.py install`` [libtox.dll for 32-bit Python](https://build.tox.chat/view/libtoxcore/job/libtoxcore_build_windows_x86_shared_release/lastSuccessfulBuild/artifact/libtoxcore_build_windows_x86_shared_release.zip) @@ -62,27 +57,15 @@ Optional: install toxygen using setup.py: ``python3.4 setup.py install`` 1. Install latest Python3: ``sudo apt-get install python3`` -2. Install PySide: ``sudo apt-get install python3-pyside`` or install [PyQt4](https://riverbankcomputing.com/software/pyqt/download) (``sudo apt-get install python3-pyqt4``). +2. Install PyQt5: ``sudo apt-get install python3-pyqt5`` or ``sudo pip3 install pyqt5`` 3. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system (install in /usr/lib/) 4. Install PyAudio: -``sudo apt-get install portaudio19-dev`` and ``sudo apt-get install python3-pyaudio`` (or ``pip3 install pyaudio``) -5. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip) -6. Unpack archive -7. Run app: -``python3.4 main.py`` - -Optional: install toxygen using setup.py: ``python3.4 setup.py install`` - -### OS X - -1. [Download and install latest Python 3.4](https://www.python.org/downloads/mac-osx/) -2. [Install PySide](https://pypi.python.org/pypi/PySide/1.2.4#installing-pyside-on-a-mac-os-x-system) (recommended) or [PyQt4](https://riverbankcomputing.com/software/pyqt/download) -3. Install PortAudio: -``brew install portaudio`` -4. Install PyAudio: ``pip3 install pyaudio`` -5. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system -6. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip) -7. Unpack archive -8. Run \toxygen\main.py. +``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) +7. [Download toxygen](https://github.com/toxygen-project/toxygen/archive/master.zip) +8. Unpack archive +9. Run app: +``python3 main.py`` Optional: install toxygen using setup.py: ``python3 setup.py install`` diff --git a/setup.py b/setup.py index 82526c1..f069665 100644 --- a/setup.py +++ b/setup.py @@ -8,20 +8,13 @@ import sys version = program_version + '.0' -MODULES = ['numpy', 'PyQt5'] - -if system() in ('Windows', 'Darwin'): - MODULES.append('PyAudio') -else: - try: - import pyaudio - except ImportError: - MODULES.append('PyAudio') - +MODULES = ['PyQt5', 'PyAudio'] DEP_LINKS = [] -if system() == 'Windows': - DEP_LINKS = [] # TODO: add opencv.whl +if system() != 'Windows': + MODULES.append('numpy') +else: + DEP_LINKS = [] # TODO: add opencv wheel and numpy wheel class InstallScript(install):