Skip to content

Commit 1e8c35d

Browse files
committed
update dev and stable version
fix import error and retry
1 parent 65b714c commit 1e8c35d

File tree

4 files changed

+32
-30
lines changed

4 files changed

+32
-30
lines changed

dev_setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name="je_auto_control_dev",
8-
version="0.0.46",
8+
version="0.0.47",
99
author="JE-Chen",
1010
author_email="[email protected]",
1111
description="auto testing",

je_auto_control/__init__.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,6 @@
22
import all wrapper function
33
"""
44

5-
__all__ = [
6-
"click_mouse", "mouse_table", "position", "press_mouse", "release_mouse",
7-
"scroll", "set_position", "special_table",
8-
"keys_table", "press_key", "release_key", "type_key", "check_key_is_press",
9-
"write", "hotkey",
10-
"size", "screenshot",
11-
"locate_all_image", "locate_image_center", "locate_and_click",
12-
"CriticalExit",
13-
"AutoControlException", "AutoControlKeyboardException",
14-
"AutoControlMouseException", "AutoControlCantFindKeyException",
15-
"AutoControlScreenException", "ImageNotFoundException",
16-
"AutoControlJsonActionException", "AutoControlRecordException",
17-
"AutoControlActionNullException", "AutoControlActionException",
18-
"record", "stop_record",
19-
"read_action_json", "write_action_json",
20-
"execute_action", "execute_files", "executor", "add_command_to_executor",
21-
"multiprocess_timeout", "test_record_instance",
22-
"screenshot",
23-
"pil_screenshot",
24-
"generate_html",
25-
"get_dir_files_as_list", "create_template_dir", "start_autocontrol_socket_server"
26-
]
27-
285
# Critical
296
from je_auto_control.utils.critical_exit.critcal_exit import CriticalExit
307
from je_auto_control.utils.exception.exceptions import AutoControlActionException
@@ -86,3 +63,26 @@
8663
from je_auto_control.wrapper.auto_control_screen import screenshot
8764
# import screen
8865
from je_auto_control.wrapper.auto_control_screen import size
66+
67+
__all__ = [
68+
"click_mouse", "mouse_table", "position", "press_mouse", "release_mouse",
69+
"scroll", "set_position", "special_table",
70+
"keys_table", "press_key", "release_key", "type_key", "check_key_is_press",
71+
"write", "hotkey",
72+
"size", "screenshot",
73+
"locate_all_image", "locate_image_center", "locate_and_click",
74+
"CriticalExit",
75+
"AutoControlException", "AutoControlKeyboardException",
76+
"AutoControlMouseException", "AutoControlCantFindKeyException",
77+
"AutoControlScreenException", "ImageNotFoundException",
78+
"AutoControlJsonActionException", "AutoControlRecordException",
79+
"AutoControlActionNullException", "AutoControlActionException",
80+
"record", "stop_record",
81+
"read_action_json", "write_action_json",
82+
"execute_action", "execute_files", "executor", "add_command_to_executor",
83+
"multiprocess_timeout", "test_record_instance",
84+
"screenshot",
85+
"pil_screenshot",
86+
"generate_html",
87+
"get_dir_files_as_list", "create_template_dir", "start_autocontrol_socket_server"
88+
]

je_auto_control/utils/executor/action_executor.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import sys
22
import types
33

4-
from je_auto_control import check_key_is_press, position, press_mouse, release_mouse, click_mouse, scroll
5-
from je_auto_control import locate_all_image, locate_and_click, locate_image_center
6-
from je_auto_control import press_key, release_key, hotkey, type_key, write, record, stop_record
7-
from je_auto_control import screenshot, size
8-
from je_auto_control import set_position
4+
from je_auto_control.wrapper.auto_control_keyboard import check_key_is_press
5+
from je_auto_control.wrapper.auto_control_mouse import position, press_mouse, release_mouse, click_mouse, scroll
6+
from je_auto_control.wrapper.auto_control_image import locate_all_image, locate_and_click, locate_image_center
7+
from je_auto_control.wrapper.auto_control_keyboard import press_key, release_key, hotkey, type_key, write
8+
from je_auto_control.wrapper.auto_control_record import record, stop_record
9+
from je_auto_control.wrapper.auto_control_screen import screenshot, size
10+
from je_auto_control.wrapper.auto_control_mouse import set_position
911
from je_auto_control.utils.exception.exception_tag import action_is_null_error, add_command_exception_tag, \
1012
executor_list_error
1113
from je_auto_control.utils.exception.exception_tag import cant_execute_action_error

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name="je_auto_control",
8-
version="0.0.112",
8+
version="0.0.113",
99
author="JE-Chen",
1010
author_email="[email protected]",
1111
description="auto testing",

0 commit comments

Comments
 (0)