q2rad 0.1.166__py3-none-any.whl → 0.1.168__py3-none-any.whl

q2rad/q2appmanager.py

@@ -357,8 +357,9 @@ class AppManager(Q2Form):
         self.q2_app.open_selected_app()
 
     @staticmethod
-    def import_json_app(data):
-        db: Q2Db = q2app.q2_app.db_logic
+    def import_json_app(data, db = None):
+        if db is None:
+            db: Q2Db = q2app.q2_app.db_logic
         db_tables = db.get_tables()
         wait_table = Q2WaitShow(len(data))
         errors = []

q2rad/q2appselector.py

@@ -39,23 +39,23 @@ _ = gettext.gettext
 
 
 class Q2AppSelect(Q2Form):
-    def __init__(self, title=""):
+    def __init__(self, db_file_path="q2apps.sqlite"):
+        self.db_file_path = db_file_path
         super().__init__(_("Select application"))
         self.selected_application = {}
         self.no_view_action = True
         self.autoload_enabled = True
 
     def on_init(self):
-        q2_app: Q2App = q2app.q2_app
-        q2_app.clear_menu()
-        q2_app.build_menu()
-        q2_app.hide_menubar()
-        q2_app.hide_toolbar()
-        q2_app.hide_statusbar()
-        q2_app.hide_tabbar()
-
-        self.db = Q2Db(database_name="q2apps.sqlite")
-
+        # q2_app: Q2App = q2app.q2_app
+        # q2_app.clear_menu()
+        # q2_app.build_menu()
+        # q2_app.hide_menubar()
+        # q2_app.hide_toolbar()
+        # q2_app.hide_statusbar()
+        # q2_app.hide_tabbar()
+
+        self.db = Q2Db(database_name=self.db_file_path)
         self.define_form()
 
         data_schema = Q2DbSchema()
@@ -84,9 +84,7 @@ class Q2AppSelect(Q2Form):
             def driverDataValid(self=self):
                 self.w.host_data.set_enabled(self.s.driver_data != "Sqlite")
                 self.w.port_data.set_enabled(self.s.driver_data != "Sqlite")
-                self.w.select_data_storage_file.set_enabled(
-                    self.s.driver_data == "Sqlite"
-                )
+                self.w.select_data_storage_file.set_enabled(self.s.driver_data == "Sqlite")
 
             self.add_control(
                 "driver_data",
@@ -116,12 +114,8 @@ class Q2AppSelect(Q2Form):
                 )
                 self.add_control("/")
             if self.add_control("/h"):
