Control the python versions fetched more carefully.

Check that the mapping isn't empty and the python command didn't return null stdout.

Author: bsamuel-ui

.github/workflows/test.yml

@@ -28,12 +28,8 @@ jobs:
         uses: actions/setup-node@v1
         with:
           version: ${{ matrix.node-version }}
-      - name: Install pipenv
-        uses: dschep/install-pipenv-action@v1
-      - name: Install poetry
-        uses: dschep/install-poetry-action@v1.1
-        with:
-          preview: false
+      - name: Install pipenv, poetry
+        run: python${{ matrix.python-version}} -m pip install pipenv poetry setuptools
 
       - name: Install serverless
         run: npm install -g serverless
@@ -47,10 +43,8 @@ jobs:
         if: matrix.python-version == 3.7 && matrix.node-version == 12 && matrix.os == 'ubuntu-latest'
 
       - name: Test
-        run: |
-          PATH=$HOME/.poetry/bin:$PATH \
-          LC_ALL=C.UTF-8 \
-          LANG=C.UTF-8 \
-          npm run test
+        run: npm run test
         env:
-          RUNTIME: python${{ matrix.python-version }}
+          USE_PYTHON: ${{ matrix.python-version }}
+          LC_ALL: C.UTF-8
+          LANG: C.UTF-8

package.json

@@ -48,7 +48,8 @@
     "prettier": "*",
     "cross-spawn": "*",
     "deasync-promise": "*",
-    "tape": "*"
+    "tape": "*",
+    "lodash": "^4.16.15"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.3",

test.js

@@ -15,6 +15,7 @@ const {
 } = require('fs-extra');
 const { quote } = require('shell-quote');
 const { sep, delimiter } = require('path');
+const { _ } = require('lodash');
 
 const { getUserCachePath, sha256Path } = require('./lib/shared');
 
@@ -94,39 +95,55 @@ const test = (desc, func, opts = {}) =>
     }
   });
 
-const executableExtension = process.platform === 'win32' ? '.exe' : '';
-const executableSearch = process.env.PATH.split(delimiter);
-const whichCache = {};
-
-const which = (name, extra) => {
-  const found = whichCache[name];
-  if (found !== undefined) {
-    return found;
+const availablePythons = (() => {
+  const versions = [];
+  const mapping = {};
+  if (process.env.USE_PYTHON) {
+    versions.push(
+      ...process.env.USE_PYTHON.split(',').map(v => v.toString().trim())
+    );
+  } else {
+    versions.push('3.8', '3.7', '3.6', '2.7');
   }
-  const fullName = `${name}${executableExtension}`;
-  for (const path of (extra || []).concat(executableSearch)) {
-    const fullPath = `${path}${sep}${fullName}`;
-    if (pathExistsSync(fullPath)) {
-      whichCache[name] = fullPath;
-      return fullPath;
+  const exe = process.platform === 'win32' ? '.exe' : '';
+  for (const ver of _.uniq(
+    _.concat(
+      versions,
+      versions.map(v => v[0]),
+      ['']
+    )
+  )) {
+    const python = `python${ver}${exe}`;
+    const { stdout, stderr, status } = crossSpawn.sync(python, [
+      '-c',
+      'import sys; sys.stdout.write(".".join(map(str, sys.version_info[:2])))'
+    ]);
+    const realVer = stdout && stdout.toString().trim();
+    if (!status && realVer && _.includes(versions, realVer)) {
+      for (const recommend of [realVer, realVer[0]]) {
+        if (!mapping[recommend]) {
+          mapping[recommend] = python;
+        }
+      }
     }
   }
-  whichCache[name] = null;
-  return null;
-};
+  if (_.isEmpty(mapping)) {
+    throw new Error(`No pythons available meeting ${versions}`);
+  }
+  return mapping;
+})();
 
 const getPythonBin = (version = 3) => {
-  if (![2, 3].includes(version)) throw new Error('version must be 2 or 3');
-  const extra = [];
-  /* if (process.platform === 'win32')
-   *   extra.push(...glob.sync(`c:/python${version}*`)); */
-  const bin = which(`python${version}`, extra);
-  if (bin === null) throw new Error(`Can't find python${version} on PATH`);
+  const bin = availablePythons[String(version)];
+  if (!bin)
+    throw new Error(
+      `No python version ${version} available, only ${availablePythons}`
+    );
   return bin;
 };
 
 const hasPython = version => {
-  return getPythonBin(version) !== null;
+  return Boolean(availablePythons[String(version)]);
 };
 
 const listZipFiles = filename =>

tests/individually/package.json

@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "serverless-python-requirements": "file:serverless-python-requirements-5.0.0.tgz"
+    "serverless-python-requirements": "file:serverless-python-requirements-5.1.0.tgz"
   }
 }

tests/non_build_pyproject/package.json

@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "serverless-python-requirements": "file:serverless-python-requirements-5.0.0.tgz"
+    "serverless-python-requirements": "file:serverless-python-requirements-5.1.0.tgz"
   }
 }

tests/pipenv/package.json

@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "serverless-python-requirements": "file:serverless-python-requirements-5.0.0.tgz"
+    "serverless-python-requirements": "file:serverless-python-requirements-5.1.0.tgz"
   }
 }

tests/poetry/package.json

@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "serverless-python-requirements": "file:serverless-python-requirements-5.0.0.tgz"
+    "serverless-python-requirements": "file:serverless-python-requirements-5.1.0.tgz"
   }
 }