Skip to content

Commit 6e8d5d0

Browse files
authored
Merge pull request #106 from Intergration-Automation-Testing/dev
Dev
2 parents 3ad5f65 + 8a5b9e8 commit 6e8d5d0

File tree

6 files changed

+41
-34
lines changed

6 files changed

+41
-34
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,6 @@ dmypy.json
118118
# Pycharm
119119
.idea
120120
.idea/*
121+
.idea/AutoControl.iml
122+
.idea/misc.xml
121123
.idea/workspace.xml

.idea/workspace.xml

Lines changed: 25 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

je_auto_control/utils/callback/callback_function_executor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import typing
22
from sys import stderr
33

4-
from je_auto_control.utils.shell_process.shell_exec import ShellManager
5-
from je_auto_control.utils.start_exe.start_another_process import start_exe
64
from je_auto_control.utils.exception.exception_tags import get_bad_trigger_method, get_bad_trigger_function
75
from je_auto_control.utils.exception.exceptions import CallbackExecutorException
86
# executor
@@ -26,8 +24,10 @@
2624
from je_auto_control.utils.package_manager.package_manager_class import \
2725
package_manager
2826
from je_auto_control.utils.project.create_project_structure import create_project_dir
27+
from je_auto_control.utils.shell_process.shell_exec import ShellManager
2928
# socket server
3029
from je_auto_control.utils.socket_server.auto_control_socket_server import start_autocontrol_socket_server
30+
from je_auto_control.utils.start_exe.start_another_process import start_exe
3131
# test record
3232
from je_auto_control.utils.test_record.record_test_class import test_record_instance
3333
# import image

je_auto_control/utils/executor/action_executor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import types
44
from inspect import getmembers, isbuiltin
55

6-
from je_auto_control.utils.start_exe.start_another_process import start_exe
7-
from je_auto_control.utils.shell_process.shell_exec import ShellManager
86
from je_auto_control.utils.exception.exception_tags import action_is_null_error, add_command_exception_tag, \
97
executor_list_error
108
from je_auto_control.utils.exception.exception_tags import cant_execute_action_error
@@ -19,6 +17,8 @@
1917
from je_auto_control.utils.json.json_file import read_action_json
2018
from je_auto_control.utils.package_manager.package_manager_class import package_manager
2119
from je_auto_control.utils.project.create_project_structure import create_project_dir
20+
from je_auto_control.utils.shell_process.shell_exec import ShellManager
21+
from je_auto_control.utils.start_exe.start_another_process import start_exe
2222
from je_auto_control.utils.test_record.record_test_class import record_action_to_list, test_record_instance
2323
from je_auto_control.wrapper.auto_control_image import locate_all_image, locate_and_click, locate_image_center
2424
from je_auto_control.wrapper.auto_control_keyboard import check_key_is_press

pyproject.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Rename to build stable version
2-
# This is stable version
1+
# Rename to build dev version
2+
# This is dev version
33
[build-system]
4-
requires = ["setuptools>=61.0"]
4+
requires = ["setuptools"]
55
build-backend = "setuptools.build_meta"
66

77
[project]
8-
name = "je_auto_control"
9-
version = "0.0.140"
8+
name = "je_auto_control_dev"
9+
version = "0.0.79"
1010
authors = [
1111
{ name = "JE-Chen", email = "[email protected]" },
1212
]

dev.toml renamed to stable.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Rename to build dev version
2-
# This is dev version
1+
# Rename to build stable version
2+
# This is stable version
33
[build-system]
4-
requires = ["setuptools"]
4+
requires = ["setuptools>=61.0"]
55
build-backend = "setuptools.build_meta"
66

77
[project]
8-
name = "je_auto_control_dev"
9-
version = "0.0.77"
8+
name = "je_auto_control"
9+
version = "0.0.140"
1010
authors = [
1111
{ name = "JE-Chen", email = "[email protected]" },
1212
]

0 commit comments

Comments
 (0)