q2rad 0.1.183__tar.gz → 0.1.184__tar.gz

{q2rad-0.1.183 → q2rad-0.1.184}/PKG-INFO

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

{q2rad-0.1.183 → q2rad-0.1.184}/pyproject.toml

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

{q2rad-0.1.183 → q2rad-0.1.184}/q2rad/q2make.py

@@ -83,6 +83,7 @@ def make_binary(self):
         return
 
     main = """
+import sys
 if "darwin" in sys.platform:
     path = sys.argv[0].split("/Contents/MacOS")[0]
     path = os.path.dirname(path)
@@ -97,16 +98,14 @@ app.run()
     dist_folder = os.path.abspath(f"{make_folder}/dist/{binary_name}")
 
     terminal = Q2Terminal(callback=print)
-    # pynstaller_executable = os.path.dirname(sys.executable) + "/pyinstaller"
-    pynstaller_executable = f"'{sys.executable}' -m PyInstaller"
+    pynstaller_executable = f"'{sys.executable.replace('w.exe', '.exe')}' -m PyInstaller"
     if "win32" in sys.platform:
-        pynstaller_executable = "&" + pynstaller_executable
-
+        pynstaller_executable = "& " + pynstaller_executable
+    print(pynstaller_executable)
     if not os.path.isfile("poetry.lock"):
         terminal.run(f"{pynstaller_executable} -v")
         if terminal.exit_code != 0:
-            # pip_executable = os.path.dirname(sys.executable) + "/pip"
-            terminal.run(f"'{sys.executable}' -m pip install pyinstaller")
+            terminal.run(f"'{sys.executable.replace('w.exe', '.exe')}' -m pip install pyinstaller")
             if terminal.exit_code != 0:
                 q2mess("Pyinstaller not installed!")
                 return

{q2rad-0.1.183 → q2rad-0.1.184}/q2rad/q2packages.py

@@ -31,7 +31,8 @@ class Q2Packages(Q2Form):
 
     def on_init(self):
         self.add_control("package_name", _("Name"), datatype="char", datalen=100, pk="*")
-        self.add_control("package_version", _("Version"), datatype="char", datalen=10, disabled="*")
+        self.add_control("package_alias", _("Alias"), datatype="char", datalen=100)
+        self.add_control("package_version", _("Version"), datatype="char", datalen=10)
         self.add_control("comment", _("Comment"), datatype="text")
 
         cursor: Q2Cursor = self.q2_app.db_logic.table(table_name="packages")

{q2rad-0.1.183 → q2rad-0.1.184}/q2rad/q2rad.py

@@ -16,6 +16,7 @@ import sys
 import os
 import re
 import threading
+from packaging import version
 
 if __name__ == "__main__":
     sys.path.insert(0, ".")
@@ -63,7 +64,8 @@ from q2rad.q2utils import Q2Tasker, Q2Form, auto_filter, set_logging, open_folde
 from q2rad.q2utils import q2choice
 from q2rad.q2make import make_binary
 
-from q2data2docx.q2data2docx import q2data2docx # noqa F401
+from q2data2docx.q2data2docx import q2data2docx  # noqa F401
+
 # from q2googledrive.q2googledrive import q2googledrive # noqa F401
 
 import gettext
@@ -866,9 +868,19 @@ class Q2RadApp(Q2App):
         list_2_upgrade = []
 
         rez = self.get_packages_version(packages_list)
-
         for package in rez:
             latest_version, current_version = rez[package]
+            if self.db_logic is not None and package not in q2_modules:
+                pkg_ver = get("packages", f"package_name='{package}'", "package_version", q2_db=self.db_logic)
+                pkg_ver = pkg_ver if pkg_ver else "99999"
+                try:
+                    if version.parse(latest_version) > version.parse(pkg_ver):
+                        continue
+                except Exception as error:
+                    q2mess(f"Error occured while checking updates for <b>{package}</b>:"
+                           f"<br> {error}<br>"
+                            f"<b>{package}</b> package update interrupted")
+                    continue
             if latest_version != current_version and latest_version:
                 list_2_upgrade_message.append(f"<b>{package}</b>: {current_version} > {latest_version}")
                 list_2_upgrade.append(package)
@@ -877,7 +889,7 @@ class Q2RadApp(Q2App):
         if can_upgrade:
             if (
                 q2AskYN(
-                    "Updates for packages are avaiable!<p><p>"
+                    "!Updates for packages are avaiable!<p><p>"
                     f"{',<br> '.join(list_2_upgrade_message)}<br><br>"
                     "Do you want to proceed with update?<p><p>"
                     "The program will be restarted after the update!"

q2rad-0.1.184/q2rad/version.py

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

q2rad-0.1.183/q2rad/version.py

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