-                self.add_control(
-                    "host_data", _("Host"), gridlabel=_("Data host"), datalen=100
-                )
-                self.add_control(
-                    "port_data", _("Port"), gridlabel=_("Data port"), datatype="int"
-                )
+                self.add_control("host_data", _("Host"), gridlabel=_("Data host"), datalen=100)
+                self.add_control("port_data", _("Port"), gridlabel=_("Data port"), datatype="int")
                 self.add_control(
                     "guest_mode",
                     _("Guest mode"),
@@ -139,9 +133,7 @@ class Q2AppSelect(Q2Form):
             def driverLogicValid(form=self):
                 form.w.host_logic.set_enabled(form.s.driver_logic != "Sqlite")
                 form.w.port_logic.set_enabled(form.s.driver_logic != "Sqlite")
-                form.w.select_app_storage_file.set_enabled(
-                    form.s.driver_logic == "Sqlite"
-                )
+                form.w.select_app_storage_file.set_enabled(form.s.driver_logic == "Sqlite")
 
             self.add_control(
                 "driver_logic",
@@ -154,7 +146,6 @@ class Q2AppSelect(Q2Form):
                 valid=driverLogicValid,
             )
             if self.add_control("/h"):
-
                 self.add_control(
                     "database_logic",
                     "Database",
@@ -172,12 +163,8 @@ class Q2AppSelect(Q2Form):
                 )
                 self.add_control("/")
             if self.add_control("/h"):
-                self.add_control(
-                    "host_logic", _("Host"), gridlabel=_("Logic host"), datalen=100
-                )
-                self.add_control(
-                    "port_logic", _("Port"), gridlabel=_("Logic port"), datatype="int"
-                )
+                self.add_control("host_logic", _("Host"), gridlabel=_("Logic host"), datalen=100)
+                self.add_control("port_logic", _("Port"), gridlabel=_("Logic port"), datatype="int")
                 self.add_control(
                     "dev_mode",
                     _("Dev mode"),
@@ -202,7 +189,7 @@ class Q2AppSelect(Q2Form):
             icon="💚",
             mess="Toggle autoload mark",
             eof_disabled=1,
-            tag="#4dd0e1"
+            tag="#4dd0e1",
         )
 
         self.add_action(_("Demo"), self.run_demo)
@@ -240,24 +227,19 @@ class Q2AppSelect(Q2Form):
         self.q2_app.sleep(0.2)
         if self.q2_app.keyboard_modifiers() != "":
             return
-        # if self.autoload_enabled:
-        #     cu = q2cursor("select * from applications where autoselect<>''", self.db)
-        #     if cu.row_count() > 0:
-        #         self._select_application(cu.record(0))
-        #         return False
         if self.db.table("applications").row_count() <= 0:
-            if not os.path.isdir("q2rad_sqlite_databases"):
-                os.mkdir("q2rad_sqlite_databases")
+            if not os.path.isdir("databases"):
+                os.mkdir("databases")
             insert(
                 "applications",
                 {
                     "ordnum": 1,
                     "name": "My first app",
                     "driver_data": "Sqlite",
-                    "database_data": "q2rad_sqlite_databases/my_first_app_data_storage.sqlite",
+                    "database_data": "databases/my_first_app_data_storage.sqlite",
                     "driver_logic": "Sqlite",
-                    "database_logic": "q2rad_sqlite_databases/my_first_app_logic_storage.sqlite",
-                    "dev_mode": "*"
+                    "database_logic": "databases/my_first_app_logic_storage.sqlite",
+                    "dev_mode": "*",
                 },
                 self.db,
             )
@@ -339,6 +321,14 @@ class Q2AppSelect(Q2Form):
         self._select_application(self.model.get_record(self.current_row))
 
     def run(self, autoload_enabled=True):
+        q2_app: Q2App = q2app.q2_app
+        q2_app.clear_menu()
+        q2_app.build_menu()
+        q2_app.hide_menubar()
+        q2_app.hide_toolbar()
+        q2_app.hide_statusbar()
+        q2_app.hide_tabbar()
+
         self.autoload_enabled = autoload_enabled
         if autoload_enabled:
             cu = q2cursor("select * from applications where autoselect<>''", self.db)

q2rad/q2make.py

@@ -0,0 +1,119 @@
+#    Copyright © 2021 Andrei Puchko
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+import os
+import sys
+import shutil
+from q2terminal.q2terminal import Q2Terminal
+from q2rad.q2utils import Q2Form, open_folder  # noqa F401
+from q2rad.q2raddb import q2cursor
+from q2gui.q2dialogs import q2mess, q2wait, q2ask
+from q2rad.q2appselector import Q2AppSelect
+from q2db.db import Q2Db
+from q2rad.q2appmanager import AppManager
+
+
+def create_q2apps_sqlite(dist_folder):
+    database_folder_name = "databases"
+    database_name_prefix = "app1"
+    appsel = Q2AppSelect(f"{dist_folder}/q2apps.sqlite")
+    appsel.db.insert(
+        "applications",
+        {
+            "ordnum": 1,
+            "name": appsel.q2_app.app_title,
+            "driver_data": "Sqlite",
+            "database_data": f"{database_folder_name}/{database_name_prefix}_data_storage.sqlite",
+            "driver_logic": "Sqlite",
+            "database_logic": f"{database_folder_name}/{database_name_prefix}_logic_storage.sqlite",
+            "autoselect": "*",
+            "dev_mode": "",
+        },
+    )
+    dababase_folder = f"{dist_folder}/{database_folder_name}"
+    if not os.path.isdir(dababase_folder):
+        os.mkdir(dababase_folder)
+    db_logic = Q2Db(
+        database_name=os.path.abspath(f"{dababase_folder}/{database_name_prefix}_logic_storage.sqlite")
+    )
+    appsel.q2_app.migrate_db_logic(db_logic)
+    AppManager().import_json_app(AppManager().get_app_json(), db_logic)
+
+
+def make_binary(self):
+    form = Q2Form()
+    form.add_control("make_folder", "Working folder", datatype="char", data="make")
+    form.add_control("binary_name", "Application name", datatype="char", data="q2-app")
+    form.ok_button = 1
+    form.cancel_button = 1
+    form.show_form("Build binary")
+    if not form.ok_pressed:
+        return
+
+    if q2ask("Are you about to start buiding binary executable file of Q2RAD!<br>Are You Sure?") != 2:
+        return
+
+    make_folder = os.path.abspath(form.s.make_folder)
+    binary_name = form.s.binary_name
+    if not os.path.isdir(make_folder):
+        os.mkdir(make_folder)
+    if not os.path.isdir(make_folder):
+        return
+
+    main = "from q2rad.q2rad import Q2RadApp;app = Q2RadApp();app.run()"
+    open(f"{make_folder}/{binary_name}.py", "w").write(main)
+
+    dist_folder = os.path.abspath(f"{make_folder}\\dist\\{binary_name}")
+
+    terminal = Q2Terminal(callback=print)
+    pynstaller_executable = os.path.dirname(sys.executable) + "/pyinstaller"
+
+    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"{pip_executable} install pyinstaller")
+            if terminal.exit_code != 0:
+                q2mess("Pyinstaller not installed!")
+                return
+
+    packages = " ".join(
+        [
+            f" --collect-all {x['name']}"
+            for x in q2cursor(
+                "select package_name as name from packages where 'pyinstaller'<>package_name ",
+                self.db_logic,
+            ).records()
+        ]
+    )
+    packages += " --collect-all pip "
+    terminal.run(f"cd {make_folder}")
+    w = q2wait()
+    if not os.path.isfile(os.path.abspath(f"{make_folder}/q2rad.ico")):
+        shutil.copy("assets/q2rad.ico", os.path.abspath(f"{make_folder}/q2rad.ico"))
+    # run pyinstaller
+    terminal.run(f"{pynstaller_executable} -y --noconsole {packages} -i q2rad.ico {binary_name}.py")
+
+    if not os.path.isdir(os.path.abspath(f"{dist_folder}/assets")):
+        shutil.copytree("assets", os.path.abspath(f"{dist_folder}/assets"))
+    create_q2apps_sqlite(f"{dist_folder}")
+
+    w.close()
+
+    if terminal.exit_code != 0:
+        q2mess("Error occured while making binary! See output for details.")
+    else:
+        if q2ask(f"Success! You binary is located in <b>{dist_folder}</b> <br>Are You Sure?") == 2:
+            open_folder(dist_folder)
+    terminal.close()

