From f6529ea0e7176d499f259cad0ea2664d4b77e42a Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Jun 2024 10:56:53 +0200 Subject: [PATCH 1/4] move timers managers client code next to server codebase --- .../timers_manager/client/ayon_timers_manager}/__init__.py | 0 .../timers_manager/client/ayon_timers_manager}/exceptions.py | 0 .../timers_manager/client/ayon_timers_manager}/idle_threads.py | 0 .../client/ayon_timers_manager}/launch_hooks/post_start_timer.py | 0 .../client/ayon_timers_manager}/plugins/publish/start_timer.py | 0 .../client/ayon_timers_manager}/plugins/publish/stop_timer.py | 0 .../timers_manager/client/ayon_timers_manager}/rest_api.py | 0 .../timers_manager/client/ayon_timers_manager}/timers_manager.py | 0 .../timers_manager/client/ayon_timers_manager}/version.py | 0 .../client/ayon_timers_manager}/widget_user_idle.py | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/__init__.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/exceptions.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/idle_threads.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/launch_hooks/post_start_timer.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/plugins/publish/start_timer.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/plugins/publish/stop_timer.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/rest_api.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/timers_manager.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/version.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/widget_user_idle.py (100%) diff --git a/client/ayon_core/modules/timers_manager/__init__.py b/server_addon/timers_manager/client/ayon_timers_manager/__init__.py similarity index 100% rename from client/ayon_core/modules/timers_manager/__init__.py rename to server_addon/timers_manager/client/ayon_timers_manager/__init__.py diff --git a/client/ayon_core/modules/timers_manager/exceptions.py b/server_addon/timers_manager/client/ayon_timers_manager/exceptions.py similarity index 100% rename from client/ayon_core/modules/timers_manager/exceptions.py rename to server_addon/timers_manager/client/ayon_timers_manager/exceptions.py diff --git a/client/ayon_core/modules/timers_manager/idle_threads.py b/server_addon/timers_manager/client/ayon_timers_manager/idle_threads.py similarity index 100% rename from client/ayon_core/modules/timers_manager/idle_threads.py rename to server_addon/timers_manager/client/ayon_timers_manager/idle_threads.py diff --git a/client/ayon_core/modules/timers_manager/launch_hooks/post_start_timer.py b/server_addon/timers_manager/client/ayon_timers_manager/launch_hooks/post_start_timer.py similarity index 100% rename from client/ayon_core/modules/timers_manager/launch_hooks/post_start_timer.py rename to server_addon/timers_manager/client/ayon_timers_manager/launch_hooks/post_start_timer.py diff --git a/client/ayon_core/modules/timers_manager/plugins/publish/start_timer.py b/server_addon/timers_manager/client/ayon_timers_manager/plugins/publish/start_timer.py similarity index 100% rename from client/ayon_core/modules/timers_manager/plugins/publish/start_timer.py rename to server_addon/timers_manager/client/ayon_timers_manager/plugins/publish/start_timer.py diff --git a/client/ayon_core/modules/timers_manager/plugins/publish/stop_timer.py b/server_addon/timers_manager/client/ayon_timers_manager/plugins/publish/stop_timer.py similarity index 100% rename from client/ayon_core/modules/timers_manager/plugins/publish/stop_timer.py rename to server_addon/timers_manager/client/ayon_timers_manager/plugins/publish/stop_timer.py diff --git a/client/ayon_core/modules/timers_manager/rest_api.py b/server_addon/timers_manager/client/ayon_timers_manager/rest_api.py similarity index 100% rename from client/ayon_core/modules/timers_manager/rest_api.py rename to server_addon/timers_manager/client/ayon_timers_manager/rest_api.py diff --git a/client/ayon_core/modules/timers_manager/timers_manager.py b/server_addon/timers_manager/client/ayon_timers_manager/timers_manager.py similarity index 100% rename from client/ayon_core/modules/timers_manager/timers_manager.py rename to server_addon/timers_manager/client/ayon_timers_manager/timers_manager.py diff --git a/client/ayon_core/modules/timers_manager/version.py b/server_addon/timers_manager/client/ayon_timers_manager/version.py similarity index 100% rename from client/ayon_core/modules/timers_manager/version.py rename to server_addon/timers_manager/client/ayon_timers_manager/version.py diff --git a/client/ayon_core/modules/timers_manager/widget_user_idle.py b/server_addon/timers_manager/client/ayon_timers_manager/widget_user_idle.py similarity index 100% rename from client/ayon_core/modules/timers_manager/widget_user_idle.py rename to server_addon/timers_manager/client/ayon_timers_manager/widget_user_idle.py From b05062474a02a99b0c78499ddd8f5f47eba901f6 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Jun 2024 10:59:22 +0200 Subject: [PATCH 2/4] update package.py and bump version --- .../timers_manager/client/ayon_timers_manager/version.py | 4 +++- server_addon/timers_manager/package.py | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/server_addon/timers_manager/client/ayon_timers_manager/version.py b/server_addon/timers_manager/client/ayon_timers_manager/version.py index 485f44ac21..95e413aaac 100644 --- a/server_addon/timers_manager/client/ayon_timers_manager/version.py +++ b/server_addon/timers_manager/client/ayon_timers_manager/version.py @@ -1 +1,3 @@ -__version__ = "0.1.1" +# -*- coding: utf-8 -*- +"""Package declaring AYON addon 'timers_manager' version.""" +__version__ = "0.2.0" diff --git a/server_addon/timers_manager/package.py b/server_addon/timers_manager/package.py index bd6b81b4b7..32dc7cfbf4 100644 --- a/server_addon/timers_manager/package.py +++ b/server_addon/timers_manager/package.py @@ -1,3 +1,10 @@ name = "timers_manager" title = "Timers Manager" -version = "0.1.1" +version = "0.2.0" + +client_dir = "ayon_timers_manager" + +ayon_required_addons = { + "core": ">0.3.2", +} +ayon_compatible_addons = {} From 426f057a7d19b362d3ee1e69771f9e59b5d01537 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:02:56 +0200 Subject: [PATCH 3/4] move pynput dependency to timers manager --- client/pyproject.toml | 1 - server_addon/timers_manager/client/pyproject.toml | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 server_addon/timers_manager/client/pyproject.toml diff --git a/client/pyproject.toml b/client/pyproject.toml index 5e811321f8..1502106f82 100644 --- a/client/pyproject.toml +++ b/client/pyproject.toml @@ -19,4 +19,3 @@ Click = "^8" OpenTimelineIO = "0.16.0" opencolorio = "2.2.1" Pillow = "9.5.0" -pynput = "^1.7.2" # Timers manager - TODO remove diff --git a/server_addon/timers_manager/client/pyproject.toml b/server_addon/timers_manager/client/pyproject.toml new file mode 100644 index 0000000000..364fb33712 --- /dev/null +++ b/server_addon/timers_manager/client/pyproject.toml @@ -0,0 +1,6 @@ +[project] +name="timers_manager" +description="AYON TimersManager addon." + +[ayon.runtimeDependencies] +pynput = "^1.7.2" \ No newline at end of file From fc86a1f4cd939deb3623331862cf6c7c7535f8ff Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:32:33 +0200 Subject: [PATCH 4/4] added timers manager milestone --- client/ayon_core/addon/base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py index 56298e0d06..8a23c1a5d7 100644 --- a/client/ayon_core/addon/base.py +++ b/client/ayon_core/addon/base.py @@ -61,6 +61,7 @@ MOVED_ADDON_MILESTONE_VERSIONS = { "hiero": VersionInfo(0, 2, 0), "max": VersionInfo(0, 2, 0), "photoshop": VersionInfo(0, 2, 0), + "timers_manager": VersionInfo(0, 2, 0), "traypublisher": VersionInfo(0, 2, 0), "tvpaint": VersionInfo(0, 2, 0), "maya": VersionInfo(0, 2, 0),