From cab3b4d9af83cb06609d0bcd75b1bd0c521ebcd5 Mon Sep 17 00:00:00 2001
From: emdee <emdee@spm.plastiras.org>
Date: Tue, 27 Sep 2022 13:32:53 +0000
Subject: [PATCH] update docs

---
 .gitignore                 |  3 ++-
 .travis.yml                | 17 +++++++++--------
 toxygen/smileys/smileys.py |  9 ++-------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 78c26f5..0a8182a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 *.pyc
 *.pyo
-*.ui
 toxygen/toxcore
 tests/tests
 tests/libs
@@ -25,3 +24,5 @@ html
 Toxygen.egg-info
 *.tox
 .cache
+*.db
+
diff --git a/.travis.yml b/.travis.yml
index 7fc55ca..a4011e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,13 +12,13 @@ before_install:
   - sudo apt-get install -y checkinstall build-essential
   - sudo apt-get install portaudio19-dev
   - sudo apt-get install libsecret-1-dev
-
   - sudo apt-get install libconfig-dev libvpx-dev check -qq
 install:
-  - pip3 install sip
-  - pip3 install pyaudio
-  - pip3 install pyqt5==5.14
-  - pip3 install opencv-python
+  - pip install sip
+  - pip install pyqt5
+  - pip install pyaudio
+  - pip install opencv-python
+  - pip install pydenticon
 before_script:
 # Opus
   - wget http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz
@@ -38,15 +38,16 @@ before_script:
   - sudo ldconfig
   - cd ..
 # Toxcore
-  - git clone https://github.com/irungentoo/toxcore.git
+  - git clone https://github.com/ingvar1995/toxcore.git --branch=ngc_rebase
   - cd toxcore
-  - autoreconf -if
-  - ./configure
+  - mkdir _build && cd _build
+  - cmake ..
   - make -j$(nproc)
   - sudo make install
   - echo '/usr/local/lib/' | sudo tee -a /etc/ld.so.conf.d/locallib.conf
   - sudo ldconfig
   - cd ..
+  - cd ..
 script:
   - py.test tests/travis.py
   - py.test tests/tests.py
diff --git a/toxygen/smileys/smileys.py b/toxygen/smileys/smileys.py
index 43ae3fd..0391856 100644
--- a/toxygen/smileys/smileys.py
+++ b/toxygen/smileys/smileys.py
@@ -4,11 +4,6 @@ import os
 from collections import OrderedDict
 from PyQt5 import QtCore
 
-# LOG=util.log
-global LOG
-import logging
-LOG = logging.getLogger('app.'+__name__)
-log = lambda x: LOG.info(x)
 
 class SmileyLoader:
     """
@@ -36,7 +31,7 @@ class SmileyLoader:
                     self._smileys = json.loads(fl.read())
                     fl.seek(0)
                     tmp = json.loads(fl.read(), object_pairs_hook=OrderedDict)
-                LOG.info('Smiley pack {} loaded'.format(pack_name))
+                print('Smiley pack {} loaded'.format(pack_name))
                 keys, values, self._list = [], [], []
                 for key, value in tmp.items():
                     value = util.join_path(self.get_smileys_path(), value)
@@ -47,7 +42,7 @@ class SmileyLoader:
             except Exception as ex:
                 self._smileys = {}
                 self._list = []
-                LOG.error('Smiley pack {} was not loaded. Error: {}'.format(pack_name, str(ex)))
+                print('Smiley pack {} was not loaded. Error: {}'.format(pack_name, ex))
 
     def get_smileys_path(self):
         return util.join_path(util.get_smileys_directory(), self._curr_pack) if self._curr_pack is not None else None