q2rad/q2rad.py

@@ -59,7 +59,8 @@ from q2rad.q2packages import Q2Packages
 from q2rad.q2constants import Q2Constants, q2const
 from q2rad.q2queries import Q2Queries
 from q2rad.q2reports import Q2Reports, Q2RadReport
-from q2rad.q2utils import Q2Tasker, Q2Form, auto_filter, set_logging  # noqa F401
+from q2rad.q2utils import Q2Tasker, Q2Form, auto_filter, set_logging, open_folder  # noqa F401
+from q2rad.q2make import make_binary
 
 import gettext
 
@@ -295,7 +296,7 @@ class Q2RadApp(Q2App):
         wait.step("Prepare")
         self.clear_app_info()
         wait.step("Migrate logic DB")
-        self.migrate_db_logic()
+        self.migrate_db_logic(self.db_logic)
         wait.step("Migrate data DB")
         self.migrate_db_data()
         wait.step("looking for updates")
@@ -362,7 +363,7 @@ class Q2RadApp(Q2App):
             q2Mess(self.db_data.migrate_error_list)
         self.create_menu()
 
-    def migrate_db_logic(self):
+    def migrate_db_logic(self, db_logic):
         data_schema = Q2DbSchema()
         for form in (
             Q2Modules(),
@@ -375,7 +376,7 @@ class Q2RadApp(Q2App):
         ):
             for x in form.get_table_schema():
                 data_schema.add(**x)
