From 5f1b7d8d93433374d32589951d302c6897842dd9 Mon Sep 17 00:00:00 2001
From: emdee <emdee>
Date: Tue, 18 Oct 2022 01:15:22 +0000
Subject: [PATCH] Update README

---
 README.md |  4 ++++
 ToDo.md   | 17 ++++++++++++-----
 setup.py  | 25 +++++++++++--------------
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 54b1fd3..6290625 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,10 @@ Toxygen is powerful cross-platform [Tox](https://tox.chat/) client written in pu
 This hard-forked from https://github.com/toxygen-project/toxygen
 ```next_gen``` branch.
 
+https://git.macaw.me/emdee/toxygen_wrapper needs packaging
+is making a dependency. Just download it and copy the two directories
+```wrapper``` and ```wrapper_tests``` into ```toxygen/toxygen```.
+
 See ToDo.md to the current ToDo list.
 
 Work on this project is suspended until the
diff --git a/ToDo.md b/ToDo.md
index 4091525..b6c0735 100644
--- a/ToDo.md
+++ b/ToDo.md
@@ -1,5 +1,13 @@
 # Toxygen ToDo List
 
+## Bugs
+
+1. There is an agravating bug  where new messages are not put in the
+   current window, and a messages waiting indicator appears. You have
+   to focus out of the window and then back in the window.
+
+
+
 ## Fix history
 
 The code is in there but it's not working.
@@ -14,7 +22,7 @@ command line.
 ## Fix Video
 
 The code is in there but it's not working.  I may have broken it
-trying to wire up the ability to set the audio device from the command
+trying to wire up the ability to set the video device from the command
 line.
 
 ## Groups
@@ -37,9 +45,8 @@ line.
 ## check toxygen_wrapper
 
 1. I've broken out toxygen_wrapper to be standalone,
-   https://git.plastiras.org/emdee/toxygen_wrapper but the tox.py
+   https://git.macaw.me/emdee/toxygen_wrapper but the tox.py
    needs each call double checking.
 
-
-
-
+2. https://git.macaw.me/emdee/toxygen_wrapper needs packaging
+   and making a dependency.
diff --git a/setup.py b/setup.py
index 62c7fa4..2d30490 100644
--- a/setup.py
+++ b/setup.py
@@ -15,14 +15,11 @@ if system() == 'Windows':
     MODULES = ['PyQt5', 'PyAudio', 'numpy', 'opencv-python', 'pydenticon', 'cv2']
 else:
     MODULES = ['pydenticon']
+    MODULES.append('PyQt5')
     try:
         import pyaudio
     except ImportError:
         MODULES.append('PyAudio')
-    try:
-        import PyQt5
-    except ImportError:
-        MODULES.append('PyQt5')
     try:
         import numpy
     except ImportError:
@@ -35,6 +32,10 @@ else:
         import coloredlogs
     except ImportError:
         MODULES.append('coloredlogs')
+    try:
+        import pyqtconsole
+    except ImportError:
+        MODULES.append('pyqtconsole')
 
 
 def get_packages():
@@ -42,10 +43,8 @@ def get_packages():
     for root, dirs, files in os.walk(directory):
         packages = map(lambda d: 'toxygen.' + d, dirs)
         packages = ['toxygen'] + list(packages)
-
         return packages
 
-
 class InstallScript(install):
     """This class configures Toxygen after installation"""
 
@@ -72,20 +71,16 @@ setup(name='Toxygen',
       version=version,
       description='Toxygen - Tox client',
       long_description='Toxygen is powerful Tox client written in Python3',
-      url='https://github.com/toxygen-project/toxygen/',
-      keywords='toxygen tox messenger',
+      url='https://git.macaw.me/emdee/toxygen/',
+      keywords='toxygen Tox messenger',
       author='Ingvar',
-      maintainer='Ingvar',
+      maintainer='',
       license='GPL3',
       packages=get_packages(),
       install_requires=MODULES,
       include_package_data=True,
       classifiers=[
           'Programming Language :: Python :: 3 :: Only',
-          'Programming Language :: Python :: 3.5',
-          'Programming Language :: Python :: 3.6',
-          'Programming Language :: Python :: 3.7',
-          'Programming Language :: Python :: 3.8',
           'Programming Language :: Python :: 3.9',
       ],
       entry_points={
@@ -93,4 +88,6 @@ setup(name='Toxygen',
       },
       cmdclass={
           'install': InstallScript
-      })
+      },
+      zip_safe=False
+      )