From 47c0a451c4c57ba7aad0e682daf5f30621959aab Mon Sep 17 00:00:00 2001 From: ingvar1995 Date: Mon, 11 Jul 2016 17:24:39 +0300 Subject: [PATCH] docs && setup.py update --- docs/install.md | 16 +++++++--------- setup.py | 7 ++++--- toxygen/main.py | 4 +++- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/docs/install.md b/docs/install.md index 0a8aa2a..6142c9c 100644 --- a/docs/install.md +++ b/docs/install.md @@ -26,11 +26,10 @@ Run app using ``toxygen`` command. 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) (recommended) or [PyQt4](https://riverbankcomputing.com/software/pyqt/download) 3. Install PyAudio: ``pip3.4 install pyaudio`` -4. Install PySocks: ``pip3.4 install PySocks`` -5. [Download toxygen](https://github.com/xveduk/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 \src\main.py +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 \src\main.py. [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) @@ -51,10 +50,9 @@ Dependencies: 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`` -5. Install PySocks: ``pip3.4 install PySocks`` -6. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip) -7. Unpack archive -8. Run app: +5. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip) +6. Unpack archive +7. Run app: ``python3.4 main.py`` ## Compile Toxygen diff --git a/setup.py b/setup.py index 61a5482..670538b 100644 --- a/setup.py +++ b/setup.py @@ -7,14 +7,14 @@ from toxygen.util import program_version version = program_version + '.0' -MODULES = ['PyAudio', 'PySocks'] +MODULES = ['PyAudio'] if system() == 'Windows': MODULES.append('PySide') class InstallScript(install): - """Install all required libs""" + """This class configures Toxygen after installation""" def run(self): install.run(self) @@ -29,8 +29,9 @@ setup(name='Toxygen', description='Toxygen - Tox client', long_description='Toxygen is powerful Tox client written in Python3', url='https://github.com/xveduk/toxygen/', - keywords='toxygen tox', + keywords='toxygen tox messenger', author='Ingvar', + maintainer='Ingvar', license='GPL3', packages=['toxygen', 'toxygen.plugins', 'toxygen.styles'], install_requires=MODULES, diff --git a/toxygen/main.py b/toxygen/main.py index 9d7daba..b7b7120 100644 --- a/toxygen/main.py +++ b/toxygen/main.py @@ -381,6 +381,7 @@ class Toxygen: def clean(): + """Removes all windows libs from libs folder""" d = curr_directory() + '/libs/' for fl in ('libtox64.dll', 'libtox.dll', 'libsodium64.a', 'libsodium.a'): if os.path.exists(d + fl): @@ -388,6 +389,7 @@ def clean(): def configure(): + """Removes unused libs""" d = curr_directory() + '/libs/' is_64bits = sys.maxsize > 2 ** 32 if not is_64bits: @@ -410,7 +412,7 @@ def configure(): def main(): if len(sys.argv) == 1: toxygen = Toxygen() - else: # path to profile or tox: uri or --version or --help + else: # started with argument(s) arg = sys.argv[1] if arg == '--version': print('Toxygen ' + program_version)