From ec85b9dbe4976175478db29f18a109a5025b2de6 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Thu, 15 Apr 2021 15:21:31 +0200
Subject: [PATCH 1/2] removed python 2 vendor prelaunch hook

---
 openpype/hooks/pre_python2_vendor.py | 34 ----------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 openpype/hooks/pre_python2_vendor.py

diff --git a/openpype/hooks/pre_python2_vendor.py b/openpype/hooks/pre_python2_vendor.py
deleted file mode 100644
index efa1849052..0000000000
--- a/openpype/hooks/pre_python2_vendor.py
+++ /dev/null
@@ -1,34 +0,0 @@
-import os
-from openpype.lib import PreLaunchHook
-
-
-class PrePython2Vendor(PreLaunchHook):
-    """Prepend python 2 dependencies for py2 hosts."""
-    # WARNING This hook will probably be deprecated in OpenPype 3 - kept for test
-    order = 10
-    app_groups = ["hiero", "nuke", "nukex", "unreal", "maya", "houdini"]
-
-    def execute(self):
-        # Prepare vendor dir path
-        self.log.info("adding global python 2 vendor")
-        pype_root = os.getenv("OPENPYPE_REPOS_ROOT")
-        python_2_vendor = os.path.join(
-            pype_root,
-            "openpype",
-            "vendor",
-            "python",
-            "python_2"
-        )
-
-        # Add Python 2 modules
-        python_paths = [
-            python_2_vendor
-        ]
-
-        # Load PYTHONPATH from current launch context
-        python_path = self.launch_context.env.get("PYTHONPATH")
-        if python_path:
-            python_paths.append(python_path)
-
-        # Set new PYTHONPATH to launch context environments
-        self.launch_context.env["PYTHONPATH"] = os.pathsep.join(python_paths)

From 04d1dcd4cbdff5e59be1881b88c49de2d76eb7e5 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Thu, 15 Apr 2021 15:22:48 +0200
Subject: [PATCH 2/2] solve python 2 vendors in pype.lib

---
 openpype/lib/__init__.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/openpype/lib/__init__.py b/openpype/lib/__init__.py
index 7fdba7d09c..146c0d39d7 100644
--- a/openpype/lib/__init__.py
+++ b/openpype/lib/__init__.py
@@ -6,11 +6,15 @@ import sys
 import os
 import site
 
-# add Python version specific vendor folder
-site.addsitedir(
-    os.path.join(
-        os.getenv("OPENPYPE_REPOS_ROOT", ""),
-        "vendor", "python", "python_{}".format(sys.version[0])))
+# Add Python version specific vendor folder
+python_version_dir = os.path.join(
+    os.getenv("OPENPYPE_REPOS_ROOT", ""),
+    "openpype", "vendor", "python", "python_{}".format(sys.version[0])
+)
+# Prepend path in sys paths
+sys.path.insert(0, python_version_dir)
+site.addsitedir(python_version_dir)
+
 
 from .env_tools import (
     env_value_to_bool,