Skip to content

Commit fd12edb

Browse files
authored
Merge pull request #155 from Integration-Automation/dev
Dev
2 parents 0bc476f + 004db23 commit fd12edb

File tree

6 files changed

+79
-71
lines changed

6 files changed

+79
-71
lines changed

.github/workflows/dev_python3_12.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: AutoControl Dev Python3.9
1+
name: AutoControl Dev Python3.12
22

33
on:
44
push:

.github/workflows/stable_python3_12.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: AutoControl Stable Python3.9
1+
name: AutoControl Stable Python3.12
22

33
on:
44
push:

.idea/workspace.xml

Lines changed: 6 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 61 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,80 @@
11
# error tags
2-
je_auto_control_error: str = "Auto control error"
3-
je_auto_control_critical_exit_error: str = "Auto control critical exit error"
2+
je_auto_control_error: str = "Auto-control error"
3+
je_auto_control_critical_exit_error: str = "Auto-control critical exit error"
4+
45
# os tags
5-
linux_import_error: str = "should be only loaded on linux"
6-
osx_import_error: str = "should be only loaded on MacOS"
7-
windows_import_error: str = "should be only loaded on windows"
8-
macos_record_error: str = "macos cant use recorder"
6+
linux_import_error: str = "Should only be loaded on Linux"
7+
osx_import_error: str = "Should only be loaded on macOS"
8+
windows_import_error: str = "Should only be loaded on Windows"
9+
macos_record_error: str = "Cannot use recorder on macOS"
10+
911
# keyboard tags
10-
keyboard_error: str = "Auto control keyboard error"
11-
keyboard_press_key: str = "keyboard press key error"
12-
keyboard_release_key: str = "keyboard release key error"
13-
keyboard_type_key: str = "keyboard type key error"
14-
keyboard_write: str = "keyboard write error"
15-
keyboard_write_cant_find: str = "keyboard write error cant find key"
16-
keyboard_hotkey: str = "keyboard hotkey error"
12+
keyboard_error: str = "Auto-control keyboard error"
13+
keyboard_press_key: str = "Keyboard key press error"
14+
keyboard_release_key: str = "Keyboard key release error"
15+
keyboard_type_key: str = "Keyboard key type error"
16+
keyboard_write: str = "Keyboard write error"
17+
keyboard_write_cant_find: str = "Keyboard write error: key not found"
18+
keyboard_hotkey: str = "Keyboard hotkey error"
19+
1720
# mouse tags
18-
mouse_error: str = "Auto control mouse error"
19-
mouse_get_position: str = "mouse get position error"
20-
mouse_set_position: str = "mouse set position error"
21-
mouse_press_mouse: str = "mouse press mouse error"
22-
mouse_release_mouse: str = "mouse release key error"
23-
mouse_click_mouse: str = "mouse click mouse error"
24-
mouse_scroll: str = "mouse scroll error"
25-
mouse_wrong_value: str = "mouse value error"
21+
mouse_error: str = "Auto-control mouse error"
22+
mouse_get_position: str = "Mouse position retrieval error"
23+
mouse_set_position: str = "Mouse position set error"
24+
mouse_press_mouse: str = "Mouse press error"
25+
mouse_release_mouse: str = "Mouse release error"
26+
mouse_click_mouse: str = "Mouse click error"
27+
mouse_scroll: str = "Mouse scroll error"
28+
mouse_wrong_value: str = "Mouse value error"
29+
2630
# screen tags
27-
screen_error: str = "Auto control screen error"
28-
screen_get_size: str = "screen get size error"
29-
screen_screenshot: str = "screen screenshot error"
31+
screen_error: str = "Auto-control screen error"
32+
screen_get_size: str = "Screen size retrieval error"
33+
screen_screenshot: str = "Screen screenshot error"
34+
3035
# table tags
31-
table_cant_find_key: str = "cant find key error"
36+
table_cant_find_key: str = "Cannot find key error"
37+
3238
# cv2_utils tags
33-
cant_find_image: str = "cant find cv2_utils"
34-
find_image_error_variable: str = "variable error"
39+
cant_find_image: str = "Cannot find image"
40+
find_image_error_variable: str = "Variable error"
41+
3542
# listener tags
36-
listener_error: str = "Auto control listener error"
43+
listener_error: str = "Auto-control listener error"
44+
3745
# test_record tags
38-
record_queue_error: str = "cant get test_record queue its none are you using stop test_record before test_record"
46+
record_queue_error: str = "Cannot get test_record queue: it is None. Are you stopping test_record before running it?"
3947
record_not_found_action_error: str = "test_record action not found"
48+
4049
# json tag
41-
cant_execute_action_error: str = "cant execute action"
42-
cant_generate_json_report: str = "can't generate json report"
43-
cant_find_json_error: str = "cant find json file"
44-
cant_save_json_error: str = "cant save json file"
45-
action_is_null_error: str = "json action is null"
50+
cant_execute_action_error: str = "Cannot execute action"
51+
cant_generate_json_report: str = "Cannot generate JSON report"
52+
cant_find_json_error: str = "Cannot find JSON file"
53+
cant_save_json_error: str = "Cannot save JSON file"
54+
action_is_null_error: str = "JSON action is null"
55+
4656
# timeout tag
47-
timeout_need_on_main_error: str = "should put timeout function on main"
57+
timeout_need_on_main_error: str = "Timeout function must be in main"
58+
4859
# HTML
49-
html_generate_no_data_tag: str = "record is None"
60+
html_generate_no_data_tag: str = "Record is None"
61+
5062
# add command
51-
add_command_exception: str = "command value type should be as method or function"
63+
add_command_exception: str = "Command value must be a method or function"
64+
5265
# executor
53-
executor_list_error: str = "executor receive wrong data list is none or wrong type"
66+
executor_list_error: str = "Executor received invalid data: list is None or wrong type"
67+
5468
# argparse
55-
argparse_get_wrong_data: str = "argparse receive wrong data"
69+
argparse_get_wrong_data: str = "Argparse received invalid data"
70+
5671
# XML
57-
cant_read_xml_error: str = "can't read xml"
58-
xml_type_error: str = "xml type error"
72+
cant_read_xml_error: str = "Cannot read XML"
73+
xml_type_error: str = "XML type error"
74+
5975
# Callback executor
60-
get_bad_trigger_method: str = "get bad trigger method, only accept kwargs and args"
61-
get_bad_trigger_function: str = "get bad trigger function only accept function in event_dict"
76+
get_bad_trigger_method: str = "Invalid trigger method: only kwargs and args accepted"
77+
get_bad_trigger_function: str = "Invalid trigger function: only functions in event_dict accepted"
78+
6279
# Can't find file
63-
can_not_find_file: str = "Can not find file"
80+
can_not_find_file: str = "Cannot find file"

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.170"
8+
name = "je_auto_control_dev"
9+
version = "0.0.117"
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.116"
8+
name = "je_auto_control"
9+
version = "0.0.171"
1010
authors = [
1111
{ name = "JE-Chen", email = "[email protected]" },
1212
]

0 commit comments

Comments
 (0)