Merge pull request #43 from pypeclub/host-openpype-chasing

Host openpype chasing
2025-12-24 21:04:40 +01:00 · 2021-04-01 22:32:31 +02:00 · 2021-04-01 22:32:31 +02:00 · 08712d7833
commit 08712d7833
parent 2a4fe19918 f8176be18b
20 changed files with 49 additions and 48 deletions
--- a/openpype/hooks/pre_non_python_host_launch.py
+++ b/openpype/hooks/pre_non_python_host_launch.py
@ -5,7 +5,7 @@ from openpype.lib import (
    get_pype_execute_args
 )

-from openpype import PACKAGE_DIR as PYPE_DIR
+from openpype import PACKAGE_DIR as OPENPYPE_DIR


 class NonPythonHostHook(PreLaunchHook):
@ -13,7 +13,7 @@ class NonPythonHostHook(PreLaunchHook):

    Non python host implementation do not launch host directly but use
    python script which launch the host. For these cases it is necessary to
-    prepend python (or pype) executable and script path before application's.
+    prepend python (or openpype) executable and script path before application's.
    """
    app_groups = ["harmony", "photoshop", "aftereffects"]

@ -27,7 +27,7 @@ class NonPythonHostHook(PreLaunchHook):
            remainders.append(self.launch_context.launch_args.pop(0))

        script_path = os.path.join(
-            PYPE_DIR,
+            OPENPYPE_DIR,
            "scripts",
            "non_python_host_launch.py"
        )
--- a/openpype/hooks/pre_python2_vendor.py
+++ b/openpype/hooks/pre_python2_vendor.py
@ -4,7 +4,7 @@ from openpype.lib import PreLaunchHook

 class PrePython2Vendor(PreLaunchHook):
    """Prepend python 2 dependencies for py2 hosts."""
-    # WARNING This hook will probably be deprecated in Pype 3 - kept for test
+    # WARNING This hook will probably be deprecated in OpenPype 3 - kept for test
    order = 10
    app_groups = ["hiero", "nuke", "nukex"]

@ -14,7 +14,7 @@ class PrePython2Vendor(PreLaunchHook):
        pype_root = os.getenv("OPENPYPE_ROOT")
        python_2_vendor = os.path.join(
            pype_root,
-            "pype",
+            "openpype",
            "vendor",
            "python",
            "python_2"
--- a/openpype/hosts/blender/plugins/load/load_action.py
+++ b/openpype/hosts/blender/plugins/load/load_action.py
@ -9,7 +9,7 @@ from avalon import api, blender
 import bpy
 import openpype.hosts.blender.api.plugin

-logger = logging.getLogger("pype").getChild("blender").getChild("load_action")
+logger = logging.getLogger("openpype").getChild("blender").getChild("load_action")


 class BlendActionLoader(openpype.hosts.blender.api.plugin.AssetLoader):
--- a/openpype/hosts/blender/plugins/load/load_animation.py
+++ b/openpype/hosts/blender/plugins/load/load_animation.py
@ -10,7 +10,7 @@ import bpy
 import openpype.hosts.blender.api.plugin


-logger = logging.getLogger("pype").getChild(
+logger = logging.getLogger("openpype").getChild(
    "blender").getChild("load_animation")


--- a/openpype/hosts/blender/plugins/load/load_camera.py
+++ b/openpype/hosts/blender/plugins/load/load_camera.py
@ -9,7 +9,7 @@ from avalon import api, blender
 import bpy
 import openpype.hosts.blender.api.plugin

-logger = logging.getLogger("pype").getChild("blender").getChild("load_camera")
+logger = logging.getLogger("openpype").getChild("blender").getChild("load_camera")


 class BlendCameraLoader(openpype.hosts.blender.api.plugin.AssetLoader):
--- a/openpype/hosts/harmony/api/init.py
+++ b/openpype/hosts/harmony/api/init.py
@ -15,7 +15,7 @@ import avalon.api
 import avalon.tools.sceneinventory


-log = logging.getLogger("pype.hosts.harmony")
+log = logging.getLogger("openpype.hosts.harmony")

 HOST_DIR = os.path.dirname(os.path.abspath(openpype.hosts.harmony.__file__))
 PLUGINS_DIR = os.path.join(HOST_DIR, "plugins")
--- a/openpype/hosts/houdini/api/init.py
+++ b/openpype/hosts/houdini/api/init.py
@ -13,7 +13,7 @@ from openpype.hosts.houdini.api import lib

 from openpype.lib import any_outdated

-log = logging.getLogger("pype.hosts.houdini")
+log = logging.getLogger("openpype.hosts.houdini")

 HOST_DIR = os.path.dirname(os.path.abspath(openpype.hosts.houdini.__file__))
 PLUGINS_DIR = os.path.join(HOST_DIR, "plugins")
--- a/openpype/hosts/maya/api/init.py
+++ b/openpype/hosts/maya/api/init.py
@ -15,7 +15,7 @@ import openpype.hosts.maya
 from openpype.hosts.maya.lib import copy_workspace_mel
 from . import menu, lib

-log = logging.getLogger("pype.hosts.maya")
+log = logging.getLogger("openpype.hosts.maya")

 HOST_DIR = os.path.dirname(os.path.abspath(openpype.hosts.maya.__file__))
 PLUGINS_DIR = os.path.join(HOST_DIR, "plugins")
--- a/openpype/hosts/maya/api/attributes.py
+++ b/openpype/hosts/maya/api/attributes.py
@ -3,7 +3,7 @@

 https://github.com/Colorbleed/colorbleed-config/blob/acre/colorbleed/maya/lib_rendersetup.py
 Credits: Roy Nieterau (BigRoy) / Colorbleed
-Modified for use in Pype
+Modified for use in OpenPype

 """

