Skip to content

Commit 0e44688

Browse files
authored
Merge pull request #147 from Integration-Automation/dev
Dev
2 parents 30d9dc3 + fc13288 commit 0e44688

File tree

17 files changed

+63
-349
lines changed

17 files changed

+63
-349
lines changed

.github/workflows/dev_python3_10.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@ jobs:
8787
- name: Test Create Project Function
8888
run: python ./test/unit_test/create_project_file/create_project_test.py
8989

90-
- name: Test Interval Scheduler
91-
run: python ./test/unit_test/scheduler_test/sec_interval_test.py
92-
- name: Test Cron Scheduler
93-
run: python ./test/unit_test/scheduler_test/sec_cron_test.py
94-
9590
- name: Test Get Mouse Info
9691
run: python ./test/unit_test/get_info/mouse_info.py
9792
- name: Test Get Special Info

.github/workflows/dev_python3_11.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@ jobs:
8787
- name: Test Create Project Function
8888
run: python ./test/unit_test/create_project_file/create_project_test.py
8989

90-
- name: Test Interval Scheduler
91-
run: python ./test/unit_test/scheduler_test/sec_interval_test.py
92-
- name: Test Cron Scheduler
93-
run: python ./test/unit_test/scheduler_test/sec_cron_test.py
94-
9590
- name: Test Get Mouse Info
9691
run: python ./test/unit_test/get_info/mouse_info.py
9792
- name: Test Get Special Info

.github/workflows/dev_python3_9.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@ jobs:
8787
- name: Test Create Project Function
8888
run: python ./test/unit_test/create_project_file/create_project_test.py
8989

90-
- name: Test Interval Scheduler
91-
run: python ./test/unit_test/scheduler_test/sec_interval_test.py
92-
- name: Test Cron Scheduler
93-
run: python ./test/unit_test/scheduler_test/sec_cron_test.py
94-
9590
- name: Test Get Mouse Info
9691
run: python ./test/unit_test/get_info/mouse_info.py
9792
- name: Test Get Special Info

.github/workflows/stable_python3_10.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@ jobs:
8787
- name: Test Create Project Function
8888
run: python ./test/unit_test/create_project_file/create_project_test.py
8989

90-
- name: Test Interval Scheduler
91-
run: python ./test/unit_test/scheduler_test/sec_interval_test.py
92-
- name: Test Cron Scheduler
93-
run: python ./test/unit_test/scheduler_test/sec_cron_test.py
94-
9590
- name: Test Get Mouse Info
9691
run: python ./test/unit_test/get_info/mouse_info.py
9792
- name: Test Get Special Info

.github/workflows/stable_python3_11.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@ jobs:
8787
- name: Test Create Project Function
8888
run: python ./test/unit_test/create_project_file/create_project_test.py
8989

90-
- name: Test Interval Scheduler
91-
run: python ./test/unit_test/scheduler_test/sec_interval_test.py
92-
- name: Test Cron Scheduler
93-
run: python ./test/unit_test/scheduler_test/sec_cron_test.py
94-
9590
- name: Test Get Mouse Info
9691
run: python ./test/unit_test/get_info/mouse_info.py
9792
- name: Test Get Special Info

.github/workflows/stable_python3_9.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@ jobs:
8787
- name: Test Create Project Function
8888
run: python ./test/unit_test/create_project_file/create_project_test.py
8989

90-
- name: Test Interval Scheduler
91-
run: python ./test/unit_test/scheduler_test/sec_interval_test.py
92-
- name: Test Cron Scheduler
93-
run: python ./test/unit_test/scheduler_test/sec_cron_test.py
94-
9590
- name: Test Get Mouse Info
9691
run: python ./test/unit_test/get_info/mouse_info.py
9792
- name: Test Get Special Info

.idea/workspace.xml

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

dev.toml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,17 @@ build-backend = "setuptools.build_meta"
66

77
[project]
88
name = "je_auto_control_dev"
9-
version = "0.0.106"
9+
version = "0.0.107"
1010
authors = [
1111
{ name = "JE-Chen", email = "[email protected]" },
1212
]
1313
description = "GUI Automation Framework"
1414
requires-python = ">=3.9"
15-
license = { text = "MIT" }
15+
license-files = ["LICENSE"]
1616
dependencies = [
1717
"je_open_cv",
1818
"pillow",
19-
"APScheduler",
20-
"Pyside6",
19+
"Pyside6==6.8.2.1",
2120
"pyobjc-core;platform_system=='Darwin'",
2221
"pyobjc;platform_system=='Darwin'",
2322
"python-Xlib;platform_system=='Linux'",
@@ -29,7 +28,6 @@ classifiers = [
2928
"Environment :: Win32 (MS Windows)",
3029
"Environment :: MacOS X",
3130
"Environment :: X11 Applications",
32-
"License :: OSI Approved :: MIT License",
3331
"Operating System :: OS Independent"
3432
]
3533

@@ -42,9 +40,6 @@ Code = "https://github.com/Intergration-Automation-Testing/AutoControl"
4240
file = "README.md"
4341
content-type = "text/markdown"
4442

45-
[tool.setuptools]
46-
license-files = ["LICENSE"]
47-
4843
[tool.setuptools.packages]
4944
find = { namespaces = false }
5045

je_auto_control/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@
6060
package_manager
6161
from je_auto_control.utils.project.create_project_structure import \
6262
create_project_dir
63-
# Scheduler
64-
from je_auto_control.utils.scheduler.extend_apscheduler import SchedulerManager
6563
# Shell command
6664
from je_auto_control.utils.shell_process.shell_exec import ShellManager
6765
from je_auto_control.utils.shell_process.shell_exec import default_shell_manager
@@ -104,6 +102,8 @@
104102
# import screen
105103
from je_auto_control.wrapper.auto_control_screen import screen_size
106104
from je_auto_control.wrapper.auto_control_screen import screenshot
105+
# Recording
106+
from je_auto_control.utils.cv2_utils.video_recording import RecordingThread
107107

108108
__all__ = [
109109
"click_mouse", "mouse_keys_table", "get_mouse_position", "press_mouse", "release_mouse",
@@ -120,5 +120,5 @@
120120
"generate_html", "generate_html_report", "generate_json", "generate_json_report", "generate_xml",
121121
"generate_xml_report", "get_dir_files_as_list", "create_project_dir", "start_autocontrol_socket_server",
122122
"callback_executor", "package_manager", "get_special_table", "ShellManager", "default_shell_manager",
123-
"SchedulerManager"
123+
"RecordingThread"
124124
]

je_auto_control/utils/downloading/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)