q2rad 0.1.158__tar.gz → 0.1.160__tar.gz

{q2rad-0.1.158 → q2rad-0.1.160}/PKG-INFO

@@ -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 → q2rad-0.1.160}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "q2rad"
-version = "0.1.158"
+version = "0.1.160"
 description = "RAD - database, GUI, reports"
 authors = ["Andrei Puchko <andrei.puchko@gmx.de>"]
 readme = "README.md"

{q2rad-0.1.158 → q2rad-0.1.160}/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-0.1.158 → q2rad-0.1.160}/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-0.1.158 → q2rad-0.1.160}/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-0.1.158 → q2rad-0.1.160}/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-0.1.160/q2rad/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.160"

q2rad-0.1.158/q2rad/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.158"