Skip to content

Commit 017fc8c

Browse files
JE-Chen45JE-Chen45
authored
Merge pull request #124 from Integration-Automation/dev
Update dev and stable version
2 parents c289072 + 4eedb7b commit 017fc8c

File tree

23 files changed

+135
-55
lines changed

23 files changed

+135
-55
lines changed

‎.idea/AutoControl.iml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/workspace.xml‎

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

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pip install je_auto_control
5353
## Info
5454

5555
> * requirement
56-
>> * Python 3.8 or later
56+
>> * Python 3.9 or later
5757
>> * pip 19.3 or later
5858
5959
> * Dev env

‎pyproject.toml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
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.153"
8+
name = "je_auto_control_dev"
9+
version = "0.0.95"
1010
authors = [
1111
{ name = "JE-Chen", email = "jechenmailman@gmail.com" },
1212
]
1313
description = "GUI Automation Framework"
14-
requires-python = ">=3.8"
14+
requires-python = ">=3.9"
1515
license = { text = "MIT" }
1616
dependencies = [
1717
"je_open_cv",
1818
"pillow",
19-
"numpy",
20-
"APScheduler",
19+
"APScheduler==3.10.1",
2120
"pyobjc-core;platform_system=='Darwin'",
2221
"pyobjc;platform_system=='Darwin'",
2322
"python-Xlib;platform_system=='Linux'"
2423
]
2524
classifiers = [
26-
"Programming Language :: Python :: 3.8",
25+
"Programming Language :: Python :: 3.9",
2726
"Development Status :: 2 - Pre-Alpha",
2827
"Environment :: Win32 (MS Windows)",
2928
"Environment :: MacOS X",

‎dev.toml‎ renamed to ‎stable.toml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
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.94"
8+
name = "je_auto_control"
9+
version = "0.0.154"
1010
authors = [
1111
{ name = "JE-Chen", email = "jechenmailman@gmail.com" },
1212
]
1313
description = "GUI Automation Framework"
14-
requires-python = ">=3.8"
14+
requires-python = ">=3.9"
1515
license = { text = "MIT" }
1616
dependencies = [
1717
"je_open_cv",
1818
"pillow",
19-
"APScheduler",
19+
"numpy",
20+
"APScheduler==3.10.1",
2021
"pyobjc-core;platform_system=='Darwin'",
2122
"pyobjc;platform_system=='Darwin'",
2223
"python-Xlib;platform_system=='Linux'"
2324
]
2425
classifiers = [
25-
"Programming Language :: Python :: 3.8",
26+
"Programming Language :: Python :: 3.9",
2627
"Development Status :: 2 - Pre-Alpha",
2728
"Environment :: Win32 (MS Windows)",
2829
"Environment :: MacOS X",

‎test/gui_test/calculator/calculator_executor.py‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
import subprocess
2+
from time import sleep
3+
4+
from je_auto_control import locate_and_click, executor
5+
6+
# 開啟windows 計算機
7+
# 並累加1至9
8+
# open windows calc.exe
9+
# and calculate 1 + 2 .... + 9
10+
11+
test_list = [
12+
["AC_add_package_to_executor", {"package": "subprocess"}],
13+
["subprocess_Popen", {"args": "calc"}],
14+
["AC_add_package_to_executor", {"package": "time"}],
15+
["time_sleep", [3]],
16+
["AC_locate_and_click",
17+
{"image": "./test_source/1.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
18+
["AC_locate_and_click",
19+
{"image": "./test_source/plus.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
20+
["AC_locate_and_click",
21+
{"image": "./test_source/2.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
22+
["AC_locate_and_click",
23+
{"image": "./test_source/equal.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
24+
["AC_locate_and_click",
25+
{"image": "./test_source/plus.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
26+
["AC_locate_and_click",
27+
{"image": "./test_source/3.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
28+
["AC_locate_and_click",
29+
{"image": "./test_source/equal.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
30+
["AC_locate_and_click",
31+
{"image": "./test_source/plus.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
32+
["AC_locate_and_click",
33+
{"image": "./test_source/4.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
34+
["AC_locate_and_click",
35+
{"image": "./test_source/equal.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
36+
["AC_locate_and_click",
37+
{"image": "./test_source/plus.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
38+
["AC_locate_and_click",
39+
{"image": "./test_source/5.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
40+
["AC_locate_and_click",
41+
{"image": "./test_source/equal.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
42+
["AC_locate_and_click",
43+
{"image": "./test_source/plus.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
44+
["AC_locate_and_click",
45+
{"image": "./test_source/6.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
46+
["AC_locate_and_click",
47+
{"image": "./test_source/equal.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
48+
["AC_locate_and_click",
49+
{"image": "./test_source/plus.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
50+
["AC_locate_and_click",
51+
{"image": "./test_source/7.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
52+
["AC_locate_and_click",
53+
{"image": "./test_source/equal.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
54+
["AC_locate_and_click",
55+
{"image": "./test_source/plus.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
56+
["AC_locate_and_click",
57+
{"image": "./test_source/8.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
58+
["AC_locate_and_click",
59+
{"image": "./test_source/equal.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
60+
["AC_locate_and_click",
61+
{"image": "./test_source/plus.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
62+
["AC_locate_and_click",
63+
{"image": "./test_source/9.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}],
64+
["AC_locate_and_click",
65+
{"image": "./test_source/equal.png", "mouse_keycode": "mouse_left", "detect_threshold": 0.9}]
66+
]
67+
68+
executor.execute_action(test_list)
69+

‎test/gui_test/calculator/test_source/1.png‎

250 Bytes
Loading

‎test/gui_test/calculator/test_source/2.png‎

405 Bytes
Loading

‎test/gui_test/calculator/test_source/3.png‎

412 Bytes
Loading

0 commit comments

Comments
 (0)