-        self.db_logic.set_schema(data_schema)
+        db_logic.set_schema(data_schema)
 
     def get_autocompletition_list(self):
         rez = []
@@ -499,7 +500,11 @@ class Q2RadApp(Q2App):
         if self.frozen:
             self.dev_mode = False
 
-        self.dev_mode = self.selected_application.get("dev_mode") or os.path.isdir(self.q2market_path) or os.path.isfile(".dev")
+        self.dev_mode = (
+            self.selected_application.get("dev_mode")
+            or os.path.isdir(self.q2market_path)
+            or os.path.isfile(".dev")
+        )
         # self.dev_mode = False
 
         if self.dev_mode:
@@ -608,43 +613,76 @@ class Q2RadApp(Q2App):
 
         if not self.frozen:
             # create update_q2rad.sh
+            self.write_reinstall_files()
+
+            # create run_q2rad
+            self.write_run_files()
+            if sys.platform != "darwin":
+                if q2AskYN("Should I make a desktop shortcut?") == 2:
+                    self.make_desktop_shortcut()
+        self.process_events()
+
+    def write_run_files(self):
+        if sys.prefix != sys.base_prefix:  # in virtualenv
             self.write_restore_file(
-                "update_q2rad",
+                "run_q2rad",
                 ("" if "win32" in sys.platform else "#!/bin/bash\n")
-                + ("q2rad\\scripts\\activate " if "win32" in sys.platform else "source q2rad/bin/activate")
-                + "&& pip install --upgrade --force-reinstall q2gui"
-                + "&& pip install --upgrade --force-reinstall q2db"
-                + "&& pip install --upgrade --force-reinstall q2report"
-                + "&& pip install --upgrade --force-reinstall q2terminal"
-                + "&& pip install --upgrade --force-reinstall q2rad",
+                + (
+                    "start q2rad\\scripts\\pythonw.exe -m q2rad"
+                    if "win32" in sys.platform
+                    else "q2rad/bin/q2rad\n"
+                ),
             )
-
-            # create run_q2rad
+        elif os.path.isdir("python.loc"):
             self.write_restore_file(
                 "run_q2rad",
                 ("" if "win32" in sys.platform else "#!/bin/bash\n")
-                + ("start q2rad\\scripts\\pythonw.exe -m q2rad" if "win32" in sys.platform else "q2rad/bin/q2rad\n"),
+                + ("python.loc\\scripts\\q2rad" if "win32" in sys.platform else "python.loc/bin/q2rad\n"),
+            )
+        else:
+            self.write_restore_file(
+                "run_q2rad",
+                ("" if "win32" in sys.platform else "#!/bin/bash\n")
+                + ("pythonw.exe -m q2rad" if "win32" in sys.platform else "python -m q2rad\n"),
             )
-            if "win32" in sys.platform:
-                open("run_q2rad.vbs", "w").write(
-                    'WScript.CreateObject("WScript.Shell").Run ' '"q2rad\\scripts\\pythonw.exe -m q2rad", 0, false'
-                )
 
