Merge pull request #27 from Intergration-Automation-Testing/dev

Refactor and update

auto_py_to_exe.json

@@ -0,0 +1,89 @@
+{
+ "version": "auto-py-to-exe-configuration_v1",
+ "pyinstallerOptions": [
+ {
+ "optionDest": "noconfirm",
+ "value": true
+ },
+ {
+ "optionDest": "filenames",
+ "value": "C:/Users/JeffreyChen/Desktop/Code_Space/AutomationEditor/exe/start_automation_editor.py"
+ },
+ {
+ "optionDest": "onefile",
+ "value": false
+ },
+ {
+ "optionDest": "console",
+ "value": false
+ },
+ {
+ "optionDest": "icon_file",
+ "value": "C:/Users/JeffreyChen/Desktop/Code_Space/AutomationEditor/exe/je_driver_icon.ico"
+ },
+ {
+ "optionDest": "name",
+ "value": "AutomationEditor"
+ },
+ {
+ "optionDest": "ascii",
+ "value": false
+ },
+ {
+ "optionDest": "clean_build",
+ "value": false
+ },
+ {
+ "optionDest": "strip",
+ "value": false
+ },
+ {
+ "optionDest": "noupx",
+ "value": false
+ },
+ {
+ "optionDest": "disable_windowed_traceback",
+ "value": false
+ },
+ {
+ "optionDest": "embed_manifest",
+ "value": true
+ },
+ {
+ "optionDest": "uac_admin",
+ "value": false
+ },
+ {
+ "optionDest": "uac_uiaccess",
+ "value": false
+ },
+ {
+ "optionDest": "win_private_assemblies",
+ "value": false
+ },
+ {
+ "optionDest": "win_no_prefer_redirects",
+ "value": false
+ },
+ {
+ "optionDest": "bootloader_ignore_signals",
+ "value": false
+ },
+ {
+ "optionDest": "argv_emulation",
+ "value": false
+ },
+ {
+ "optionDest": "datas",
+ "value": "C:/Users/JeffreyChen/Desktop/Code_Space/AutomationEditor/exe/je_driver_icon.ico;."
+ },
+ {
+ "optionDest": "pathex",
+ "value": "C:/Users/JeffreyChen/Desktop/Code_Space/AutomationEditor/venv"
+ }
+ ],
+ "nonPyinstallerOptions": {
+ "increaseRecursionLimit": true,
+ "manualArguments": ""
+ }
+}

automation_editor/automation_editor_ui/editor_main/main_ui.py

@@ -1,7 +1,7 @@
 import sys
 
 from PySide6.QtWidgets import QApplication
-from je_editor import EditorMain, shell_manager
+from je_editor import EditorMain, ShellManager
 from qt_material import apply_stylesheet
 
 from automation_editor.automation_editor_ui. \
@@ -29,8 +29,6 @@ def __init__(self):
  set_web_runner_menu(self)
  set_install_menu(self)
  syntax_extend_package(self)
- shell_manager.main_window = self
- shell_manager.later_init()
  self.setWindowTitle("Automation Editor")
 
 

automation_editor/automation_editor_ui/menu/install_menu/build_install_menu.py

@@ -5,44 +5,43 @@
 
 from PySide6.QtGui import QAction
 from PySide6.QtWidgets import QMainWindow
