Skip to content

Implement PythonVersion in managers #1751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Eduardo Villalpando Mello (edvilme) wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Implement PythonVersion in managers #1751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ead2e2
Implement PythonVersion in managers
edvilme Sep 1, 2026
a2d44d4
Refactor
edvilme Sep 1, 2026
ab6ddfb
Route post-merge version handling through PythonVersion
edvilme Sep 2, 2026
0afe955
Address PR review on prerelease parsing and upper bounds
edvilme Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 41 additions & 98 deletions src/common/inlineScript/interpreter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

import { PythonEnvironment } from '../../api';
import { traceWarn } from '../logging';
import { compareReleaseSegments, parseReleaseSegments } from '../utils/pep440Release';
import { PythonVersion } from '../pythonVersion';
import { splitClause } from '../pythonVersionSpecifier';
import { matchesPythonVersion } from './metadata';

/**
Expand All @@ -26,12 +27,14 @@ export function pickCompatibleInterpreter(
): PythonEnvironment | undefined {
const trimmedConstraint = requiresPython?.trim();
const constraint = trimmedConstraint ? trimmedConstraint : undefined;
const candidates = installed.filter((env) => isUsableBaseInterpreter(env, constraint));
const candidates = installed.flatMap((env) => {
const version = isUsableBaseInterpreter(env, constraint) ? PythonVersion.tryParse(env.version) : undefined;
return version ? [{ env, version }] : [];
});
if (candidates.length === 0) {
return undefined;
}
const sorted = [...candidates].sort((a, b) => compareVersionsDescending(a.version, b.version));
return sorted[0];
return candidates.sort((a, b) => b.version.compareTo(a.version))[0].env;
}

/**
Expand Down Expand Up @@ -62,15 +65,15 @@ export function extractLowerBoundVersion(requiresPython: string | undefined): st
return undefined;
}

let best: number[] | undefined;
let best: PythonVersion | undefined;
let bestStr: string | undefined;
for (const clause of clauses) {
const lb = lowerBoundForClause(clause);
if (lb === undefined) {
continue;
}
if (best === undefined || compareReleaseSegments(lb.segments, best) > 0) {
best = lb.segments;
if (best === undefined || lb.version.compareTo(best) > 0) {
best = lb.version;
bestStr = lb.display;
}
}
Expand All @@ -84,7 +87,7 @@ function isUsableBaseInterpreter(env: PythonEnvironment, requiresPython: string
if (typeof env.version !== 'string' || env.version.length === 0) {
return false;
}
if (parseLeadingMajor(env.version) !== 3) {
if (PythonVersion.tryParse(env.version)?.major !== 3) {
return false;
}
if (requiresPython !== undefined && !matchesPythonVersion(requiresPython, env.version)) {
Expand All @@ -93,105 +96,45 @@ function isUsableBaseInterpreter(env: PythonEnvironment, requiresPython: string
return true;
}

function parseLeadingMajor(version: string): number | undefined {
const m = version.match(/^\s*(\d+)/);
if (!m) {
return undefined;
}
const n = Number.parseInt(m[1], 10);
return Number.isNaN(n) ? undefined : n;
}

function compareVersionsDescending(a: string, b: string): number {
const aSeg = parseReleaseSegments(a);
const bSeg = parseReleaseSegments(b);
if (aSeg === undefined && bSeg === undefined) {
return 0;
}
if (aSeg === undefined) {
return 1;
}
if (bSeg === undefined) {
return -1;
}
return compareReleaseSegments(bSeg, aSeg);
}

const CLAUSE_RE = /^(===|~=|==|!=|>=|<=|>|<)\s*(.+)$/;

interface LowerBound {
readonly segments: number[];
readonly version: PythonVersion;
readonly display: string;
}

function lowerBoundForClause(clause: string): LowerBound | undefined {
const m = clause.match(CLAUSE_RE);
if (!m) {
const parts = splitClause(clause);
if (!parts) {
traceWarn(`inline-script interpreter: unrecognized requires-python clause: ${JSON.stringify(clause)}`);
return undefined;
}
const op = m[1];
const raw = m[2].trim();
const { operator, literal } = parts;

switch (op) {
case '>=': {
// Per PEP 440 wildcards are only legal with `==` / `!=`. Stay
// consistent with matchesPythonVersion (which rejects `>=X.*`)
// so we never hand uv a value the picker will then reject.
if (raw.endsWith('.*')) {
traceWarn(
`inline-script interpreter: wildcards are only valid with '==' / '!=': ${JSON.stringify(clause)}`,
);
return undefined;
}
const segments = parseReleaseSegments(raw);
if (segments === undefined) {
return undefined;
}
return { segments, display: segmentsToString(segments) };
}
case '==': {
const literal = raw.endsWith('.*') ? raw.slice(0, -2) : raw;
const segments = parseReleaseSegments(literal);
if (segments === undefined) {
return undefined;
}
return { segments, display: segmentsToString(segments) };
}
case '~=': {
// PEP 440 requires at least two release segments and disallows
// wildcards for `~=`. Both rejections mirror matchesPythonVersion.
if (raw.endsWith('.*')) {
traceWarn(
`inline-script interpreter: wildcards are only valid with '==' / '!=': ${JSON.stringify(clause)}`,
);
return undefined;
}
const segments = parseReleaseSegments(raw);
if (segments === undefined) {
return undefined;
}
if (segments.length < 2) {
traceWarn(
`inline-script interpreter: '~=' requires at least two release segments: ${JSON.stringify(clause)}`,
);
return undefined;
}
return { segments, display: segmentsToString(segments) };
}
case '>':
case '<':
case '<=':
case '!=':
case '===':
// No clean integer floor we can hand to `uv python install`.
// Caller falls back to uv default and re-verifies post-install.
return undefined;
default:
return undefined;
// Only the operators that establish a floor yield an install target. The
// rest leave no clean integer floor for `uv python install`, so the caller
// falls back to the uv default and re-verifies after installing.
if (operator !== '>=' && operator !== '==' && operator !== '~=') {
return undefined;
}

// Per PEP 440 wildcards are only legal with `==` / `!=`. Stay consistent
// with matchesPythonVersion (which rejects `>=X.*`) so we never hand uv a
// value the picker will then reject.
if (literal.endsWith('.*') && operator !== '==') {
traceWarn(`inline-script interpreter: wildcards are only valid with '==' / '!=': ${JSON.stringify(clause)}`);
return undefined;
}

const version = PythonVersion.tryParse(literal.endsWith('.*') ? literal.slice(0, -2) : literal);
if (!version) {
return undefined;
}

// PEP 440 requires at least two release segments for `~=`, mirroring
// matchesPythonVersion.
if (operator === '~=' && version.precision < 2) {
traceWarn(`inline-script interpreter: '~=' requires at least two release segments: ${JSON.stringify(clause)}`);
return undefined;
}
}

function segmentsToString(segments: ReadonlyArray<number>): string {
return segments.join('.');
return { version, display: version.toReleaseString() };
}
7 changes: 4 additions & 3 deletions src/common/inlineScript/metadata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import * as fs from 'fs/promises';
import { Uri } from 'vscode';
import { traceVerbose, traceWarn } from '../logging';
import { PythonVersion } from '../pythonVersion';
import { PythonVersionSpecifier } from '../pythonVersionSpecifier';

/**
* Parsed and validated PEP 723 `script` metadata block.
Expand Down Expand Up @@ -309,10 +310,10 @@ export function matchesPythonVersion(requiresPython: string, version: string): b
traceWarn(`inline script metadata: cannot parse Python version: ${JSON.stringify(version)}`);
return false;
}
const result = parsedVersion.satisfies(requiresPython);
if (result === undefined) {
const parsedSpecifier = PythonVersionSpecifier.tryParse(requiresPython);
if (!parsedSpecifier) {
traceWarn(`inline script metadata: invalid requires-python specifier: ${JSON.stringify(requiresPython)}`);
return false;
}
return result;
return parsedSpecifier.matches(parsedVersion);
}
Loading
Loading