Merge branch 'develop' into feature/AY-6021_Addons-initialization-for-child-processes

# Conflicts:
#	client/ayon_core/addon/base.py

client/ayon_core/addon/base.py

@@ -9,10 +9,9 @@ import logging
 import threading
 import collections
 from uuid import uuid4
-from abc import ABCMeta, abstractmethod
+from abc import ABC, abstractmethod
 from typing import Optional
 
-import six
 import appdirs
 import ayon_api
 from semver import VersionInfo
@@ -550,8 +549,7 @@ def is_func_marked(func):
     return getattr(func, _MARKING_ATTR, False)
 
 
-@six.add_metaclass(ABCMeta)
-class AYONAddon(object):
+class AYONAddon(ABC):
     """Base class of AYON addon.
 
     Attributes:

client/ayon_core/addon/interfaces.py

@@ -1,7 +1,5 @@
 from abc import ABCMeta, abstractmethod
 
-import six
-
 from ayon_core import resources
 
 
@@ -15,8 +13,7 @@ class _AYONInterfaceMeta(ABCMeta):
         return str(self)
 
 
-@six.add_metaclass(_AYONInterfaceMeta)
-class AYONInterface:
+class AYONInterface(metaclass=_AYONInterfaceMeta):
     """Base class of Interface that can be used as Mixin with abstract parts.
 
     This is way how AYON addon can define that contains specific predefined