dlr-gtlab · rainman110 · Mar 21, 2025 · Mar 20, 2025 · Mar 20, 2025 · Mar 20, 2025
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -103,7 +103,7 @@ testWin_2.0:
 testLinux_2.0:
   stage: test_2.0
   tags: ["linux", "docker"]
-  image: at-twk-hal9000.intra.dlr.de:5000/dlr-at/gtlabdev-2_0-buster
+  image: at-twk-hal9000.intra.dlr.de:5000/dlr-at/gtlabdev-2_0-buster:2.0.14
   needs: ["linuxBuildDebug_2.0"]
   before_script:
     # update to latest dev tools
@@ -123,7 +123,7 @@ testLinux_2.0:
 code-coverage:
   stage: codequality
   tags: ["linux", "docker"]
-  image: at-twk-hal9000.intra.dlr.de:5000/dlr-at/gtlabdev-2_0-buster
+  image: at-twk-hal9000.intra.dlr.de:5000/dlr-at/gtlabdev-2_0-buster:2.0.14
   extends: 
     - .build-linux_20
   script:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Fixed the automated code generation for double and bool properties in the Python Task wizard - #279
 
 ### Added
+ - Support for an embedded python distribution, that comes along with GTlab - #585
  - String input values for Python Tasks and Python Calculators now allow special characters - #269
 
 ## [1.6.1] - 2024-11-08

diff --git a/src/setup_module/gt_python_setup.cpp b/src/setup_module/gt_python_setup.cpp
@@ -24,6 +24,9 @@
 #include <QLibrary>
 #include <QMessageBox>
 #include <QCheckBox>
+#include <QCoreApplication>
+#include <QDir>
+#include <QFile>
 
 namespace {
 
@@ -39,6 +42,41 @@ getSetting(const QString& settingId)
     return gtApp->settings()->getSetting(gtps::settings::path(settingId));
 }
 
+QString pythonExe()
+{
+#ifdef _WINDOWS
+    return "python.exe";
+#else
+    return "python";
+#endif
+}
+
+/**
+ * @brief Sets up an embedded python environment, if no other python env
+ * has been configured (if available)
+ */
+void checkAndSetupEmbeddedPyenv()
+{
+    QString python = getSetting(gtps::constants::PYEXE_S_ID).toString();
+
+
+    // test, if there is an embedded python distribution
+    auto pythonDir = QDir(QCoreApplication::applicationDirPath()
+                          + "/../lib/python");
+
+    QFile embeddedPythonExe(pythonDir.absoluteFilePath(pythonExe()));
+
+
+    if (python.isEmpty() && embeddedPythonExe.exists())
+    {
+        gtInfo() << "Setting up embedded python environment in "
+                 << pythonDir.absolutePath();
+        setSetting(gtps::constants::PYEXE_S_ID,
+                   pythonDir.absoluteFilePath(pythonExe()));
+    }
+
+}
+
 }
 
 GtVersionNumber
@@ -71,6 +109,8 @@ GtPythonSetupModule::onLoad()
         m_errorMsg = msg;
     };
 
+    checkAndSetupEmbeddedPyenv();
+
     auto python = getSetting(gtps::constants::PYEXE_S_ID).toString();
 
     if (python.isEmpty())