@vercel/python 2.0.6-canary.6 → 2.1.2-canary.1

package/dist/index.js

@@ -3601,10 +3601,22 @@ 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);
-            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';
+            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`);
+                }
             }
         }
         catch (err) {
@@ -3703,6 +3715,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.installRequirementsFile = exports.installRequirement = void 0;
+const path_1 = __webpack_require__(622);
 const execa_1 = __importDefault(__webpack_require__(580));
 const build_utils_1 = __webpack_require__(445);
 const makeDependencyCheckCode = (dependency) => `
@@ -3785,6 +3798,14 @@ async function installRequirement({ pythonPath, pipPath, dependency, version, wo
 }
 exports.installRequirement = installRequirement;
 async function installRequirementsFile({ pythonPath, pipPath, filePath, workPath, meta, args = [], }) {
+    const fileAtRoot = path_1.relative(workPath, filePath) === path_1.basename(filePath);
+    // If the `requirements.txt` file is located in the Root Directory of the project and
+    // the new File System API is used (`avoidTopLevelInstall`), the Install Command
+    // will have already installed its dependencies, so we don't need to do it again.
+    if (meta.avoidTopLevelInstall && fileAtRoot) {
+        build_utils_1.debug(`Skipping requirements file installation, already installed by Install Command`);
+        return;
+    }
     if (meta.isDev &&
         (await areRequirementsInstalled(pythonPath, filePath, workPath))) {
         build_utils_1.debug(`Skipping requirements file installation, already installed`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "2.0.6-canary.6",
+  "version": "2.1.2-canary.1",
   "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": "4aa6a139127e4e57469d4b6785546ccb49ca188b"
+  "gitHead": "1202ff7b2b8a821c6404a86baa12996f3078ed36"
 }