-                open("make_shortcut.vbs", "w").write(
-                    'Set oWS = WScript.CreateObject("WScript.Shell")\n'
-                    'Set oLink = oWS.CreateShortcut(oWS.SpecialFolders("Desktop") & "\\q2RAD.lnk")\n'
-                    'cu = WScript.CreateObject("Scripting.FileSystemObject").'
-                    "GetParentFolderName(WScript.ScriptFullName)\n"
-                    'oLink.TargetPath = cu & "\\run_q2rad.vbs"\n'
-                    'oLink.WorkingDirectory = cu & ""\n'
-                    'oLink.Description = "q2RAD"\n'
-                    'oLink.IconLocation = cu & "\\assets\\q2rad.ico"\n'
-                    "oLink.Save\n"
-                )
-            if sys.platform != "darwin":
-                if q2AskYN("Should I make a desktop shortcut?") == 2:
-                    self.make_desktop_shortcut()
-        self.process_events()
+        if "win32" in sys.platform:
+            open("run_q2rad.vbs", "w").write(
+                'WScript.CreateObject("WScript.Shell").Run '
+                '"q2rad\\scripts\\pythonw.exe -m q2rad", 0, false'
+            )
+
+            open("make_shortcut.vbs", "w").write(
+                'Set oWS = WScript.CreateObject("WScript.Shell")\n'
+                'Set oLink = oWS.CreateShortcut(oWS.SpecialFolders("Desktop") & "\\q2RAD.lnk")\n'
+                'cu = WScript.CreateObject("Scripting.FileSystemObject").'
+                "GetParentFolderName(WScript.ScriptFullName)\n"
+                'oLink.TargetPath = cu & "\\run_q2rad.vbs"\n'
+                'oLink.WorkingDirectory = cu & ""\n'
+                'oLink.Description = "q2RAD"\n'
+                'oLink.IconLocation = cu & "\\assets\\q2rad.ico"\n'
+                "oLink.Save\n"
+            )
+
+    def write_reinstall_files(self):
+        if sys.prefix != sys.base_prefix:  # in virtualenv
+            pip_command = (
+                "q2rad\\scripts\\python -m " if "win32" in sys.platform else "q2rad/script/python -m "
+            )
+        elif os.path.isdir("python.loc"):
+            pip_command = "python.loc\\python  -m " if "win32" in sys.platform else "python.loc/python -m "
+        else:
+            pip_command = "python  -m " if "win32" in sys.platform else "python  -m "
+
+        self.write_restore_file(
+            "update_q2rad",
+            ("" if "win32" in sys.platform else "#!/bin/bash\n")
+            + f"{pip_command} pip install --upgrade --force-reinstall q2gui"
+            + f"&&{pip_command} pip install --upgrade --force-reinstall q2db"
+            + f"&&{pip_command} pip install --upgrade --force-reinstall q2report"
+            + f"&&{pip_command} pip install --upgrade --force-reinstall q2terminal"
+            + f"&&{pip_command} pip install --upgrade --force-reinstall q2rad",
+        )
 
     def get_package_versions(self, package):
         response = open_url(f"https://pypi.python.org/pypi/{package}/json")  # noqa F405
@@ -681,7 +719,9 @@ class Q2RadApp(Q2App):
 
                 latest_version, new_current_version = self.get_package_versions(package)
                 if latest_version:
-                    upgraded.append(f"{package} - " f"<b>{current_version}</b> => " f"<b>{latest_version}</b>")
+                    upgraded.append(
+                        f"{package} - " f"<b>{current_version}</b> => " f"<b>{latest_version}</b>"
+                    )
                 else:
                     upgraded.append(f"Error occured while updating package <b>{package}</b>!")
         w.close()
@@ -718,7 +758,10 @@ class Q2RadApp(Q2App):
                 continue
             if package and package != package:
                 continue
-            trm.run(f"{executable} -m pip install  --upgrade --force-reinstall --no-deps" f" {_source_suffix}{package}{_source_postfix}")
+            trm.run(
+                f"{executable} -m pip install  --upgrade --force-reinstall --no-deps"
+                f" {_source_suffix}{package}{_source_postfix}"
+            )
             if trm.exit_code != 0:
                 q2mess(f"Error occured while updateing <b>{package}</b>! See output for details.")
         w.close()
