python: also add site-packages to PYTHONPATH

NatronGitHub · Nov 1, 2021 · 075ea8e · 075ea8e
1 parent cafda94
commit 075ea8e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/Engine/AppManager.cpp b/Engine/AppManager.cpp
@@ -2995,6 +2995,7 @@ AppManager::initPython()
     QString pyPathZip = QString::fromUtf8( (pythonHome + "/lib/python" NATRON_PY_VERSION_STRING_NO_DOT ".zip").c_str() );
     QString pyPath = QString::fromUtf8( (pythonHome + "/lib/python" NATRON_PY_VERSION_STRING).c_str() );
     QString pyPathDynLoad = pyPath + QString::fromUtf8("/lib-dynload");
+    QString pyPathSitePackages = pyPath + QString::fromUtf8("/site-packages");
     QString pluginPath = binPath + QString::fromUtf8("/../Plugins");
 #endif
     if ( !QFile( QDir::fromNativeSeparators(pyPathZip) ).exists() ) {
@@ -3015,6 +3016,12 @@ AppManager::initPython()
 #     endif
         pyPathDynLoad.clear();
     }
+    if ( !QDir( QDir::fromNativeSeparators(pyPathSitePackages) ).exists() ) {
+#     if defined(NATRON_CONFIG_SNAPSHOT) || defined(DEBUG)
+        printf( "\"%s\" does not exist, not added to PYTHONPATH\n", pyPathSitePackages.toStdString().c_str() );
+#     endif
+        pyPathSitePackages.clear();
+    }
     if ( !QDir( QDir::fromNativeSeparators(pluginPath) ).exists() ) {
 #     if defined(NATRON_CONFIG_SNAPSHOT) || defined(DEBUG)
         printf( "\"%s\" does not exist, not added to PYTHONPATH\n", pluginPath.toStdString().c_str() );
@@ -3075,6 +3082,9 @@ AppManager::initPython()
     if ( !pyPathDynLoad.isEmpty() ) {
         toPrepend.append(pyPathDynLoad);
     }
+    if ( !pyPathSitePackages.isEmpty() ) {
+        toPrepend.append(pyPathSitePackages);
+    }
     if ( !pluginPath.isEmpty() ) {
         toPrepend.append(pluginPath);
     }

diff --git a/Global/PythonUtils.cpp b/Global/PythonUtils.cpp
@@ -102,6 +102,7 @@ void setupPythonEnv(const char* argv0Param)
     std::string pyPathZip = pythonHome + "/lib/python" NATRON_PY_VERSION_STRING_NO_DOT ".zip";
     std::string pyPath = pythonHome + "/lib/python" NATRON_PY_VERSION_STRING;
     std::string pyPathDynLoad = pyPath + "/lib-dynload";
+    std::string pyPathSitePackages = pyPath + "/site-packages";
     std::string pluginPath = binPath + "/../Plugins";
 #endif
     if ( !fileExists( StrUtils::fromNativeSeparators(pyPathZip) ) ) {
@@ -122,6 +123,12 @@ void setupPythonEnv(const char* argv0Param)
 #     endif
         pyPathDynLoad.clear();
     }
+    if ( !dirExists( StrUtils::fromNativeSeparators(pyPathSitePackages) ) ) {
+#     if defined(NATRON_CONFIG_SNAPSHOT) || defined(DEBUG)
+        printf( "\"%s\" does not exist, not added to PYTHONPATH\n", pyPathSitePackages.c_str() );
+#     endif
+        pyPathSitePackages.clear();
+    }
     if ( !dirExists( StrUtils::fromNativeSeparators(pluginPath) ) ) {
 #     if defined(NATRON_CONFIG_SNAPSHOT) || defined(DEBUG)
         printf( "\"%s\" does not exist, not added to PYTHONPATH\n", pluginPath.c_str() );
@@ -184,6 +191,9 @@ void setupPythonEnv(const char* argv0Param)
     if ( !pyPathDynLoad.empty() ) {
         toPrepend.push_back(pyPathDynLoad);
     }
+    if ( !pyPathSitePackages.empty() ) {
+        toPrepend.push_back(pyPathSitePackages);
+    }
     if ( !pluginPath.empty() ) {
         toPrepend.push_back(pluginPath);
     }