[Automated] Merged develop into main

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -35,6 +35,7 @@ body:
       label: Version
       description: What version are you running? Look to OpenPype Tray
       options:
+        - 3.18.6
         - 3.18.6-nightly.2
         - 3.18.6-nightly.1
         - 3.18.5
@@ -134,7 +135,6 @@ body:
         - 3.15.9-nightly.2
         - 3.15.9-nightly.1
         - 3.15.8
-        - 3.15.8-nightly.3
     validations:
       required: true
   - type: dropdown

openpype/hosts/photoshop/api/lib.py

@@ -3,12 +3,11 @@ import sys
 import contextlib
 import traceback
 
-from qtpy import QtWidgets
-
 from openpype.lib import env_value_to_bool, Logger
 from openpype.modules import ModulesManager
 from openpype.pipeline import install_host
 from openpype.tools.utils import host_tools
+from openpype.tools.utils import get_openpype_qt_app
 from openpype.tests.lib import is_in_tests
 
 from .launch_logic import ProcessLauncher, stub
@@ -30,7 +29,7 @@ def main(*subprocess_args):
 
     # coloring in StdOutBroker
     os.environ["OPENPYPE_LOG_NO_COLORS"] = "False"
-    app = QtWidgets.QApplication([])
+    app = get_openpype_qt_app()
     app.setQuitOnLastWindowClosed(False)
 
     launcher = ProcessLauncher(subprocess_args)

openpype/settings/ayon_settings.py

@@ -1458,7 +1458,7 @@ class _AyonSettingsCache:
 
             variant = "production"
             if is_dev_mode_enabled():
-                variant = cls._get_dev_mode_settings_variant()
+                variant = cls._get_bundle_name()
             elif is_staging_enabled():
                 variant = "staging"
 
@@ -1474,28 +1474,6 @@ class _AyonSettingsCache:
     def _get_bundle_name(cls):
         return os.environ["AYON_BUNDLE_NAME"]
 
-    @classmethod
-    def _get_dev_mode_settings_variant(cls):
-        """Develop mode settings variant.
-
-        Returns:
-            str: Name of settings variant.
-        """
-
-        con = get_ayon_server_api_connection()
-        bundles = con.get_bundles()
-        user = con.get_user()
-        username = user["name"]
-        for bundle in bundles["bundles"]:
-            if (
-                bundle.get("isDev")
-                and bundle.get("activeUser") == username
-            ):
-                return bundle["name"]
-        # Return fake variant - distribution logic will tell user that he
-        #   does not have set any dev bundle
-        return "dev"
-
     @classmethod
     def get_value_by_project(cls, project_name):
         cache_item = _AyonSettingsCache.cache_by_project_name[project_name]