@@ -801,7 +844,9 @@ class Q2RadApp(Q2App):
     def update_app_packages(self):
         if self.frozen:
             return
-        extra_packages = [x["package_name"] for x in q2cursor("select * from packages", self.db_logic).records()]
+        extra_packages = [
+            x["package_name"] for x in q2cursor("select * from packages", self.db_logic).records()
+        ]
         self.check_packages_update(extra_packages)
 
     def check_packages_update(self, packages_list=q2_modules):
@@ -903,47 +948,7 @@ class Q2RadApp(Q2App):
         Q2Packages().run()
 
     def make_binary(self):
-        folder = "make"
-        if q2ask("Are you about to start buidlign binary executabele file of Q2RAD!<br>Are You Sure?") != 2:
-            return
-
-        if not os.path.isdir(folder):
-            os.mkdir(folder)
-        if not os.path.isdir(folder):
-            return
-
-        main = "from q2rad.q2rad import Q2RadApp;app = Q2RadApp();app.run()"
-        open(f"{folder}/main.py", "w").write(main)
-
-        trm = Q2Terminal(callback=print)
-        pynstaller_executable = os.path.dirname(sys.executable) + "/pyinstaller"
-
-        if not os.path.isfile("poetry.lock"):
-            trm.run(f"{pynstaller_executable} -v")
-            if trm.exit_code != 0:
-                pip_executable = os.path.dirname(sys.executable) + "/pip"
-                trm.run(f"{pip_executable} install pyinstaller")
-                if trm.exit_code != 0:
-                    q2mess("Pyinstaller not installed!")
-                    return
-
-        packages = " ".join(
-            [
-                f" --collect-all {x['name']}"
-                for x in q2cursor("select package_name as name from packages where 'pyinstaller'<>package_name ", self.db_logic).records()
-            ]
-        )
-        trm.run(f"cd {folder}")
-        w = q2wait()
-        # trm.run(f"pyinstaller --onefile --noconsole {packages} main.py")
-        trm.run(f"{pynstaller_executable} -y --noconsole {packages} main.py")
-        w.close()
-
-        if trm.exit_code != 0:
-            q2mess("Error occured while making binary! See output for details.")
-        else:
-            q2mess(f"Success! You binary is located in <b>{os.path.abspath(folder)}</b>")
-        trm.close()
+        make_binary(self)
 
     def run_form(self, name, order="", where=""):
         form = q2working(lambda: self.get_form(name, where=where, order=order), "Loading form...")

q2rad/q2utils.py

@@ -13,10 +13,11 @@
 #    limitations under the License.
 
 import os
+import sys
 import random
 import string
 import threading
-
+import subprocess
 
 from q2rad import Q2Form as _Q2Form
 from q2rad.q2raddb import q2cursor, num
@@ -263,6 +264,15 @@ def set_logging(log_folder="log"):
     logging.basicConfig(handlers=[handler])
 
 
+def open_folder(folder):
+    if "win32" in sys.platform:
+        os.startfile(folder)
+    elif "darwin" in sys.platform:
+        subprocess.Popen(["open", folder])
+    else:
+        subprocess.Popen(["xdg-open", folder])
+
+
 class Q2Tasker:
     def __init__(self, title="Working..."):
         self.rez = {}

q2rad/version.py

@@ -1 +1 @@
-__version__ = "0.1.166"
+__version__ = "0.1.168"

{q2rad-0.1.166.dist-info → q2rad-0.1.168.dist-info}/METADATA

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

{q2rad-0.1.166.dist-info → q2rad-0.1.168.dist-info}/RECORD

@@ -1,23 +1,24 @@
 q2rad/__init__.py,sha256=Y0Up-UTXOmCYC9llNmTF10CpDDgF2kv10pyHT3-YwmQ,183
 q2rad/__main__.py,sha256=zP4JARM-FzFHM-vWLehx7c5N4v4m_F-TuMobCdFzr4Q,824
 q2rad/q2actions.py,sha256=_vbahOkI2NrTeyra0sP0jqYDX1Ov3f32GoLfRqevEks,7175
