From 80abe4b9aaf74f8cb85c20a4f31502944504d324 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Thu, 25 Mar 2021 11:08:17 +0100
Subject: [PATCH 1/4] added active key t oremaining optional plugins

---
 .../schema_project_deadline.json              | 20 +++++++++++++++++++
 .../schemas/schema_maya_publish.json          |  5 +++++
 2 files changed, 25 insertions(+)

diff --git a/pype/settings/entities/schemas/projects_schema/schema_project_deadline.json b/pype/settings/entities/schemas/projects_schema/schema_project_deadline.json
index 97b2805959..2070e4c8f5 100644
--- a/pype/settings/entities/schemas/projects_schema/schema_project_deadline.json
+++ b/pype/settings/entities/schemas/projects_schema/schema_project_deadline.json
@@ -29,6 +29,11 @@
                             "key": "optional",
                             "label": "Optional"
                         },
+                        {
+                            "type": "boolean",
+                            "key": "active",
+                            "label": "Active"
+                        },
                         {
                             "type": "enum",
                             "key": "tile_assembler_plugin",
@@ -83,6 +88,11 @@
                             "key": "optional",
                             "label": "Optional"
                         },
+                        {
+                            "type": "boolean",
+                            "key": "active",
+                            "label": "Active"
+                        },
                         {
                             "type": "boolean",
                             "key": "use_published",
@@ -137,6 +147,11 @@
                             "key": "optional",
                             "label": "Optional"
                         },
+                        {
+                            "type": "boolean",
+                            "key": "active",
+                            "label": "Active"
+                        },
                         {
                             "type": "boolean",
                             "key": "use_published",
@@ -191,6 +206,11 @@
                             "key": "optional",
                             "label": "Optional"
                         },
+                        {
+                            "type": "boolean",
+                            "key": "active",
+                            "label": "Active"
+                        },
                         {
                             "type": "boolean",
                             "key": "use_published",
diff --git a/pype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json b/pype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
index 623658b7a2..9d2e39edde 100644
--- a/pype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
+++ b/pype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
@@ -271,6 +271,11 @@
                     "key": "optional",
                     "label": "Optional"
                 },