-from je_editor import shell_manager
-
+from je_editor import ShellManager
 
 def set_install_menu(ui_we_want_to_set: QMainWindow):
  ui_we_want_to_set.install_menu = ui_we_want_to_set.menu.addMenu("Install")
  # Try to install Build Tools
  ui_we_want_to_set.install_tool_action = QAction("Install Build Tools")
  ui_we_want_to_set.install_tool_action.triggered.connect(
- install_build_tools
+ lambda: install_build_tools(ui_we_want_to_set)
  )
  ui_we_want_to_set.install_menu.addAction(ui_we_want_to_set.install_tool_action)
  # Try to install AutoControl
  ui_we_want_to_set.install_autocontrol_action = QAction("Install AutoControl")
  ui_we_want_to_set.install_autocontrol_action.triggered.connect(
- install_autocontrol
+ lambda: install_autocontrol(ui_we_want_to_set)
  )
  ui_we_want_to_set.install_menu.addAction(ui_we_want_to_set.install_autocontrol_action)
  # Try to install APITestka
  ui_we_want_to_set.install_api_testka = QAction("Install APITestka")
  ui_we_want_to_set.install_api_testka.triggered.connect(
- install_api_testka
+ lambda: install_api_testka(ui_we_want_to_set)
  )
  ui_we_want_to_set.install_menu.addAction(ui_we_want_to_set.install_api_testka)
  # Try to install LoadDensity
  ui_we_want_to_set.install_load_density_action = QAction("Install LoadDensity")
  ui_we_want_to_set.install_load_density_action.triggered.connect(
- install_load_density
+ lambda: install_load_density(ui_we_want_to_set)
  )
  ui_we_want_to_set.install_menu.addAction(ui_we_want_to_set.install_load_density_action)
  # Try to install WebRunner
  ui_we_want_to_set.install_web_runner_action = QAction("Install WebRunner")
  ui_we_want_to_set.install_web_runner_action.triggered.connect(
- install_web_runner
+ lambda: install_web_runner(ui_we_want_to_set)
  )
  ui_we_want_to_set.install_menu.addAction(ui_we_want_to_set.install_web_runner_action)
 
 
-def install_package(package_text: str):
+def install_package(package_text: str, ui_we_want_to_set: QMainWindow):
  if sys.platform in ["win32", "cygwin", "msys"]:
  venv_path = Path(os.getcwd() + "/venv/Scripts")
  else:
@@ -61,24 +60,29 @@ def install_package(package_text: str):
  )
  else:
  compiler_path = shutil.which(cmd="python")
- shell_manager.exec_shell(f"{compiler_path} -m pip install {package_text}")
+ shell_manager = ShellManager()
+ shell_manager.main_window = ui_we_want_to_set
+ shell_manager.later_init()
+ shell_manager.exec_shell([f"{compiler_path}", "-m", "pip", "install", f"{package_text}"])
 
 
-def install_build_tools():
- install_package("setuptools build wheel")
+def install_build_tools(ui_we_want_to_set: QMainWindow):
+ install_package("setuptools", ui_we_want_to_set)
+ install_package("build", ui_we_want_to_set)
+ install_package("wheel", ui_we_want_to_set)
 
 
-def install_autocontrol():
- install_package("je_auto_control")
+def install_autocontrol(ui_we_want_to_set: QMainWindow):
+ install_package("je_auto_control", ui_we_want_to_set)
 
 
-def install_api_testka():
- install_package("je_api_testka")
+def install_api_testka(ui_we_want_to_set: QMainWindow):
+ install_package("je_api_testka", ui_we_want_to_set)
 
 
-def install_load_density():
- install_package("je_load_density")
+def install_load_density(ui_we_want_to_set: QMainWindow):
+ install_package("je_load_density", ui_we_want_to_set)
 
 
-def install_web_runner():
- install_package("je_web_runner")
+def install_web_runner(ui_we_want_to_set: QMainWindow):
+ install_package("je_web_runner", ui_we_want_to_set)

stable.toml → dev.toml

@@ -1,12 +1,12 @@
-# Rename to build stable version
-# This is stable version
+# Rename to dev version
+# This is dev version
 [build-system]
 requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "automation_editor"
-version = "0.0.6"
+name = "automation_editor_dev"
+version = "0.0.7"
 authors = [
  { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]

pyproject.toml

@@ -1,12 +1,12 @@
-# Rename to dev version
-# This is dev version
+# Rename to build stable version
+# This is stable version
 [build-system]
 requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "automation_editor_dev"
-version = "0.0.6"
+name = "automation_editor"
+version = "0.0.7"
 authors = [
  { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]