-q2rad/q2appmanager.py,sha256=Vvzxt_Aic0Ou06x3azk9_4IFlLCNfrsHJGEWizAMyL0,15425
-q2rad/q2appselector.py,sha256=nn5X8nj1gNLLZBGSHxViuVNU5qOrgkvB-4wnNYZu6LI,12445
+q2rad/q2appmanager.py,sha256=x37tKfvUu-w8Cbu_v-0kLJgnLPpJ2o4qKwWu90SqOaU,15464
+q2rad/q2appselector.py,sha256=H6rF_zJ6qOsUwKrUwaYl_YmPPSnWTsPawu-5RyJs_Lc,12198
 q2rad/q2constants.py,sha256=dQtN4OMvZw0FATDAFYjolI7eGMVUnNnbTl6qM-ggZ4I,3416
 q2rad/q2forms.py,sha256=yhTjLYZ2-UIo2Cz1K4wPY_pgsy9YGtm1NoJpGF3oh7U,10165
 q2rad/q2lines.py,sha256=jUx8_eDA0gZz3cx7_l3qKv-Gn4IRUtcqCyNIXeFWReA,12166
+q2rad/q2make.py,sha256=JgRocf8cDVIFiC_cuZtYh86ZvwQAy9p7o6TF3LHF0B4,4621
 q2rad/q2market.py,sha256=koWwKKc1MVn0ud2XDu_dal8lBFEMLX8KABpZO_OzTIM,2597
 q2rad/q2modules.py,sha256=N3OkUKfiwVZtmDyAtnJcs2Rprd7uIHd0HhjHTyFoN_s,4294
 q2rad/q2packages.py,sha256=IpWEcAT9nLCHUGViInEyM4T1cLEwK9GtNcdGF-pk0tw,3345
 q2rad/q2queries.py,sha256=abr4Fi3ou1CJsTD6vNfcjcakzjE6xTvh6OYY4bNWQLA,12314
-q2rad/q2rad.py,sha256=Co9v1DlrtjmCM2nXC9sPUDXkfTL2dt3jyDeeJJg7p-E,42830
+q2rad/q2rad.py,sha256=vnxy3MlksBzNiFm0VduiHpz96tdo3xsRPEZRDKokijw,42629
 q2rad/q2raddb.py,sha256=aG5SPEe4cnU_gO8zFmVkTDmIC0gcQFEIUv5NYGuqLlE,4372
 q2rad/q2reports.py,sha256=YhrbwFXTMTgtwIh5XSWaabseaZjRco34WO5mU676PU8,81238
 q2rad/q2stylesettings.py,sha256=esbfQoPgP7lJN2GRkqeQKjDpHCqCilJBzZf-c73ThCU,3593
-q2rad/q2utils.py,sha256=BA-8-objPNvw7QVKfLIsoKUDOTB_1i9AmioUerVn950,13875
-q2rad/version.py,sha256=w0yTzaLPxHMnkI0K1qHPJQ-vcKAvs1qdXwnV6CQgvq4,23
-q2rad-0.1.166.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.166.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.166.dist-info/METADATA,sha256=rFPVl3e3LbTZuMRjHUVK0JOQiXU0HaqOLT7c3D4K8fM,3509
-q2rad-0.1.166.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.166.dist-info/RECORD,,
+q2rad/q2utils.py,sha256=-U4TGTzinY-CrpMTdUAQQrOiG0BVGbeTykH9b6T5-nk,14136
+q2rad/version.py,sha256=DyRSMmft4IGMe-tnzgBjtW1T7qXZwYslbQrz7HufbVo,23
+q2rad-0.1.168.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
+q2rad-0.1.168.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
+q2rad-0.1.168.dist-info/METADATA,sha256=n_DoAsj0efX_ygqG2Lc0qO1grWkemQqZGAFXjZqLuzA,3509
+q2rad-0.1.168.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+q2rad-0.1.168.dist-info/RECORD,,