diff --git a/__tests__/version/requirements-file.test.ts b/__tests__/version/requirements-file.test.ts index 5ff0277..11f9ebf 100644 --- a/__tests__/version/requirements-file.test.ts +++ b/__tests__/version/requirements-file.test.ts @@ -35,3 +35,14 @@ test("strips PEP 508 markers from requirements dependencies", () => { expect(parsedVersion).toBe("==0.11.20"); }); + +test.each([ + ["uv >= 0.5.0", ">=0.5.0"], + ["uv == 0.11.20", "==0.11.20"], + ["uv>=0.5.0, <0.6.0", ">=0.5.0,<0.6.0"], + ["uv >= 0.5.0 , < 0.6.0", ">=0.5.0,<0.6.0"], + ["uv==0.11.20 --hash=sha256:abc", "==0.11.20"], + ["uv==0.11.20 # pinned for CI", "==0.11.20"], +])("allows whitespace in the uv specifier %s", (dependency, expected) => { + expect(getUvVersionFromRequirementsText(dependency)).toBe(expected); +}); diff --git a/dist/setup/index.cjs b/dist/setup/index.cjs index 0b7cf0c..0390261 100644 --- a/dist/setup/index.cjs +++ b/dist/setup/index.cjs @@ -101579,7 +101579,7 @@ function getUvVersionFromAllDependencies(allDependencies) { } function getUvVersionFromDependency(dependency) { const dependencyWithoutMarker = dependency.split(";", 1)[0]?.trim(); - return dependencyWithoutMarker?.match(/^uv([=<>~!]+\S*)/)?.[1].trim(); + return dependencyWithoutMarker?.match(/^uv\s*((?:[=<>~!]+\s*[^\s,]+\s*,?\s*)+)/)?.[1].replace(/\s/g, ""); } // src/version/tool-versions-file.ts diff --git a/src/version/requirements-file.ts b/src/version/requirements-file.ts index 401a2c1..e335c5f 100644 --- a/src/version/requirements-file.ts +++ b/src/version/requirements-file.ts @@ -69,5 +69,7 @@ function getUvVersionFromAllDependencies( function getUvVersionFromDependency(dependency: string): string | undefined { const dependencyWithoutMarker = dependency.split(";", 1)[0]?.trim(); - return dependencyWithoutMarker?.match(/^uv([=<>~!]+\S*)/)?.[1].trim(); + return dependencyWithoutMarker + ?.match(/^uv\s*((?:[=<>~!]+\s*[^\s,]+\s*,?\s*)+)/)?.[1] + .replace(/\s/g, ""); }