From 6f0c2a80f239545339625d57e5ee021f68c09fd7 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sun, 19 Apr 2026 00:04:19 +0900 Subject: [PATCH] internal/rosa/python: migrate setuptools to helper This is much cleaner, and should be functionally equivalent. Signed-off-by: Ophestra --- internal/rosa/python.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/internal/rosa/python.go b/internal/rosa/python.go index e9a2a25a..4af5c0ef 100644 --- a/internal/rosa/python.go +++ b/internal/rosa/python.go @@ -180,18 +180,12 @@ func (t Toolchain) newSetuptools() (pkg.Artifact, string) { version = "82.0.1" checksum = "nznP46Tj539yqswtOrIM4nQgwLA1h-ApKX7z7ghazROCpyF5swtQGwsZoI93wkhc" ) - return t.New("setuptools-"+version, 0, t.AppendPresets(nil, - Python, - ), nil, nil, ` -pip3 install \ - --no-index \ - --prefix=/system \ - --root=/work \ - /usr/src/setuptools -`, pkg.Path(AbsUsrSrc.Append("setuptools"), true, newFromGitHub( + return t.NewPackage("setuptools", version, newFromGitHub( "pypa/setuptools", "v"+version, checksum, - ))), version + ), nil, &PipHelper{ + BuildIsolation: true, + }), version } func init() { artifactsM[Setuptools] = Metadata{