Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions StabilityMatrix.Core/Processes/ProcessRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -651,8 +651,15 @@ public static Task<ProcessResult> RunBashCommand(
/// </summary>
public static string Quote(string argument)
{
var inner = argument.Trim('"');
return inner.Contains(' ') ? $"\"{inner}\"" : argument;
var inner = argument.Length >= 2 && argument.StartsWith('"') && argument.EndsWith('"')
? argument[1..^1]
: argument;

if (!inner.Contains(' ') && !inner.Contains('"'))
return argument;

var escaped = inner.Replace("\"", "\\\"");
return $"\"{escaped}\"";
}

/// <summary>
Expand Down
10 changes: 9 additions & 1 deletion StabilityMatrix.Core/Python/PipInstallArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,15 @@ public PipInstallArgs WithParsedFromRequirementsTxt(
requirementsEntries = requirementsEntries.Where(s => !excludeRegex.IsMatch(s));
}

return this.AddArgs(requirementsEntries.Select(Argument.Quoted).ToArray());
return this.AddArgs(requirementsEntries.Select(ToRequirementArgument).ToArray());
}

private static Argument ToRequirementArgument(string requirementEntry)
{
if (requirementEntry.StartsWith('-'))
return Argument.Quoted(requirementEntry);

return new Argument(requirementEntry);
}

/// <summary>
Expand Down
20 changes: 20 additions & 0 deletions StabilityMatrix.Tests/Core/PipInstallArgsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,26 @@ public void TestParsedFromRequirementsTxt()
Assert.AreEqual("torch~=2.0.0 torchvision --extra-index-url https://example.org", args.ToString());
}

[TestMethod]
public void TestParsedFromRequirementsTxt_KeepsEnvironmentMarkerRequirementAsSingleArgument()
{
const string requirements = """
onnxruntime-gpu==1.22.0; python_version < "3.11"
""";

var args = new PipInstallArgs().WithParsedFromRequirementsTxt(requirements).ToProcessArgs();

Assert.AreEqual(1, args.Count());
Assert.AreEqual(
"\"onnxruntime-gpu==1.22.0; python_version < \\\"3.11\\\"\"",
args.Single().GetQuotedValue()
);
Assert.AreEqual(
"\"onnxruntime-gpu==1.22.0; python_version < \\\"3.11\\\"\"",
args.ToString()
);
}

[TestMethod]
public void TestWithUserOverrides()
{
Expand Down
Loading