internal/rosa/python: pass build dependencies separately
All checks were successful
Test / Create distribution (push) Successful in 1m2s
Test / Sandbox (push) Successful in 2m48s
Test / Hakurei (push) Successful in 3m41s
Test / ShareFS (push) Successful in 3m53s
Test / Sandbox (race detector) (push) Successful in 5m16s
Test / Hakurei (race detector) (push) Successful in 6m22s
Test / Flake checks (push) Successful in 1m22s
All checks were successful
Test / Create distribution (push) Successful in 1m2s
Test / Sandbox (push) Successful in 2m48s
Test / Hakurei (push) Successful in 3m41s
Test / ShareFS (push) Successful in 3m53s
Test / Sandbox (race detector) (push) Successful in 5m16s
Test / Hakurei (race detector) (push) Successful in 6m22s
Test / Flake checks (push) Successful in 1m22s
This is cleaner with less duplicate code. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -169,22 +169,23 @@ pip3 install \
|
|||||||
func newPythonPackage(
|
func newPythonPackage(
|
||||||
name string, id int, description, website, version string,
|
name string, id int, description, website, version string,
|
||||||
source pkg.Artifact, attrP *PackageAttr, attr *PipHelper,
|
source pkg.Artifact, attrP *PackageAttr, attr *PipHelper,
|
||||||
dependencies P, extra ...PArtifact,
|
build P, extra ...PArtifact,
|
||||||
) Metadata {
|
) Metadata {
|
||||||
name = "python-" + name
|
name = "python-" + name
|
||||||
if dependencies == nil {
|
|
||||||
dependencies = slices.Concat(P{Python}, extra)
|
|
||||||
}
|
|
||||||
return Metadata{
|
return Metadata{
|
||||||
f: func(t Toolchain) (pkg.Artifact, string) {
|
f: func(t Toolchain) (pkg.Artifact, string) {
|
||||||
return t.NewPackage(name, version, source, attrP, attr, extra...), version
|
return t.NewPackage(name, version, source, attrP, attr, slices.Concat(
|
||||||
|
P{Python},
|
||||||
|
extra,
|
||||||
|
build,
|
||||||
|
)...), version
|
||||||
},
|
},
|
||||||
|
|
||||||
Name: name,
|
Name: name,
|
||||||
Description: description,
|
Description: description,
|
||||||
Website: website,
|
Website: website,
|
||||||
|
|
||||||
Dependencies: dependencies,
|
Dependencies: slices.Concat(P{Python}, extra),
|
||||||
|
|
||||||
ID: id,
|
ID: id,
|
||||||
}
|
}
|
||||||
@@ -285,8 +286,7 @@ func init() {
|
|||||||
version, newFromGitHub(
|
version, newFromGitHub(
|
||||||
"cpburnz/python-pathspec",
|
"cpburnz/python-pathspec",
|
||||||
"v"+version, checksum,
|
"v"+version, checksum,
|
||||||
), nil, nil, nil,
|
), nil, nil, P{PythonFlitCore},
|
||||||
PythonFlitCore,
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user