Merge branch 'develop' into enhancement/product_group_add_existing_gr…

…oup_picker
ynput · Sep 17, 2024 · 3372fee · 3372fee
2 parents 042b3f9 + 1316fe5
commit 3372fee
Show file tree

Hide file tree

Showing 871 changed files with 9,172 additions and 98,124 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,7 +34,6 @@ Temporary Items
 
 # Package dirs
 ###########
-/server_addon/packages/*
 /package/*
 
 /.venv

diff --git a/client/ayon_core/__init__.py b/client/ayon_core/__init__.py
@@ -9,10 +9,6 @@
 # -------------------------
 PACKAGE_DIR = AYON_CORE_ROOT
 PLUGINS_DIR = os.path.join(AYON_CORE_ROOT, "plugins")
-AYON_SERVER_ENABLED = True
-
-# Indicate if AYON entities should be used instead of OpenPype entities
-USE_AYON_ENTITIES = True
 # -------------------------
 
 
@@ -23,6 +19,4 @@
     "AYON_CORE_ROOT",
     "PACKAGE_DIR",
     "PLUGINS_DIR",
-    "AYON_SERVER_ENABLED",
-    "USE_AYON_ENTITIES",
 )
diff --git a/client/ayon_core/addon/README.md b/client/ayon_core/addon/README.md
@@ -86,7 +86,3 @@ AYON addons should contain separated logic of specific kind of implementation, s
  "inventory": []
  }
  ```
-
-### TrayAddonsManager
-- inherits from `AddonsManager`
-- has specific implementation for AYON Tray and handle `ITrayAddon` methods
diff --git a/client/ayon_core/addon/__init__.py b/client/ayon_core/addon/__init__.py
@@ -9,12 +9,18 @@
 )
 
 from .base import (
+    ProcessPreparationError,
+    ProcessContext,
     AYONAddon,
     AddonsManager,
-    TrayAddonsManager,
     load_addons,
 )
 
+from .utils import (
+    ensure_addons_are_process_context_ready,
+    ensure_addons_are_process_ready,
+)
+
 
 __all__ = (
     "click_wrap",
@@ -25,8 +31,12 @@
     "ITrayService",
     "IHostAddon",
 
+    "ProcessPreparationError",
+    "ProcessContext",
     "AYONAddon",
     "AddonsManager",
-    "TrayAddonsManager",
     "load_addons",
+
+    "ensure_addons_are_process_context_ready",
+    "ensure_addons_are_process_ready",
 )