From c168bd1f2cd6fbbcef96dc6f935a73ea0648f726 Mon Sep 17 00:00:00 2001
From: JeffreyChen <33644111+JE-Chen@users.noreply.github.com>
Date: Tue, 16 Jul 2024 09:33:58 +0800
Subject: [PATCH 1/2] Update new version to fix problem
Update new version to fix problem
* Not install Pyside6
---
.idea/workspace.xml | 8 +++-----
pyproject.toml | 15 ++++++++-------
dev.toml => stable.toml | 14 ++++++++------
3 files changed, 19 insertions(+), 18 deletions(-)
rename dev.toml => stable.toml (84%)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a10aa55..8081910 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,7 @@
-
-
-
-
+
@@ -70,7 +67,7 @@
"WebServerToolWindowFactoryState": "false",
"git-widget-placeholder": "dev",
"ignore.virus.scanning.warn.message": "true",
- "last_opened_file_path": "C:/Users/JeffreyChen/Desktop/Code_Space/AutoControlGUI",
+ "last_opened_file_path": "C:/Users/JeffreyChen/Desktop/Code_Space/APITestka",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
@@ -518,6 +515,7 @@
+
diff --git a/pyproject.toml b/pyproject.toml
index 22e08fe..5e1123e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,12 +1,12 @@
-# Rename to build stable version
-# This is stable version
+# Rename to build dev version
+# This is dev version
[build-system]
-requires = ["setuptools>=61.0"]
+requires = ["setuptools"]
build-backend = "setuptools.build_meta"
[project]
-name = "je_auto_control"
-version = "0.0.157"
+name = "je_auto_control_dev"
+version = "0.0.99"
authors = [
{ name = "JE-Chen", email = "jechenmailman@gmail.com" },
]
@@ -16,11 +16,12 @@ license = { text = "MIT" }
dependencies = [
"je_open_cv",
"pillow",
- "numpy",
"APScheduler",
"pyobjc-core;platform_system=='Darwin'",
"pyobjc;platform_system=='Darwin'",
- "python-Xlib;platform_system=='Linux'"
+ "python-Xlib;platform_system=='Linux'",
+ "Pyside6",
+ "qt-material"
]
classifiers = [
"Programming Language :: Python :: 3.9",
diff --git a/dev.toml b/stable.toml
similarity index 84%
rename from dev.toml
rename to stable.toml
index 6bfca2c..97340df 100644
--- a/dev.toml
+++ b/stable.toml
@@ -1,12 +1,12 @@
-# Rename to build dev version
-# This is dev version
+# Rename to build stable version
+# This is stable version
[build-system]
-requires = ["setuptools"]
+requires = ["setuptools>=61.0"]
build-backend = "setuptools.build_meta"
[project]
-name = "je_auto_control_dev"
-version = "0.0.98"
+name = "je_auto_control"
+version = "0.0.158"
authors = [
{ name = "JE-Chen", email = "jechenmailman@gmail.com" },
]
@@ -19,7 +19,9 @@ dependencies = [
"APScheduler",
"pyobjc-core;platform_system=='Darwin'",
"pyobjc;platform_system=='Darwin'",
- "python-Xlib;platform_system=='Linux'"
+ "python-Xlib;platform_system=='Linux'",
+ "Pyside6",
+ "qt-material"
]
classifiers = [
"Programming Language :: Python :: 3.9",
From 0a0bd1d59e0eed50a8363a58a881c9b3fce3dfeb Mon Sep 17 00:00:00 2001
From: JeffreyChen <33644111+JE-Chen@users.noreply.github.com>
Date: Tue, 16 Jul 2024 09:40:31 +0800
Subject: [PATCH 2/2] Fix test data
Fix test data
---
test/unit_test/argparse/test1.json | 12 ++++++------
test/unit_test/argparse/test2.json | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/test/unit_test/argparse/test1.json b/test/unit_test/argparse/test1.json
index ee0765c..31fd018 100644
--- a/test/unit_test/argparse/test1.json
+++ b/test/unit_test/argparse/test1.json
@@ -1,12 +1,12 @@
[
[
- "type_keyboard",
+ "AC_type_keyboard",
{
"keycode": 0
}
],
[
- "mouse_left",
+ "AC_mouse_left",
{
"mouse_keycode": "mouse_left",
"x": 500,
@@ -14,10 +14,10 @@
}
],
[
- "get_mouse_position"
+ "AC_get_mouse_position"
],
[
- "press_mouse",
+ "AC_press_mouse",
{
"mouse_keycode": "mouse_left",
"x": 500,
@@ -25,11 +25,11 @@
}
],
[
- "release_mouse",
+ "AC_release_mouse",
{
"mouse_keycode": "mouse_left",
"x": 500,
"y": 500
}
]
-]
\ No newline at end of file
+]
diff --git a/test/unit_test/argparse/test2.json b/test/unit_test/argparse/test2.json
index ee0765c..31fd018 100644
--- a/test/unit_test/argparse/test2.json
+++ b/test/unit_test/argparse/test2.json
@@ -1,12 +1,12 @@
[
[
- "type_keyboard",
+ "AC_type_keyboard",
{
"keycode": 0
}
],
[
- "mouse_left",
+ "AC_mouse_left",
{
"mouse_keycode": "mouse_left",
"x": 500,
@@ -14,10 +14,10 @@
}
],
[
- "get_mouse_position"
+ "AC_get_mouse_position"
],
[
- "press_mouse",
+ "AC_press_mouse",
{
"mouse_keycode": "mouse_left",
"x": 500,
@@ -25,11 +25,11 @@
}
],
[
- "release_mouse",
+ "AC_release_mouse",
{
"mouse_keycode": "mouse_left",
"x": 500,
"y": 500
}
]
-]
\ No newline at end of file
+]