@vercel/python 2.2.3-canary.4 → 2.2.3-canary.5

package/dist/index.js

@@ -3522,6 +3522,7 @@ Object.defineProperty(exports, "shouldServe", ({ enumerable: true, get: function
 const install_1 = __webpack_require__(95);
 Object.defineProperty(exports, "installRequirement", ({ enumerable: true, get: function () { return install_1.installRequirement; } }));
 Object.defineProperty(exports, "installRequirementsFile", ({ enumerable: true, get: function () { return install_1.installRequirementsFile; } }));
+const version_1 = __webpack_require__(255);
 async function pipenvConvert(cmd, srcDir) {
     build_utils_1.debug('Running pipfile2req...');
     try {
@@ -3553,9 +3554,7 @@ 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';
+    let pythonVersion = version_1.getLatestPythonVersion(meta);
     workPath = await downloadFilesInWorkPath({
         workPath,
         files: originalFiles,
@@ -3582,8 +3581,8 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
     }
     console.log('Installing required dependencies...');
     await install_1.installRequirement({
-        pythonPath,
-        pipPath,
+        pythonPath: pythonVersion.pythonPath,
+        pipPath: pythonVersion.pipPath,
         dependency: 'werkzeug',
         version: '1.0.1',
         workPath,
@@ -3601,23 +3600,10 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
         try {
             const json = await readFile(path_1.join(pipfileLockDir, 'Pipfile.lock'), 'utf8');
             const obj = JSON.parse(json);
-            const version = (_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;
-            if (!meta.isDev) {
-                if (version === '3.6') {
-                    pipPath = 'pip3.6';
-                    pythonPath = 'python3.6';
-                    pythonRuntime = 'python3.6';
-                    console.warn(`Warning: Python version "${version}" detected in Pipfile.lock will reach End-Of-Life December 2021. Please upgrade. http://vercel.link/python-version`);
-                }
-                else if (version === '3.9') {
-                    pipPath = 'pip3.9';
-                    pythonPath = 'python3.9';
-                    pythonRuntime = 'python3.9';
-                }
-                else {
-                    console.warn(`Warning: Invalid Python version "${version}" detected in Pipfile.lock will be ignored. http://vercel.link/python-version`);
-                }
-            }
+            pythonVersion = version_1.getSupportedPythonVersion({
+                isDev: meta.isDev,
+                pipLockPythonVersion: (_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,
+            });
         }
         catch (err) {
             throw new build_utils_1.NowBuildError({
@@ -3631,8 +3617,8 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
         // it into a separate folder.
         const tempDir = await build_utils_1.getWriteableDirectory();
         await install_1.installRequirement({
-            pythonPath,
-            pipPath,
+            pythonPath: pythonVersion.pythonPath,
+            pipPath: pythonVersion.pipPath,
             dependency: 'pipfile-requirements',
             version: '0.3.0',
             workPath: tempDir,
@@ -3651,8 +3637,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,
+            pythonPath: pythonVersion.pythonPath,
+            pipPath: pythonVersion.pipPath,
             filePath: requirementsTxtPath,
             workPath,
             meta,
@@ -3662,8 +3648,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,
+            pythonPath: pythonVersion.pythonPath,
+            pipPath: pythonVersion.pipPath,
             filePath: requirementsTxtPath,
             workPath,
             meta,
@@ -3684,8 +3670,6 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
     // somethig else
     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' : pythonRuntime;
     const globOptions = {
         cwd: workPath,
         ignore: config && typeof config.excludeFiles === 'string'
@@ -3695,7 +3679,7 @@ const build = async ({ workPath, files: originalFiles, entrypoint, meta = {}, co
     const lambda = await build_utils_1.createLambda({
         files: await build_utils_1.glob('**', globOptions),
         handler: `${handlerPyFilename}.vc_handler`,
-        runtime,
+        runtime: pythonVersion.runtime,
         environment: {},
     });
     return { output: lambda };
@@ -3811,6 +3795,83 @@ async function installRequirementsFile({ pythonPath, pipPath, filePath, workPath
 exports.installRequirementsFile = installRequirementsFile;
 
 
+/***/ }),
+
+/***/ 255:
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getSupportedPythonVersion = exports.getLatestPythonVersion = void 0;
+const build_utils_1 = __webpack_require__(445);
+// The order must be most recent first
+const allOptions = [
+    {
+        version: '3.9',
+        pipPath: 'pip3.9',
+        pythonPath: 'python3.9',
+        runtime: 'python3.9',
+    },
+    {
+        version: '3.6',
+        pipPath: 'pip3.6',
+        pythonPath: 'python3.6',
+        runtime: 'python3.6',
+        discontinueDate: new Date('2022-07-18'),
+    },
+];
+const upstreamProvider = 'This change is the result of a decision made by an upstream infrastructure provider (AWS)';
+function getDevPythonVersion() {
+    // Use the system-installed version of `python3` when running `vercel dev`
+    return {
+        version: '3',
+        pipPath: 'pip3',
+        pythonPath: 'python3',
+        runtime: 'python3',
+    };
+}
+function getLatestPythonVersion({ isDev, }) {
+    if (isDev) {
+        return getDevPythonVersion();
+    }
+    return allOptions[0];
+}
+exports.getLatestPythonVersion = getLatestPythonVersion;
+function getSupportedPythonVersion({ isDev, pipLockPythonVersion, }) {
+    if (isDev) {
+        return getDevPythonVersion();
+    }
+    let selection = getLatestPythonVersion({ isDev: false });
+    if (typeof pipLockPythonVersion === 'string') {
+        const found = allOptions.find(o => o.version === pipLockPythonVersion);
+        if (found) {
+            selection = found;
+        }
+        else {
+            console.warn(`Warning: Python version "${pipLockPythonVersion}" detected in Pipfile.lock is invalid and will be ignored. http://vercel.link/python-version`);
+        }
+    }
+    if (isDiscontinued(selection)) {
+        throw new build_utils_1.NowBuildError({
+            code: 'BUILD_UTILS_PYTHON_VERSION_DISCONTINUED',
+            link: 'http://vercel.link/python-version',
+            message: `Python version "${selection.version}" detected in Pipfile.lock is discontinued and must be upgraded. ${upstreamProvider}.`,
+        });
+    }
+    if (selection.discontinueDate) {
+        const d = selection.discontinueDate.toISOString().split('T')[0];
+        console.warn(`Error: Python version "${selection.version}" detected in Pipfile.lock is deprecated. Deployments created on or after ${d} will fail to build. ${upstreamProvider}. http://vercel.link/python-version`);
+    }
+    return selection;
+}
+exports.getSupportedPythonVersion = getSupportedPythonVersion;
+function isDiscontinued({ discontinueDate }) {
+    const today = Date.now();
+    return discontinueDate !== undefined && discontinueDate.getTime() <= today;
+}
+
+
 /***/ }),
 
 /***/ 445:

package/dist/version.d.ts

@@ -0,0 +1,15 @@
+interface PythonVersion {
+    version: string;
+    pipPath: string;
+    pythonPath: string;
+    runtime: string;
+    discontinueDate?: Date;
+}
+export declare function getLatestPythonVersion({ isDev, }: {
+    isDev?: boolean;
+}): PythonVersion;
+export declare function getSupportedPythonVersion({ isDev, pipLockPythonVersion, }: {
+    isDev?: boolean;
+    pipLockPythonVersion: string | undefined;
+}): PythonVersion;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "2.2.3-canary.4",
+  "version": "2.2.3-canary.5",
   "main": "./dist/index.js",
   "license": "MIT",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -15,15 +15,17 @@
   },
   "scripts": {
     "build": "node build",
-    "test-integration-once": "jest --env node --verbose --runInBand --bail",
+    "test-unit": "jest --env node --verbose --runInBand --bail test/unit.test.ts ",
+    "test-integration-once": "jest --env node --verbose --runInBand --bail test/integration.test.ts",
     "prepublishOnly": "node build"
   },
   "devDependencies": {
     "@types/execa": "^0.9.0",
-    "@vercel/build-utils": "2.15.2-canary.4",
+    "@types/jest": "27.4.1",
+    "@vercel/build-utils": "2.15.2-canary.5",
     "@vercel/ncc": "0.24.0",
     "execa": "^1.0.0",
     "typescript": "4.3.4"
   },
-  "gitHead": "466135cf84d0346294645251034ad6aaf89928b8"
+  "gitHead": "438576fc7c392e754d1fc85fc1d9f3122e80d015"
 }