Fixing Python compilation to achieve having multiple versions at the hosts.

Author: Martin Krulis

app/helpers/ExerciseConfig/Pipeline/Box/BoxService.php

@@ -43,8 +43,8 @@ public function __construct() {
       FetchFileBox::$FETCH_TYPE => FetchFileBox::class,
       JavaRunBox::$JAVA_RUNNER_TYPE => JavaRunBox::class,
       JavacCompilationBox::$JAVAC_TYPE => JavacCompilationBox::class,
-      Python3RunBox::$PYTHON3_TYPE => Python3RunBox::class,
-      Python3CompilationBox::$PYTHON3_COMPILATION_TYPE => Python3CompilationBox::class,
+      Python3RunBox::$BOX_TYPE => Python3RunBox::class,
+      Python3CompilationBox::$BOX_TYPE => Python3CompilationBox::class,
       PhpRunBox::$PHP_RUN_TYPE => PhpRunBox::class,
       NodeRunBox::$NODE_RUN_TYPE => NodeRunBox::class,
       MergeFilesBox::$BOX_TYPE => MergeFilesBox::class,

app/helpers/ExerciseConfig/Pipeline/Box/Boxes/Python3CompilationBox.php

@@ -16,8 +16,9 @@
 class Python3CompilationBox extends CompilationBox
 {
   /** Type key */
-  public static $PYTHON3_COMPILATION_TYPE = "python3c";
-  public static $PYTHON3_BINARY = "/usr/bin/python3";
+  public static $BOX_TYPE = "python3c";
+  public static $PYTHON3_BINARY = "/usr/bin/env";
+  public static $PYTHON3_VERSION = "python3";
   public static $PYC_FILES_PORT_KEY = "pyc-files";
   public static $PYC_EXT = ".pyc";
   public static $DEFAULT_NAME = "Python3 Compilation";
@@ -57,7 +58,7 @@ public function __construct(BoxMeta $meta) {
    * @return string
    */
   public function getType(): string {
-    return self::$PYTHON3_COMPILATION_TYPE;
+    return self::$BOX_TYPE;
   }
 
   /**
@@ -97,7 +98,7 @@ public function getDefaultName(): string {
   public function compile(CompilationParams $params): array {
     $task = $this->compileBaseTask($params);
     $task->setCommandBinary(self::$PYTHON3_BINARY);
-    $task->setCommandArguments(["-m", "compileall", "-b", "."]);
+    $task->setCommandArguments([self::$PYTHON3_VERSION, "-m", "compileall", "-b", "."]);
 
     // determine name of pyc file and set it to variable
     $pycFilenames = [];

app/helpers/ExerciseConfig/Pipeline/Box/Boxes/Python3RunBox.php

@@ -16,8 +16,9 @@
 class Python3RunBox extends ExecutionBox
 {
   /** Type key */
-  public static $PYTHON3_TYPE = "python3";
-  public static $PYTHON3_BINARY = "/usr/bin/python3";
+  public static $BOX_TYPE = "python3";
+  public static $PYTHON3_BINARY = "/usr/bin/env";
+  public static $PYTHON3_VERSION = "python3";
   public static $PYC_FILES_PORT_KEY = "pyc-files";
   public static $DEFAULT_NAME = "Python3 Execution";
 
@@ -61,7 +62,7 @@ public function __construct(BoxMeta $meta) {
    * @return string
    */
   public function getType(): string {
-    return self::$PYTHON3_TYPE;
+    return self::$BOX_TYPE;
   }
 
   /**
@@ -104,7 +105,7 @@ public function compile(CompilationParams $params): array {
 
     $runner = $this->getInputPortValue(self::$RUNNER_FILE_PORT_KEY)->getValue();
     $entry = $this->getInputPortValue(self::$ENTRY_POINT_KEY)->getValue();
-    $args = [$runner, $entry];
+    $args = [self::$PYTHON3_VERSION, $runner, $entry];
     if ($this->hasInputPortValue(self::$EXECUTION_ARGS_PORT_KEY)) {
       $args = array_merge($args, $this->getInputPortValue(self::$EXECUTION_ARGS_PORT_KEY)->getValue());
     }