--- a/openpype/hosts/maya/api/menu.py
+++ b/openpype/hosts/maya/api/menu.py
@ -127,7 +127,7 @@ def uninstall():

 def install():
    if cmds.about(batch=True):
-        log.info("Skipping pype.menu initialization in batch mode..")
+        log.info("Skipping openpype.menu initialization in batch mode..")
        return

    uninstall()
--- a/openpype/hosts/maya/api/render_setup_tools.py
+++ b/openpype/hosts/maya/api/render_setup_tools.py
@ -5,7 +5,7 @@ Export Maya nodes from Render Setup layer as if flattened in that layer instead
 of exporting the defaultRenderLayer as Maya forces by default

 Credits: Roy Nieterau (BigRoy) / Colorbleed
-Modified for use in Pype
+Modified for use in OpenPype

 """

--- a/openpype/hosts/maya/plugins/load/load_rendersetup.py
+++ b/openpype/hosts/maya/plugins/load/load_rendersetup.py
@ -32,6 +32,7 @@ class RenderSetupLoader(api.Loader):
    def load(self, context, name, namespace, data):
        """Load RenderSetup settings."""
        from avalon.maya.pipeline import containerise
+
        # from openpype.hosts.maya.api.lib import namespaced

        asset = context['asset']['name']
--- a/openpype/hosts/tvpaint/api/init.py
+++ b/openpype/hosts/tvpaint/api/init.py
@ -8,7 +8,7 @@ import pyblish.api

 from openpype.hosts import tvpaint

-log = logging.getLogger("pype.hosts.tvpaint")
+log = logging.getLogger("openpype.hosts.tvpaint")

 HOST_DIR = os.path.dirname(os.path.abspath(tvpaint.__file__))
 PLUGINS_DIR = os.path.join(HOST_DIR, "plugins")
@ -35,7 +35,7 @@ def on_instance_toggle(instance, old_value, new_value):


 def install():
-    log.info("Pype - Installing TVPaint integration")
+    log.info("OpenPype - Installing TVPaint integration")
    localization_file = os.path.join(HOST_DIR, "resources", "avalon.loc")
    register_localization_file(localization_file)

@ -51,7 +51,7 @@ def install():


 def uninstall():
-    log.info("Pype - Uninstalling TVPaint integration")
+    log.info("OpenPype - Uninstalling TVPaint integration")
    pyblish.api.deregister_plugin_path(PUBLISH_PATH)
    avalon.api.deregister_plugin_path(avalon.api.Loader, LOAD_PATH)
    avalon.api.deregister_plugin_path(avalon.api.Creator, CREATE_PATH)
--- a/openpype/hosts/unreal/api/init.py
+++ b/openpype/hosts/unreal/api/init.py
@ -5,7 +5,7 @@ from avalon import api as avalon
 from pyblish import api as pyblish
 import openpype.hosts.unreal

-logger = logging.getLogger("pype.hosts.unreal")
+logger = logging.getLogger("openpype.hosts.unreal")

 HOST_DIR = os.path.dirname(os.path.abspath(openpype.hosts.unreal.__file__))
 PLUGINS_DIR = os.path.join(HOST_DIR, "plugins")
@ -30,9 +30,9 @@ def install():
 .
 '''
    print(logo)
-    print("installing Pype for Unreal ...")
+    print("installing OpenPype for Unreal ...")
    print("-=" * 40)
-    logger.info("installing Pype for Unreal")
+    logger.info("installing OpenPype for Unreal")
    pyblish.register_plugin_path(str(PUBLISH_PATH))
    avalon.register_plugin_path(avalon.Loader, str(LOAD_PATH))
    avalon.register_plugin_path(avalon.Creator, str(CREATE_PATH))
--- a/openpype/hosts/unreal/api/plugin.py
+++ b/openpype/hosts/unreal/api/plugin.py
@ -3,10 +3,10 @@ import openpype.api


 class Creator(openpype.api.Creator):
-    """This serves as skeleton for future Pype specific functionality"""
+    """This serves as skeleton for future OpenPype specific functionality"""
    pass


 class Loader(api.Loader):
-    """This serves as skeleton for future Pype specific functionality"""
+    """This serves as skeleton for future OpenPype specific functionality"""
    pass
--- a/openpype/settings/defaults/system_settings/applications.json
+++ b/openpype/settings/defaults/system_settings/applications.json
@ -7,8 +7,8 @@
        "environment": {
            "PYTHONPATH": [
                "{OPENPYPE_ROOT}/pype/hosts/maya/startup",
-                "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/maya",
-                "{OPENPYPE_REPOS_ROOT}/maya-look-assigner",
+                "{OPENPYPE_ROOT}/repos/avalon-core/setup/maya",
+                "{OPENPYPE_ROOT}/repos/maya-look-assigner",
                "{PYTHONPATH}"
            ],
            "MAYA_DISABLE_CLIC_IPM": "Yes",
@ -91,8 +91,8 @@
        "host_name": "maya",
        "environment": {
            "PYTHONPATH": [
-                "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/maya",
-                "{OPENPYPE_REPOS_ROOT}/maya-look-assigner",
+                "{OPENPYPE_ROOT}/avalon-core/setup/maya",
+                "{OPENPYPE_ROOT}/maya-look-assigner",
                "{PYTHON_ENV}/python2/Lib/site-packages",
                "{PYTHONPATH}"
            ],
@ -171,8 +171,8 @@
        "host_name": "nuke",
        "environment": {
            "NUKE_PATH": [
-                "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/nuke/nuke_path",
-                "{OPENPYPE_ROOT}/pype/hosts/nuke/startup",
+                "{OPENPYPE_ROOT}/repos/avalon-core/setup/nuke/nuke_path",
+                "{OPENPYPE_ROOT}/openpype/hosts/nuke/startup",
                "{OPENPYPE_STUDIO_PLUGINS}/nuke"
            ],
            "PATH": {
@ -264,8 +264,8 @@
        "host_name": "nuke",
        "environment": {
            "NUKE_PATH": [
-                "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/nuke/nuke_path",
-                "{OPENPYPE_ROOT}/pype/hosts/nuke/startup",
+                "{OPENPYPE_ROOT}/repos/avalon-core/setup/nuke/nuke_path",
+                "{OPENPYPE_ROOT}/openpype/hosts/nuke/startup",
                "{OPENPYPE_STUDIO_PLUGINS}/nuke"
            ],
            "PATH": {
@ -381,7 +381,7 @@
        "host_name": "hiero",
        "environment": {
            "HIERO_PLUGIN_PATH": [
-                "{OPENPYPE_ROOT}/pype/hosts/hiero/startup"
+                "{OPENPYPE_ROOT}/openpype/hosts/hiero/startup"
            ],
            "PATH": {
                "windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}"
@ -496,7 +496,7 @@
        "host_name": "hiero",
        "environment": {
            "HIERO_PLUGIN_PATH": [
-                "{OPENPYPE_ROOT}/pype/hosts/hiero/startup"
+                "{OPENPYPE_ROOT}/openpype/hosts/hiero/startup"
            ],
            "PATH": {
                "windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}"
@ -709,7 +709,7 @@
                "{PYTHON36_RESOLVE}/Scripts",
                "{PATH}"
            ],
-            "PRE_PYTHON_SCRIPT": "{OPENPYPE_ROOT}/pype/resolve/preload_console.py",
+            "PRE_PYTHON_SCRIPT": "{OPENPYPE_ROOT}/openpype/resolve/preload_console.py",
            "OPENPYPE_LOG_NO_COLORS": "True",
            "RESOLVE_DEV": "True"
        },
@ -740,14 +740,14 @@
        "host_name": "houdini",
        "environment": {
            "HOUDINI_PATH": {
-                "darwin": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup:&",
-                "linux": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup:&",
-                "windows": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup;&"
+                "darwin": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup:&",
+                "linux": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup:&",
+                "windows": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup;&"
            },
            "HOUDINI_MENU_PATH": {
-                "darwin": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup:&",
-                "linux": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup:&",
-                "windows": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup;&"
+                "darwin": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup:&",
+                "linux": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup:&",
+                "windows": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup;&"
            }
        },
        "variants": {
@ -806,9 +806,9 @@
        "icon": "{}/app_icons/blender.png",
        "host_name": "blender",
        "environment": {
-            "BLENDER_USER_SCRIPTS": "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/blender",
+            "BLENDER_USER_SCRIPTS": "{OPENPYPE_ROOT}/repos/avalon-core/setup/blender",
            "PYTHONPATH": [
-                "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/blender",
+                "{OPENPYPE_ROOT}/repos/avalon-core/setup/blender",
                "{PYTHONPATH}"
            ],
            "CREATE_NEW_CONSOLE": "yes"
@ -1053,7 +1053,7 @@
        "icon": "app_icons/celaction.png",
        "host_name": "celaction",
        "environment": {
-            "CELACTION_TEMPLATE": "{OPENPYPE_ROOT}/pype/hosts/celaction/celaction_template_scene.scn"
+            "CELACTION_TEMPLATE": "{OPENPYPE_ROOT}/openpype/hosts/celaction/celaction_template_scene.scn"
        },
        "variants": {
            "celation_Local": {
@ -1075,7 +1075,7 @@
        "icon": "{}/app_icons/ue4.png'",
        "host_name": "unreal",
        "environment": {
-            "AVALON_UNREAL_PLUGIN": "{OPENPYPE_REPOS_ROOT}/avalon-unreal-integration",
+            "AVALON_UNREAL_PLUGIN": "{OPENPYPE_ROOT}/repos/avalon-unreal-integration",
            "OPENPYPE_LOG_NO_COLORS": "True",
            "QT_PREFERRED_BINDING": "PySide"
        },
--- a/openpype/settings/defaults/system_settings/modules.json
+++ b/openpype/settings/defaults/system_settings/modules.json
@ -9,7 +9,7 @@
    },
    "ftrack": {
        "enabled": true,
-        "ftrack_server": "https://pype.ftrackapp.com",
+        "ftrack_server": "",
        "ftrack_actions_path": [],
        "ftrack_events_path": [],
        "intent": {
@ -131,7 +131,7 @@
    },
    "clockify": {
        "enabled": false,
-        "workspace_name": "studio name"
+        "workspace_name": ""
    },
    "sync_server": {
        "enabled": false
--- a/openpype/settings/defaults/system_settings/tools.json
+++ b/openpype/settings/defaults/system_settings/tools.json
@ -2,7 +2,7 @@
    "tool_groups": {
        "mtoa": {
            "environment": {
-                "MTOA": "{OPENPYPE_STUDIO_SOFTWARE}/arnold/mtoa_{MAYA_VERSION}_{MTOA_VERSION}",
+                "MTOA": "{STUDIO_SOFTWARE}/arnold/mtoa_{MAYA_VERSION}_{MTOA_VERSION}",
                "MAYA_RENDER_DESC_PATH": "{MTOA}",
                "MAYA_MODULE_PATH": "{MTOA}",
                "ARNOLD_PLUGIN_PATH": "{MTOA}/shaders",
--- a/repos/avalon-core
+++ b/repos/avalon-core
@ -1 +1 @@
-Subproject commit 09065aaf6b8617a0af0a6f0f82bb1cabf6b0890e
+Subproject commit 63dc6e6c105ce4acbbee6f15812c6b2cd1cc69ba
--- a/tools/build.ps1
+++ b/tools/build.ps1
@ -95,7 +95,7 @@ $openpype_root = (Get-Item $script_dir).parent.FullName

 Set-Location -Path $openpype_root

-$version_file = Get-Content -Path "$($openpype_root)\pype\version.py"
+$version_file = Get-Content -Path "$($openpype_root)\openpype\version.py"
 $result = [regex]::Matches($version_file, '__version__ = "(?<version>\d+\.\d+.\d+.*)"')
 $openpype_version = $result[0].Groups['version'].Value
 if (-not $openpype_version) {