Merge branch 'dev'

.gitignore

@@ -1,5 +1,6 @@
 __pycache__/
 .git/
+venv*/
 
 # PyInstaller
 *.manifest

VERSION

@@ -1 +1 @@
-2.9
+3.1

launcher.py

@@ -1,19 +1,15 @@
 #! /usr/bin/env python3
-# |*****************************************************
 # * Copyright         : Copyright (C) 2019
 # * Author            : ddc
 # * License           : GPL v3
 # * Python            : 3.6
-# |*****************************************************
 # # -*- coding: utf-8 -*-
 
 import os
 import subprocess
 import sys
-
 import requests
 from PyQt5 import QtCore, QtWidgets
-
 from src.utils import constants, messages, utilities
 
 
@@ -39,7 +35,7 @@ def init(self):
         self.progressBar.close()
         self._call_program()
 
-    ################################################################################
+
     def _check_update_required(self):
         if self.configs['programVersion'] is None:
             self.client_version = constants.VERSION
@@ -52,7 +48,7 @@ def _check_update_required(self):
             self.new_version_msg = new_version_obj.new_version_msg
             self._download_new_program_version(False)
 
-    ################################################################################
+
     def _download_new_program_version(self, show_dialog=True):
         if show_dialog:
             msg = f"""{messages.new_version_available}
@@ -78,7 +74,7 @@ def _download_new_program_version(self, show_dialog=True):
             utilities.show_message_window("error", "ERROR", f"{messages.error_dl_new_version}")
             self.log.error(f"{messages.error_dl_new_version} {r.status_code} {r}")
 
-    ################################################################################
+
     def _call_program(self):
         code = None
         cmd = [f"{os.path.abspath(os.getcwd())}\\{constants.EXE_PROGRAM_NAME}"]

main.py

@@ -1,14 +1,11 @@
 #! /usr/bin/env python3
-# |*****************************************************
 # * Copyright         : Copyright (C) 2019
 # * Author            : ddc
 # * License           : GPL v3
 # * Python            : 3.6
-# |*****************************************************
 # # -*- coding: utf-8 -*-
 
 from PyQt5 import QtCore, QtGui, QtWidgets
-
 from src.main_src import MainSrc
 from src.utils import constants
 

requirements.txt

@@ -1,15 +1,19 @@
 altgraph==0.17
-beautifulsoup4==4.9.0
-certifi==2020.4.5.1
-chardet==3.0.4
+beautifulsoup4==4.9.3
+certifi==2021.5.30
+chardet==4.0.0
+charset-normalizer==2.0.4
 future==0.18.2
-idna==2.9
-pefile==2019.4.18
-psycopg2==2.8.5
--e git+https://github.com/pyinstaller/pyinstaller.git@fe0911772f297b4b40b84af22f57de374aae13fd#egg=pyinstaller
-PyQt5==5.14.2
-PyQt5-sip==12.7.2
+idna==3.2
+pefile==2021.5.24
+psycopg2==2.9.1
+pyinstaller==4.5.1
+pyinstaller-hooks-contrib==2021.2
+PyQt5==5.15.4
+PyQt5-Qt5==5.15.2
+PyQt5-sip==12.9.0
+PyQt5-stubs==5.15.2.0
 pywin32-ctypes==0.2.0
-requests==2.23.0
-soupsieve==2.0
-urllib3==1.25.9
+requests==2.26.0
+soupsieve==2.2.1
+urllib3==1.26.6

resources.rc

@@ -7,8 +7,8 @@ VSVersionInfo(
   ffi=FixedFileInfo(
 # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
 # Set not needed items to zero 0.
-filevers=(2, 9, 0, 0),
-prodvers=(2, 9, 0, 0),
+filevers=(3, 1, 0, 0),
+prodvers=(3, 1, 0, 0),
 
 
 # Contains a bitmask that specifies the valid bits 'flags'r
@@ -56,11 +56,11 @@ StringFileInfo(
     StringStruct(u'Users', 		            u'Unlimited'),
     StringStruct(u'PrivateBuild', 		    u''),
     StringStruct(u'SpecialBuild', 		    u''),
-    StringStruct(u'FileVersion',			u'2.9'),
-    StringStruct(u'ProductVersion', 		u'2.9'),
-    StringStruct(u'Build', 		            u'May 2020'),
+    StringStruct(u'FileVersion',			u'3.1'),
+    StringStruct(u'ProductVersion', 		u'3.1'),
+    StringStruct(u'Build', 		            u'August 2021'),
     ])
-  ]), 
+  ]),
 VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
   ]
 )

src/__init__.py

@@ -1,4 +0,0 @@
-__all__ = ['ui',
-           'utils',
-           'main_src'
-           ]