q2rad 0.1.158__py3-none-any.whl → 0.1.160__py3-none-any.whl

q2rad/q2appmanager.py

@@ -233,7 +233,8 @@ class AppManager(Q2Form):
 
     def reinstall(self):
         if q2ask("You are about to reinstall platform packages?") == 2:
-            q2app.q2_app.update_packages(force=True)
+            # q2app.q2_app.update_packages(force=True)
+            q2app.q2_app.update_from_git(source="")
 
     def update_from_git(self):
         if q2ask("You are about to reinstall platform packages from github.com! Are you sure?") == 2:

q2rad/q2rad.py

@@ -681,7 +681,7 @@ class Q2RadApp(Q2App):
         if upgraded:
             self.restart()
 
-    def update_from_git(self, package=""):
+    def update_from_git(self, package="", source="git"):
         if os.path.isfile("poetry.lock"):
             q2mess("poetry.lock presents - update from git is impossible!")
             return
@@ -692,6 +692,11 @@ class Q2RadApp(Q2App):
         trm = Q2Terminal(callback=callback)
         executable = sys.executable.replace("w.exe", ".exe")
         w = Q2WaitShow(len(q2_modules))
+        _source_suffix = ""
+        _source_postfix = ""
+        if source == "git":
+            _source_suffix = "git+https://github.com/AndreiPuchko/"
+            _source_postfix = ".git"
         for package in q2_modules:
             if w.step(package):
                 break
@@ -701,7 +706,7 @@ class Q2RadApp(Q2App):
                 continue
             trm.run(
                 f"{executable} -m pip install  --upgrade --force-reinstall --no-deps"
-                f" git+https://github.com/AndreiPuchko/{package}.git"
+                f" {_source_suffix}{package}{_source_postfix}"
             )
             if trm.exit_code != 0:
                 q2mess(f"Error occured while updateing <b>{package}</b>! See output for details.")
@@ -725,7 +730,6 @@ class Q2RadApp(Q2App):
                     "pip",
                     "install",
                     "--upgrade",
-                    "--force-reinstall",
                     "--no-cache-dir",
                     f"{package}=={latest_version}",
                 ],

q2rad/q2raddb.py

@@ -45,7 +45,7 @@ import datetime
 
 def open_url(url):
     try:
-        response = urllib.request.urlopen(url)
+        response = urllib.request.urlopen(url, timeout=5)
     except SocketError:
         response = None
     return response

q2rad/q2reports.py

@@ -26,7 +26,7 @@ from q2rad.q2queries import Q2QueryEdit
 from q2rad.q2raddb import q2cursor
 from q2rad.q2utils import Q2_save_and_run
 from q2gui import q2app
-from q2gui.q2dialogs import Q2WaitShow, q2Wait, q2WaitMax, q2WaitStep, q2working
+from q2gui.q2dialogs import Q2WaitShow, q2WaitMax, q2WaitStep, q2working
 import json
 import os
 import gettext

q2rad/version.py

@@ -1 +1 @@
-__version__ = "0.1.158"
+__version__ = "0.1.160"

{q2rad-0.1.158.dist-info → q2rad-0.1.160.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: q2rad
-Version: 0.1.158
+Version: 0.1.160
 Summary: RAD - database, GUI, reports
 Author: Andrei Puchko
 Author-email: andrei.puchko@gmx.de

{q2rad-0.1.158.dist-info → q2rad-0.1.160.dist-info}/RECORD

@@ -1,7 +1,7 @@
 q2rad/__init__.py,sha256=0szXNMBWVw1urehVEHVofqdQBoqs8p54t4I2_scEEjA,259
 q2rad/__main__.py,sha256=zP4JARM-FzFHM-vWLehx7c5N4v4m_F-TuMobCdFzr4Q,824
 q2rad/q2actions.py,sha256=CdpQH9BlrmtfzlqkIZ7zMzIP0B23Vn1kPaosp_tLyug,7135
-q2rad/q2appmanager.py,sha256=1tmJrNfAk9g20zeQ2bWyWhVTKENhv6ZGd8_DxSsudLc,15245
+q2rad/q2appmanager.py,sha256=GpubDcFA0rbR-MKBhKR3tazaWudi0w1G5YueIWJq_34,15300
 q2rad/q2appselector.py,sha256=9JITeCMp9qqFKWWxPVG1fEx8D1_K6Y_X9TzR3AKVxXw,12419
 q2rad/q2constants.py,sha256=jqJL5iIGGgoYcx2sqkxnD8lCCd4BVPoyk7LTlgLvj9I,3408
 q2rad/q2forms.py,sha256=y0eXKnxyHIdPgZgux7PuClP8Ill744-DIi-O3pOucSs,10159
@@ -10,14 +10,14 @@ q2rad/q2market.py,sha256=DHJBsWFVsVfwHPfMG5rrzckHzoTwWR3E2wdXBUTPQb4,2589
 q2rad/q2modules.py,sha256=2sktJh3LghgrEGnIexKr15kKl94haw6p_jgK34OnuLA,4286
 q2rad/q2packages.py,sha256=acC94DwaBo-RMMJKHIjogB9n0vOMvbtzYhCPL8f4YLg,3337
 q2rad/q2queries.py,sha256=zOCijYCf5K0Qj9mJC_Cg63MSu2FlI5VdnpQCKIUOzYY,12306
-q2rad/q2rad.py,sha256=bT5E-QDbVPz6ITXE8g0cR5212POnNsq1OB9g7J_LaRg,40020
-q2rad/q2raddb.py,sha256=wtT0Q0B9rpaLMzt6ehCRflxqdh4KSE2yvr8iOfRFn7A,4466
-q2rad/q2reports.py,sha256=eoki9IB4v0pdrLp-qgBEI-fKlrkqgAxmWSoaBVd9roY,81238
+q2rad/q2rad.py,sha256=-zFIlUPQxGVyLDyIRYNFe7uxYCdIZ5szQq1ishbYcn0,40180
+q2rad/q2raddb.py,sha256=wjswgPipuV-ggTvb77O8Q767hcbOrEdGXHgEPNAmTr4,4477
+q2rad/q2reports.py,sha256=Zxnx7WMZY0D0vlWU4ubOOafPvEpylqXFvLfdfxpqLJs,81230
 q2rad/q2stylesettings.py,sha256=esbfQoPgP7lJN2GRkqeQKjDpHCqCilJBzZf-c73ThCU,3593
 q2rad/q2utils.py,sha256=BJ3WWbqSYIhZO44BFbl8_BI9jPEH0xOduA66HSfv8sg,11882
-q2rad/version.py,sha256=i_1i9tXeQgrfTRNNw9JDUO4tTsxKaWB81mHVzaPaDPk,23
-q2rad-0.1.158.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.158.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.158.dist-info/METADATA,sha256=Z1a0p9gQoYWMTs9afId1sohdNe37c71D9lKO-SKXtTs,3509
-q2rad-0.1.158.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.158.dist-info/RECORD,,
+q2rad/version.py,sha256=HiQl0OJjWrFYN57sH3cFC-FSBRbVKvTsvM3iIdc_Vy0,23
+q2rad-0.1.160.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
+q2rad-0.1.160.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
+q2rad-0.1.160.dist-info/METADATA,sha256=DWDuyJbdG2MNuCtru0s7_JslJ6c_60mG6HMJ_jHaTNU,3509
+q2rad-0.1.160.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+q2rad-0.1.160.dist-info/RECORD,,