+                {
+                    "type": "boolean",
+                    "key": "active",
+                    "label": "Active"
+                },
                 {
                     "type": "raw-json",
                     "key": "bake_attributes",

From 28f85892f8822f03f7550d02f70872b09cc698cb Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Thu, 25 Mar 2021 11:08:25 +0100
Subject: [PATCH 2/4] saved default values

---
 pype/settings/defaults/project_settings/deadline.json | 4 ++++
 pype/settings/defaults/project_settings/maya.json     | 1 +
 2 files changed, 5 insertions(+)

diff --git a/pype/settings/defaults/project_settings/deadline.json b/pype/settings/defaults/project_settings/deadline.json
index 892fb5d29f..6d36f38423 100644
--- a/pype/settings/defaults/project_settings/deadline.json
+++ b/pype/settings/defaults/project_settings/deadline.json
@@ -3,6 +3,7 @@
         "MayaSubmitDeadline": {
             "enabled": true,
             "optional": false,
+            "active": true,
             "tile_assembler_plugin": "oiio",
             "use_published": true,
             "asset_dependencies": true,
@@ -12,6 +13,7 @@
         "NukeSubmitDeadline": {
             "enabled": true,
             "optional": false,
+            "active": true,
             "use_published": true,
             "priority": 50,
             "chunk_size": 10,
@@ -23,6 +25,7 @@
         "HarmonySubmitDeadline": {
             "enabled": true,
             "optional": false,
+            "active": true,
             "use_published": true,
             "priority": 50,
             "chunk_size": 10000,
@@ -34,6 +37,7 @@
         "AfterEffectsSubmitDeadline": {
             "enabled": true,
             "optional": false,
+            "active": true,
             "use_published": true,
             "priority": 50,
             "chunk_size": 10000,
diff --git a/pype/settings/defaults/project_settings/maya.json b/pype/settings/defaults/project_settings/maya.json
index de8db5aa81..6945bb0581 100644
--- a/pype/settings/defaults/project_settings/maya.json
+++ b/pype/settings/defaults/project_settings/maya.json
@@ -379,6 +379,7 @@
         "ExtractCameraAlembic": {
             "enabled": true,
             "optional": true,
+            "active": true,
             "bake_attributes": []
         },
         "MayaSubmitDeadline": {

From 18a56ccce872c892de811092b03355b3f9808605 Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Thu, 25 Mar 2021 23:11:25 +0100
Subject: [PATCH 3/4] update houdini menu

---
 pype/hosts/houdini/startup/MainMenuCommon.XML |  2 +-
 pype/hosts/houdini/startup/scripts/123.py     |  4 +--
 .../system_settings/applications.json         | 25 ++++++++++++++++++-
 .../host_settings/schema_houdini.json         |  4 +++
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/pype/hosts/houdini/startup/MainMenuCommon.XML b/pype/hosts/houdini/startup/MainMenuCommon.XML
index 16e92be688..bfc7b6c0bc 100644
--- a/pype/hosts/houdini/startup/MainMenuCommon.XML
+++ b/pype/hosts/houdini/startup/MainMenuCommon.XML
@@ -2,7 +2,7 @@
 <mainMenu>
     <menuBar>
         <subMenu id="avalon_menu">
-            <label>Avalon</label>
+            <label>Pype</label>
             <subMenu id="avalon_context">
                 <labelExpression><![CDATA[
 from avalon import api
diff --git a/pype/hosts/houdini/startup/scripts/123.py b/pype/hosts/houdini/startup/scripts/123.py
index 499a0e2931..144b9fdb89 100644
--- a/pype/hosts/houdini/startup/scripts/123.py
+++ b/pype/hosts/houdini/startup/scripts/123.py
@@ -1,10 +1,10 @@
-from avalon import pipeline, houdini
+from avalon import api, houdini
 import hou
 
 
 def main():
     print("Installing Avalon ...")
-    pipeline.install(houdini)
+    api.install(houdini)
 
 
 main()
diff --git a/pype/settings/defaults/system_settings/applications.json b/pype/settings/defaults/system_settings/applications.json
index 4a13cf78f6..7ceef3c129 100644
--- a/pype/settings/defaults/system_settings/applications.json
+++ b/pype/settings/defaults/system_settings/applications.json
@@ -992,6 +992,29 @@
             }
         },
         "variants": {
+            "houdini_18.5": {
+                "enabled": true,
+                "label": "",
+                "variant_label": "18.5",
+                "icon": "",
+                "executables": {
+                    "windows": [
+                        "C:\\Program Files\\Side Effects Software\\Houdini 18.5.499\\bin\\houdini.exe"
+                    ],
+                    "darwin": [],
+                    "linux": []
+                },
+                "arguments": {
+                    "windows": [],
+                    "darwin": [],
+                    "linux": []
+                },
+                "environment": {
+                    "__environment_keys__": {
+                        "houdini_18.5": []
+                    }
+                }
+            },
             "houdini_18": {
                 "enabled": true,
                 "label": "",
@@ -1575,4 +1598,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/pype/settings/entities/schemas/system_schema/host_settings/schema_houdini.json b/pype/settings/entities/schemas/system_schema/host_settings/schema_houdini.json
index cc0cd54cf2..125e6ac180 100644
--- a/pype/settings/entities/schemas/system_schema/host_settings/schema_houdini.json
+++ b/pype/settings/entities/schemas/system_schema/host_settings/schema_houdini.json
@@ -28,6 +28,10 @@
                     "type": "schema_template",
                     "name": "template_host_variant",
                     "template_data": [
+                        {
+                            "host_version": "18.5",
+                            "host_name": "houdini"
+                        },
                         {
                             "host_version": "18",
                             "host_name": "houdini"

From 737e35a5f6937507a2685bf256d5df1736412134 Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Thu, 25 Mar 2021 23:16:34 +0100
Subject: [PATCH 4/4] update workfiles tool in houdini

---
 pype/hosts/houdini/startup/MainMenuCommon.XML | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pype/hosts/houdini/startup/MainMenuCommon.XML b/pype/hosts/houdini/startup/MainMenuCommon.XML
index bfc7b6c0bc..ba639a71a1 100644
--- a/pype/hosts/houdini/startup/MainMenuCommon.XML
+++ b/pype/hosts/houdini/startup/MainMenuCommon.XML
@@ -58,7 +58,7 @@ publish.show(parent)
                 <label>Work Files</label>
                 <scriptCode><![CDATA[
 import hou, os
-from avalon.tools import workfiles
+from pype.tools import workfiles
 workfiles.show(os.environ["AVALON_WORKDIR"])
                 ]]></scriptCode>
             </scriptItem>