@vercel/python 6.0.4 → 6.0.6

package/dist/index.js

@@ -989,10 +989,10 @@ var require_semver = __commonJS({
       var rangeTmp;
       if (this.operator === "") {
         rangeTmp = new Range(comp.value, options);
-        return satisfies(this.value, rangeTmp, options);
+        return satisfies2(this.value, rangeTmp, options);
       } else if (comp.operator === "") {
         rangeTmp = new Range(this.value, options);
-        return satisfies(comp.semver, rangeTmp, options);
+        return satisfies2(comp.semver, rangeTmp, options);
       }
       var sameDirectionIncreasing = (this.operator === ">=" || this.operator === ">") && (comp.operator === ">=" || comp.operator === ">");
       var sameDirectionDecreasing = (this.operator === "<=" || this.operator === "<") && (comp.operator === "<=" || comp.operator === "<");
@@ -1301,8 +1301,8 @@ var require_semver = __commonJS({
       }
       return true;
     }
-    exports.satisfies = satisfies;
-    function satisfies(version2, range, options) {
+    exports.satisfies = satisfies2;
+    function satisfies2(version2, range, options) {
       try {
         range = new Range(range, options);
       } catch (er) {
@@ -1430,7 +1430,7 @@ var require_semver = __commonJS({
         default:
           throw new TypeError('Must provide a hilo val of "<" or ">"');
       }
-      if (satisfies(version2, range, options)) {
+      if (satisfies2(version2, range, options)) {
         return false;
       }
       for (var i2 = 0; i2 < range.set.length; ++i2) {
@@ -3133,6 +3133,81 @@ function getLatestPythonVersion({
   }
   return selection;
 }
+function parseVersionTuple(input) {
+  const cleaned = input.trim().replace(/\s+/g, "");
+  const m = cleaned.match(/^(\d+)(?:\.(\d+))?/);
+  if (!m)
+    return null;
+  const major = Number(m[1]);
+  const minor = m[2] !== void 0 ? Number(m[2]) : 0;
+  if (Number.isNaN(major) || Number.isNaN(minor))
+    return null;
+  return [major, minor];
+}
+function compareTuples(a, b) {
+  if (a[0] !== b[0])
+    return a[0] - b[0];
+  return a[1] - b[1];
+}
+function parseSpecifier(spec) {
+  const s = spec.trim();
+  const m = s.match(/^(<=|>=|==|!=|~=|<|>)\s*([0-9]+(?:\.[0-9]+)?)(?:\.\*)?$/) || // Bare version like "3.11" -> implied ==
+  s.match(/^()([0-9]+(?:\.[0-9]+)?)(?:\.\*)?$/);
+  if (!m)
+    return null;
+  const op = m[1] || "==";
+  const vt = parseVersionTuple(m[2]);
+  if (!vt)
+    return null;
+  return { op, ver: vt };
+}
+function satisfies(candidate, spec) {
+  const cmp = compareTuples(candidate, spec.ver);
+  switch (spec.op) {
+    case "==":
+      return cmp === 0;
+    case "!=":
+      return cmp !== 0;
+    case "<":
+      return cmp < 0;
+    case "<=":
+      return cmp <= 0;
+    case ">":
+      return cmp > 0;
+    case ">=":
+      return cmp >= 0;
+    case "~=": {
+      const lowerOk = cmp >= 0;
+      const upper = [spec.ver[0], spec.ver[1] + 1];
+      return lowerOk && compareTuples(candidate, upper) < 0;
+    }
+    default:
+      return false;
+  }
+}
+function selectFromRequiresPython(expr) {
+  const raw = expr.trim();
+  if (!raw)
+    return void 0;
+  const parts = raw.split(",").map((p) => p.trim()).filter(Boolean);
+  const specifiers = [];
+  for (const p of parts) {
+    const sp = parseSpecifier(p);
+    if (sp)
+      specifiers.push(sp);
+  }
+  if (specifiers.length === 0) {
+    return allOptions.find((o) => o.version === raw);
+  }
+  const matches = allOptions.filter((opt) => {
+    const vt = parseVersionTuple(opt.version);
+    return specifiers.every((sp) => satisfies(vt, sp));
+  });
+  if (matches.length === 0)
+    return void 0;
+  const installedMatch = matches.find(isInstalled2);
+  return installedMatch ?? matches[0];
+}
 function getSupportedPythonVersion({
   isDev,
   declaredPythonVersion
@@ -3143,7 +3218,12 @@ function getSupportedPythonVersion({
   let selection = getLatestPythonVersion({ isDev: false });
   if (declaredPythonVersion) {
     const { version: version2, source } = declaredPythonVersion;
-    const requested = allOptions.find((o) => o.version === version2);
+    let requested;
+    if (source === "pyproject.toml") {
+      requested = selectFromRequiresPython(version2);
+    } else {
+      requested = allOptions.find((o) => o.version === version2);
+    }
     if (requested) {
       if (isDiscontinued(requested)) {
         throw new import_build_utils2.NowBuildError({
@@ -3334,7 +3414,6 @@ async function detectPythonEntrypoint(framework, workPath, configuredEntrypoint)
 // src/utils.ts
 var import_fs3 = __toESM(require("fs"));
 var import_path3 = require("path");
-var import_execa2 = __toESM(require_execa());
 var import_build_utils5 = require("@vercel/build-utils");
 var isInVirtualEnv = () => {
   return process.env.VIRTUAL_ENV;
@@ -3374,27 +3453,12 @@ async function runPyprojectScript(workPath, scriptNames, env) {
     return false;
   const systemPython = process.platform === "win32" ? "python" : "python3";
   const finalEnv = { ...process.env, ...env };
-  const { pythonCmd } = useVirtualEnv(workPath, finalEnv, systemPython);
-  const uvPath = await getUvBinaryOrInstall(pythonCmd);
+  useVirtualEnv(workPath, finalEnv, systemPython);
   const scriptCommand = scripts[scriptToRun];
   if (typeof scriptCommand === "string" && scriptCommand.trim()) {
-    const uvDir = (0, import_path3.dirname)(uvPath);
-    finalEnv.PATH = `${uvDir}${import_path3.delimiter}${finalEnv.PATH || ""}`;
-    if (/^\s*uv(\s|$)/i.test(scriptCommand)) {
-      console.log(`Executing: ${scriptCommand}`);
-      await (0, import_build_utils5.execCommand)(scriptCommand, {
-        cwd: workPath,
-        env: finalEnv
-      });
-      return true;
-    }
-    const args = process.platform === "win32" ? ["run", "cmd", "/d", "/s", "/c", scriptCommand] : ["run", "sh", "-lc", scriptCommand];
-    console.log(
-      `Executing: ${uvPath} ${args.map((a) => /\s/.test(a) ? `"${a.replace(/"/g, '\\"')}"` : a).join(" ")}`
-    );
-    await (0, import_execa2.default)(uvPath, args, {
+    console.log(`Executing: ${scriptCommand}`);
+    await (0, import_build_utils5.execCommand)(scriptCommand, {
       cwd: workPath,
-      stdio: "inherit",
       env: finalEnv
     });
     return true;
@@ -3920,17 +3984,12 @@ var build = async ({
     } catch (err) {
       (0, import_build_utils7.debug)("Failed to parse pyproject.toml", err);
     }
-    const VERSION_REGEX = /\b\d+\.\d+\b/;
-    const exact = requiresPython?.trim().match(VERSION_REGEX)?.[0];
-    if (exact) {
-      declaredPythonVersion = { version: exact, source: "pyproject.toml" };
-      (0, import_build_utils7.debug)(
-        `Found Python version ${exact} in pyproject.toml (requires-python: "${requiresPython}")`
-      );
-    } else if (requiresPython) {
-      (0, import_build_utils7.debug)(
-        `Could not parse Python version from pyproject.toml requires-python: "${requiresPython}"`
-      );
+    if (typeof requiresPython === "string" && requiresPython.trim()) {
+      declaredPythonVersion = {
+        version: requiresPython.trim(),
+        source: "pyproject.toml"
+      };
+      (0, import_build_utils7.debug)(`Found requires-python "${requiresPython}" in pyproject.toml`);
     }
   } else if (pipfileLockDir) {
     let lock = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "6.0.4",
+  "version": "6.0.6",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -21,7 +21,7 @@
     "@types/jest": "27.4.1",
     "@types/node": "14.18.33",
     "@types/which": "3.0.0",
-    "@vercel/build-utils": "13.0.1",
+    "@vercel/build-utils": "13.1.0",
     "cross-env": "7.0.3",
     "execa": "^1.0.0",
     "fs-extra": "11.1.1",