@vercel/python 2.0.6-canary.5 → 2.0.6-canary.6

package/dist/index.js

@@ -3528,6 +3528,7 @@ async function pipenvConvert(cmd, srcDir) {
         const out = await execa_1.default.stdout(cmd, [], {
             cwd: srcDir,
         });
+        build_utils_1.debug('Contents of requirements.txt is: ' + out);
         fs_1.default.writeFileSync(path_1.join(srcDir, 'requirements.txt'), out);
     }
     catch (err) {
@@ -3551,6 +3552,10 @@ async function downloadFilesInWorkPath({ entrypoint, workPath, files, meta = {},
 }
 exports.downloadFilesInWorkPath = downloadFilesInWorkPath;
 const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, config, }) => {
+    var _a, _b;
+    let pipPath = meta.isDev ? 'pip3' : 'pip3.9';
+    let pythonPath = meta.isDev ? 'python3' : 'python3.9';
+    let pythonRuntime = meta.isDev ? 'python3' : 'python3.9';
     workPath = await downloadFilesInWorkPath({
         workPath,
         files: originalFiles,
@@ -3577,6 +3582,8 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
     }
     console.log('Installing required dependencies...');
     await install_1.installRequirement({
+        pythonPath,
+        pipPath,
         dependency: 'werkzeug',
         version: '1.0.1',
         workPath,
@@ -3591,12 +3598,29 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
             : null;
     if (pipfileLockDir) {
         build_utils_1.debug('Found "Pipfile.lock"');
+        try {
+            const json = await readFile(path_1.join(pipfileLockDir, 'Pipfile.lock'), 'utf8');
+            const obj = JSON.parse(json);
+            if (!meta.isDev && ((_b = (_a = obj === null || obj === void 0 ? void 0 : obj._meta) === null || _a === void 0 ? void 0 : _a.requires) === null || _b === void 0 ? void 0 : _b.python_version) === '3.6') {
+                pipPath = 'pip3.6';
+                pythonPath = 'python3.6';
+                pythonRuntime = 'python3.6';
+            }
+        }
+        catch (err) {
+            throw new build_utils_1.NowBuildError({
+                code: 'INVALID_PIPFILE_LOCK',
+                message: 'Unable to parse Pipfile.lock',
+            });
+        }
         // Convert Pipenv.Lock to requirements.txt.
         // We use a different`workPath` here because we want `pipfile-requirements` and it's dependencies
         // to not be part of the lambda environment. By using pip's `--target` directive we can isolate
         // it into a separate folder.
         const tempDir = await build_utils_1.getWriteableDirectory();
         await install_1.installRequirement({
+            pythonPath,
+            pipPath,
             dependency: 'pipfile-requirements',
             version: '0.3.0',
             workPath: tempDir,
@@ -3615,6 +3639,8 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
         build_utils_1.debug('Found local "requirements.txt"');
         const requirementsTxtPath = fsFiles[requirementsTxt].fsPath;
         await install_1.installRequirementsFile({
+            pythonPath,
+            pipPath,
             filePath: requirementsTxtPath,
             workPath,
             meta,
@@ -3624,6 +3650,8 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
         build_utils_1.debug('Found global "requirements.txt"');
         const requirementsTxtPath = fsFiles['requirements.txt'].fsPath;
         await install_1.installRequirementsFile({
+            pythonPath,
+            pipPath,
             filePath: requirementsTxtPath,
             workPath,
             meta,
@@ -3645,7 +3673,7 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
     const handlerPyFilename = 'vc__handler__python';
     await writeFile(path_1.join(workPath, `${handlerPyFilename}.py`), handlerPyContents);
     // Use the system-installed version of `python3` when running via `vercel dev`
-    const runtime = meta.isDev ? 'python3' : 'python3.6';
+    const runtime = meta.isDev ? 'python3' : pythonRuntime;
     const globOptions = {
         cwd: workPath,
         ignore: config && typeof config.excludeFiles === 'string'
@@ -3677,16 +3705,15 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.installRequirementsFile = exports.installRequirement = void 0;
 const execa_1 = __importDefault(__webpack_require__(580));
 const build_utils_1 = __webpack_require__(445);
-const pipPath = 'pip3';
 const makeDependencyCheckCode = (dependency) => `
 from importlib import util
 dep = '${dependency}'.replace('-', '_')
 spec = util.find_spec(dep)
 print(spec.origin)
 `;
-async function isInstalled(dependency, cwd) {
+async function isInstalled(pythonPath, dependency, cwd) {
     try {
-        const { stdout } = await execa_1.default('python3', ['-c', makeDependencyCheckCode(dependency)], {
+        const { stdout } = await execa_1.default(pythonPath, ['-c', makeDependencyCheckCode(dependency)], {
             stdio: 'pipe',
             cwd,
         });
@@ -3703,9 +3730,9 @@ from pkg_resources import DistributionNotFound, VersionConflict
 dependencies = distutils.text_file.TextFile(filename='${requirementsPath}').readlines()
 pkg_resources.require(dependencies)
 `;
-async function areRequirementsInstalled(requirementsPath, cwd) {
+async function areRequirementsInstalled(pythonPath, requirementsPath, cwd) {
     try {
-        await execa_1.default('python3', ['-c', makeRequirementsCheckCode(requirementsPath)], {
+        await execa_1.default(pythonPath, ['-c', makeRequirementsCheckCode(requirementsPath)], {
             stdio: 'pipe',
             cwd,
         });
@@ -3715,7 +3742,7 @@ async function areRequirementsInstalled(requirementsPath, cwd) {
         return false;
     }
 }
-async function pipInstall(workPath, args) {
+async function pipInstall(pipPath, workPath, args) {
     const target = '.';
     // See: https://github.com/pypa/pip/issues/4222#issuecomment-417646535
     //
@@ -3732,15 +3759,15 @@ async function pipInstall(workPath, args) {
         target,
         ...args,
     ];
-    build_utils_1.debug(`Running "pip3 ${cmdArgs.join(' ')}"...`);
+    const pretty = `${pipPath} ${cmdArgs.join(' ')}`;
+    build_utils_1.debug(`Running "${pretty}"...`);
     try {
         await execa_1.default(pipPath, cmdArgs, {
             cwd: workPath,
-            stdio: 'pipe',
         });
     }
     catch (err) {
-        console.log(`Failed to run "pip3 ${cmdArgs.join(' ')}"`);
+        console.log(`Failed to run "${pretty}"`);
         throw err;
     }
 }
@@ -3748,21 +3775,22 @@ async function pipInstall(workPath, args) {
 // with this function can get overriden by a newer version from requirements.txt,
 // so vc_init should do runtime version checks to be compatible with any recent
 // version of its dependencies
-async function installRequirement({ dependency, version, workPath, meta, args = [], }) {
-    if (meta.isDev && (await isInstalled(dependency, workPath))) {
+async function installRequirement({ pythonPath, pipPath, dependency, version, workPath, meta, args = [], }) {
+    if (meta.isDev && (await isInstalled(pythonPath, dependency, workPath))) {
         build_utils_1.debug(`Skipping ${dependency} dependency installation, already installed in ${workPath}`);
         return;
     }
     const exact = `${dependency}==${version}`;
-    await pipInstall(workPath, [exact, ...args]);
+    await pipInstall(pipPath, workPath, [exact, ...args]);
 }
 exports.installRequirement = installRequirement;
-async function installRequirementsFile({ filePath, workPath, meta, args = [], }) {
-    if (meta.isDev && (await areRequirementsInstalled(filePath, workPath))) {
+async function installRequirementsFile({ pythonPath, pipPath, filePath, workPath, meta, args = [], }) {
+    if (meta.isDev &&
+        (await areRequirementsInstalled(pythonPath, filePath, workPath))) {
         build_utils_1.debug(`Skipping requirements file installation, already installed`);
         return;
     }
-    await pipInstall(workPath, ['--upgrade', '-r', filePath, ...args]);
+    await pipInstall(pipPath, workPath, ['--upgrade', '-r', filePath, ...args]);
 }
 exports.installRequirementsFile = installRequirementsFile;
 

package/dist/install.d.ts

@@ -1,17 +1,21 @@
 import { Meta } from '@vercel/build-utils';
 interface InstallRequirementArg {
+    pythonPath: string;
+    pipPath: string;
     dependency: string;
     version: string;
     workPath: string;
     meta: Meta;
     args?: string[];
 }
-export declare function installRequirement({ dependency, version, workPath, meta, args, }: InstallRequirementArg): Promise<void>;
+export declare function installRequirement({ pythonPath, pipPath, dependency, version, workPath, meta, args, }: InstallRequirementArg): Promise<void>;
 interface InstallRequirementsFileArg {
+    pythonPath: string;
+    pipPath: string;
     filePath: string;
     workPath: string;
     meta: Meta;
     args?: string[];
 }
-export declare function installRequirementsFile({ filePath, workPath, meta, args, }: InstallRequirementsFileArg): Promise<void>;
+export declare function installRequirementsFile({ pythonPath, pipPath, filePath, workPath, meta, args, }: InstallRequirementsFileArg): Promise<void>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "2.0.6-canary.5",
+  "version": "2.0.6-canary.6",
   "main": "./dist/index.js",
   "license": "MIT",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -24,5 +24,5 @@
     "execa": "^1.0.0",
     "typescript": "4.3.4"
   },
-  "gitHead": "ed1dacd27698f3bb181f32b516af6953655b37e9"
+  "gitHead": "4aa6a139127e4e57469d4b6785546ccb49ca188b"
 }