Skip to content

Commit

Permalink
Merge pull request #140 from Integration-Automation/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
JE-Chen committed Jul 16, 2024
2 parents 709dd15 + 0a0bd1d commit abbc545
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 30 deletions.
8 changes: 3 additions & 5 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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" },
]
Expand All @@ -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",
Expand Down
14 changes: 8 additions & 6 deletions dev.toml → stable.toml
Original file line number Diff line number Diff line change
@@ -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" },
]
Expand All @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions test/unit_test/argparse/test1.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
[
[
"type_keyboard",
"AC_type_keyboard",
{
"keycode": 0
}
],
[
"mouse_left",
"AC_mouse_left",
{
"mouse_keycode": "mouse_left",
"x": 500,
"y": 500
}
],
[
"get_mouse_position"
"AC_get_mouse_position"
],
[
"press_mouse",
"AC_press_mouse",
{
"mouse_keycode": "mouse_left",
"x": 500,
"y": 500
}
],
[
"release_mouse",
"AC_release_mouse",
{
"mouse_keycode": "mouse_left",
"x": 500,
"y": 500
}
]
]
]
12 changes: 6 additions & 6 deletions test/unit_test/argparse/test2.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
[
[
"type_keyboard",
"AC_type_keyboard",
{
"keycode": 0
}
],
[
"mouse_left",
"AC_mouse_left",
{
"mouse_keycode": "mouse_left",
"x": 500,
"y": 500
}
],
[
"get_mouse_position"
"AC_get_mouse_position"
],
[
"press_mouse",
"AC_press_mouse",
{
"mouse_keycode": "mouse_left",
"x": 500,
"y": 500
}
],
[
"release_mouse",
"AC_release_mouse",
{
"mouse_keycode": "mouse_left",
"x": 500,
"y": 500
}
]
]
]

0 comments on commit abbc545

Please sign in to comment.