Check compatible Python using installer script

Author: ivankravets

src/core.js

@@ -8,6 +8,7 @@
 
 import * as proc from './proc';
 
+import { findPythonExecutable } from './installer/get-python';
 import fs from 'fs';
 import path from 'path';
 
@@ -107,9 +108,7 @@ export function getEnvBinDir() {
 }
 
 export async function getCorePythonExe() {
-  const result =
-    getCoreState().python_exe ||
-    (await proc.findPythonExecutable({ pioCoreSpec: '>=5' }));
+  const result = getCoreState().python_exe || (await findPythonExecutable());
   if (!result) {
     throw new Error('PlatformIO Core is not installed');
   }

src/installer/get-python.js

@@ -9,6 +9,7 @@
 import * as core from '../core';
 import * as proc from '../proc';
 
+import { callInstallerScript } from './get-platformio';
 import crypto from 'crypto';
 import fs from 'fs';
 import got from 'got';
@@ -19,6 +20,38 @@ import stream from 'stream';
 import tar from 'tar';
 import zlib from 'zlib';
 
+export async function findPythonExecutable() {
+  const exenames = proc.IS_WINDOWS ? ['python.exe'] : ['python3', 'python'];
+  const envPath = process.env.PLATFORMIO_PATH || process.env.PATH;
+  for (const location of envPath.split(path.delimiter)) {
+    for (const exename of exenames) {
+      const executable = path.normalize(path.join(location, exename)).replace(/"/g, '');
+      try {
+        if (
+          fs.existsSync(executable) &&
+          (await callInstallerScript(executable, ['check', 'python']))
+        ) {
+          return executable;
+        }
+      } catch (err) {
+        console.warn(executable, err);
+      }
+    }
+  }
+  return null;
+}
+
+async function ensurePythonExeExists(pythonDir) {
+  const binDir = proc.IS_WINDOWS ? pythonDir : path.join(pythonDir, 'bin');
+  for (const name of ['python.exe', 'python3', 'python']) {
+    try {
+      await fs.promises.access(path.join(binDir, name));
+      return true;
+    } catch (err) {}
+  }
+  throw new Error('Python executable does not exist!');
+}
+
 export async function installPortablePython(destinationDir) {
   const registryFile = await getRegistryFile();
   if (!registryFile) {
@@ -149,14 +182,3 @@ async function extractTarGz(source, destination) {
       .on('close', () => resolve(destination));
   });
 }
-
-async function ensurePythonExeExists(pythonDir) {
-  const binDir = proc.IS_WINDOWS ? pythonDir : path.join(pythonDir, 'bin');
-  for (const name of ['python.exe', 'python3', 'python']) {
-    try {
-      await fs.promises.access(path.join(binDir, name));
-      return true;
-    } catch (err) {}
-  }
-  throw new Error('Python executable does not exist!');
-}

src/installer/stages/platformio-core.js

@@ -10,11 +10,11 @@ import * as core from '../../core';
 import * as home from '../../home';
 import * as misc from '../../misc';
 import * as proc from '../../proc';
+import { findPythonExecutable, installPortablePython } from '../get-python';
 
 import BaseStage from './base';
 import { callInstallerScript } from '../get-platformio';
 import { promises as fs } from 'fs';
-import { installPortablePython } from '../get-python';
 import path from 'path';
 import tmp from 'tmp';
 
@@ -170,11 +170,11 @@ export default class PlatformIOCoreStage extends BaseStage {
     this.configureBuiltInPython();
 
     if (!prompt) {
-      return await proc.findPythonExecutable();
+      return await findPythonExecutable();
     }
 
     do {
-      const pythonExecutable = await proc.findPythonExecutable();
+      const pythonExecutable = await findPythonExecutable();
       if (pythonExecutable) {
         return pythonExecutable;
       }

src/proc.js

@@ -192,40 +192,6 @@ export function getCommandOutput(cmd, args, options = {}) {
   });
 }
 
-export async function findPythonExecutable(options = {}) {
-  const exenames = IS_WINDOWS ? ['python.exe'] : ['python3', 'python'];
-  const pythonAssertCode = [
-    'import sys',
-    'assert sys.version_info >= (3, 6)',
-    'print(sys.executable)',
-  ];
-  if (options.pioCoreSpec) {
-    pythonAssertCode.push('import semantic_version');
-    pythonAssertCode.push('from platformio import __version__');
-    pythonAssertCode.push('from platformio.package.version import pepver_to_semver');
-    pythonAssertCode.push(
-      `assert pepver_to_semver(__version__) in semantic_version.Spec("${options.pioCoreSpec}")`
-    );
-  }
-  const envPath = process.env.PLATFORMIO_PATH || process.env.PATH;
-  for (const location of envPath.split(path.delimiter)) {
-    for (const exename of exenames) {
-      const executable = path.normalize(path.join(location, exename)).replace(/"/g, '');
-      try {
-        if (
-          fs.existsSync(executable) &&
-          (await getCommandOutput(executable, ['-c', pythonAssertCode.join(';')]))
-        ) {
-          return executable;
-        }
-      } catch (err) {
-        console.warn(executable, err);
-      }
-    }
-  }
-  return null;
-}
-
 export function whereIsProgram(program) {
   const envPath = process.env.PLATFORMIO_PATH || process.env.PATH;
   for (const location of envPath.split(path.delimiter)) {