Skip to content

Revert "Requiring python during build time in case is not available on the build image" #1337

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

Merged
merged 2 commits into from
Oct 17, 2025
Merged

Revert "Requiring python during build time in case is not available on the build image" #1337

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a5deeb
Revert "Requiring python during build time in case is not available o…
pacostas Oct 16, 2025
09b266b
Update integration.json
pacostas Oct 16, 2025
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
5 changes: 2 additions & 3 deletions constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package nodeengine

const (
Node = "node"
Npm = "npm"
Cpython = "cpython"
Node = "node"
Npm = "npm"

DepKey = "dependency-sha"
BuildKey = "build"
Expand Down
17 changes: 0 additions & 17 deletions detect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package nodeengine

import (
"os"
"os/exec"
"path/filepath"

"github.com/paketo-buildpacks/packit/v2"
Expand All @@ -17,8 +16,6 @@ type VersionParser interface {
type BuildPlanMetadata struct {
Version string `toml:"version"`
VersionSource string `toml:"version-source"`
Build bool `toml:"build"`
Launch bool `toml:"launch"`
}

func Detect(nvmrcParser, nodeVersionParser VersionParser) packit.DetectFunc {
Expand Down Expand Up @@ -83,20 +80,6 @@ func Detect(nvmrcParser, nodeVersionParser VersionParser) packit.DetectFunc {
})
}

targetOs := os.Getenv("CNB_TARGET_DISTRO_NAME")
_, pythonNotFound := exec.LookPath("python")

installPython := (targetOs != "rhel" && pythonNotFound != nil)
if installPython {
requirements = append(requirements, packit.BuildPlanRequirement{
Name: Cpython,
Metadata: BuildPlanMetadata{
Build: true,
Launch: false,
},
})
}

return packit.DetectResult{
Plan: packit.BuildPlan{
Provides: []packit.BuildPlanProvision{
Expand Down
6 changes: 2 additions & 4 deletions integration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"build-plan": "github.com/paketo-community/build-plan",
"builders": [
"index.docker.io/paketobuildpacks/builder-jammy-buildpackless-base:latest",
"index.docker.io/paketobuildpacks/ubuntu-noble-builder-buildpackless:latest"
],
"cpython": "github.com/paketo-buildpacks/cpython"
"index.docker.io/paketobuildpacks/builder-jammy-buildpackless-base:latest"
]
}
14 changes: 0 additions & 14 deletions integration/init_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ var settings struct {
Processes struct {
Online string
}
Cpython struct {
Online string
Offline string
}
}

Buildpack struct {
Expand All @@ -42,7 +38,6 @@ var settings struct {

Config struct {
BuildPlan string `json:"build-plan"`
Cpython string `json:"cpython"`
}
}

Expand Down Expand Up @@ -78,15 +73,6 @@ func TestIntegration(t *testing.T) {
Execute(root)
Expect(err).NotTo(HaveOccurred())

settings.Buildpacks.Cpython.Online, err = buildpackStore.Get.
Execute(settings.Config.Cpython)
Expect(err).ToNot(HaveOccurred())

settings.Buildpacks.Cpython.Offline, err = buildpackStore.Get.
WithOfflineDependencies().
Execute(settings.Config.Cpython)
Expect(err).ToNot(HaveOccurred())

tmpBuildpackDir, err := os.MkdirTemp("", "node-engine-outdated-deps")
Expect(err).NotTo(HaveOccurred())

Expand Down
1 change: 0 additions & 1 deletion integration/inspector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ func testInspector(t *testing.T, context spec.G, it spec.S) {
image, logs, err = pack.WithNoColor().Build.
WithPullPolicy("never").
WithBuildpacks(
settings.Buildpacks.Cpython.Online,
settings.Buildpacks.NodeEngine.Online,
settings.Buildpacks.Processes.Online,
).
Expand Down
1 change: 0 additions & 1 deletion integration/offline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ func testOffline(t *testing.T, context spec.G, it spec.S) {
image, logs, err = pack.WithNoColor().Build.
WithPullPolicy("never").
WithBuildpacks(
settings.Buildpacks.Cpython.Offline,
settings.Buildpacks.NodeEngine.Offline,
settings.Buildpacks.BuildPlan.Online,
).
Expand Down
2 changes: 0 additions & 2 deletions integration/openssl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ func testOpenSSL(t *testing.T, context spec.G, it spec.S) {

image, logs, err = pack.WithNoColor().Build.
WithBuildpacks(
settings.Buildpacks.Cpython.Online,
settings.Buildpacks.NodeEngine.Online,
settings.Buildpacks.BuildPlan.Online,
).
Expand Down Expand Up @@ -107,7 +106,6 @@ func testOpenSSL(t *testing.T, context spec.G, it spec.S) {

image, logs, err = pack.WithNoColor().Build.
WithBuildpacks(
settings.Buildpacks.Cpython.Online,
settings.Buildpacks.NodeEngine.Online,
settings.Buildpacks.BuildPlan.Online,
).
Expand Down
1 change: 0 additions & 1 deletion integration/optimize_memory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ func testOptimizeMemory(t *testing.T, context spec.G, it spec.S) {
image, logs, err = pack.WithNoColor().Build.
WithPullPolicy("never").
WithBuildpacks(
settings.Buildpacks.Cpython.Online,
settings.Buildpacks.NodeEngine.Online,
settings.Buildpacks.Processes.Online,
).
Expand Down
1 change: 0 additions & 1 deletion integration/project_path_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ func testProjectPath(t *testing.T, context spec.G, it spec.S) {
image, logs, err = pack.WithNoColor().Build.
WithPullPolicy("never").
WithBuildpacks(
settings.Buildpacks.Cpython.Online,
settings.Buildpacks.NodeEngine.Online,
settings.Buildpacks.BuildPlan.Online,
).
Expand Down
1 change: 0 additions & 1 deletion integration/provides_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ func testProvides(t *testing.T, context spec.G, it spec.S) {
image, logs, err = pack.WithNoColor().Build.
WithPullPolicy("never").
WithBuildpacks(
settings.Buildpacks.Cpython.Online,
settings.Buildpacks.NodeEngine.Online,
settings.Buildpacks.BuildPlan.Online,
).
Expand Down
34 changes: 14 additions & 20 deletions integration/reuse_layer_rebuild_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ func testReusingLayerRebuild(t *testing.T, context spec.G, it spec.S) {
firstImage, logs, err = pack.WithNoColor().Build.
WithPullPolicy("never").
WithBuildpacks(
settings.Buildpacks.Cpython.Online,
settings.Buildpacks.NodeEngine.Online,
settings.Buildpacks.BuildPlan.Online,
).
Expand All @@ -81,10 +80,9 @@ func testReusingLayerRebuild(t *testing.T, context spec.G, it spec.S) {

imageIDs[firstImage.ID] = struct{}{}


Expect(firstImage.Buildpacks).To(HaveLen(3))
Expect(firstImage.Buildpacks[1].Key).To(Equal(settings.Buildpack.ID))
Expect(firstImage.Buildpacks[1].Layers).To(HaveKey("node"))
Expect(firstImage.Buildpacks).To(HaveLen(2))
Expect(firstImage.Buildpacks[0].Key).To(Equal(settings.Buildpack.ID))
Expect(firstImage.Buildpacks[0].Layers).To(HaveKey("node"))

Expect(logs).To(ContainLines(
fmt.Sprintf("%s 1.2.3", settings.Buildpack.Name),
Expand Down Expand Up @@ -139,7 +137,6 @@ func testReusingLayerRebuild(t *testing.T, context spec.G, it spec.S) {
secondImage, logs, err = pack.WithNoColor().Build.
WithPullPolicy("never").
WithBuildpacks(
settings.Buildpacks.Cpython.Online,
settings.Buildpacks.NodeEngine.Online,
settings.Buildpacks.BuildPlan.Online,
).
Expand All @@ -148,9 +145,9 @@ func testReusingLayerRebuild(t *testing.T, context spec.G, it spec.S) {

imageIDs[secondImage.ID] = struct{}{}

Expect(secondImage.Buildpacks).To(HaveLen(3))
Expect(secondImage.Buildpacks[1].Key).To(Equal(settings.Buildpack.ID))
Expect(secondImage.Buildpacks[1].Layers).To(HaveKey("node"))
Expect(secondImage.Buildpacks).To(HaveLen(2))
Expect(secondImage.Buildpacks[0].Key).To(Equal(settings.Buildpack.ID))
Expect(secondImage.Buildpacks[0].Layers).To(HaveKey("node"))

Expect(logs).To(ContainLines(
fmt.Sprintf("%s 1.2.3", settings.Buildpack.Name),
Expand Down Expand Up @@ -184,8 +181,7 @@ func testReusingLayerRebuild(t *testing.T, context spec.G, it spec.S) {
Expect(err).NotTo(HaveOccurred())
Expect(content).To(ContainSubstring("hello world"))

Expect(secondImage.Buildpacks[0].Layers["cpython"].SHA).To(Equal(firstImage.Buildpacks[0].Layers["cpython"].SHA))
Expect(secondImage.Buildpacks[1].Layers["node"].SHA).To(Equal(firstImage.Buildpacks[1].Layers["node"].SHA))
Expect(secondImage.Buildpacks[0].Layers["node"].SHA).To(Equal(firstImage.Buildpacks[0].Layers["node"].SHA))
})
})

Expand All @@ -207,7 +203,6 @@ func testReusingLayerRebuild(t *testing.T, context spec.G, it spec.S) {
firstImage, logs, err = pack.WithNoColor().Build.
WithPullPolicy("never").
WithBuildpacks(
settings.Buildpacks.Cpython.Online,
settings.Buildpacks.NodeEngine.Online,
settings.Buildpacks.BuildPlan.Online,
).
Expand All @@ -217,9 +212,9 @@ func testReusingLayerRebuild(t *testing.T, context spec.G, it spec.S) {

imageIDs[firstImage.ID] = struct{}{}

Expect(firstImage.Buildpacks).To(HaveLen(3))
Expect(firstImage.Buildpacks[1].Key).To(Equal(settings.Buildpack.ID))
Expect(firstImage.Buildpacks[1].Layers).To(HaveKey("node"))
Expect(firstImage.Buildpacks).To(HaveLen(2))
Expect(firstImage.Buildpacks[0].Key).To(Equal(settings.Buildpack.ID))
Expect(firstImage.Buildpacks[0].Layers).To(HaveKey("node"))

Expect(logs).To(ContainLines(
fmt.Sprintf("%s 1.2.3", settings.Buildpack.Name),
Expand Down Expand Up @@ -275,7 +270,6 @@ func testReusingLayerRebuild(t *testing.T, context spec.G, it spec.S) {
secondImage, logs, err = pack.WithNoColor().Build.
WithPullPolicy("never").
WithBuildpacks(
settings.Buildpacks.Cpython.Online,
settings.Buildpacks.NodeEngine.Online,
settings.Buildpacks.BuildPlan.Online,
).
Expand All @@ -285,9 +279,9 @@ func testReusingLayerRebuild(t *testing.T, context spec.G, it spec.S) {

imageIDs[secondImage.ID] = struct{}{}

Expect(secondImage.Buildpacks).To(HaveLen(3))
Expect(secondImage.Buildpacks[1].Key).To(Equal(settings.Buildpack.ID))
Expect(secondImage.Buildpacks[1].Layers).To(HaveKey("node"))
Expect(secondImage.Buildpacks).To(HaveLen(2))
Expect(secondImage.Buildpacks[0].Key).To(Equal(settings.Buildpack.ID))
Expect(secondImage.Buildpacks[0].Layers).To(HaveKey("node"))

Expect(logs).To(ContainLines(
fmt.Sprintf("%s 1.2.3", settings.Buildpack.Name),
Expand Down Expand Up @@ -347,7 +341,7 @@ func testReusingLayerRebuild(t *testing.T, context spec.G, it spec.S) {
Expect(err).NotTo(HaveOccurred())
Expect(content).To(ContainSubstring("hello world"))

Expect(secondImage.Buildpacks[1].Layers["node"].SHA).NotTo(Equal(firstImage.Buildpacks[1].Layers["node"].SHA))
Expect(secondImage.Buildpacks[0].Layers["node"].SHA).NotTo(Equal(firstImage.Buildpacks[0].Layers["node"].SHA))
})
})
}
6 changes: 0 additions & 6 deletions integration/simple_app_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ func testSimple(t *testing.T, context spec.G, it spec.S) {
image, logs, err = pack.WithNoColor().Build.
WithPullPolicy("never").
WithBuildpacks(
settings.Buildpacks.Cpython.Online,
settings.Buildpacks.NodeEngine.Online,
settings.Buildpacks.BuildPlan.Online,
).
Expand Down Expand Up @@ -184,7 +183,6 @@ func testSimple(t *testing.T, context spec.G, it spec.S) {
WithPullPolicy("never").
WithEnv(map[string]string{"NODE_ENV": "development", "NODE_VERBOSE": "true"}).
WithBuildpacks(
settings.Buildpacks.Cpython.Online,
settings.Buildpacks.NodeEngine.Online,
settings.Buildpacks.BuildPlan.Online,
).
Expand Down Expand Up @@ -250,7 +248,6 @@ func testSimple(t *testing.T, context spec.G, it spec.S) {
image, logs, err = pack.WithNoColor().Build.
WithPullPolicy("never").
WithBuildpacks(
settings.Buildpacks.Cpython.Online,
settings.Buildpacks.NodeEngine.Online,
settings.Buildpacks.BuildPlan.Online,
).
Expand Down Expand Up @@ -337,7 +334,6 @@ func testSimple(t *testing.T, context spec.G, it spec.S) {
image, logs, err = pack.WithNoColor().Build.
WithPullPolicy("never").
WithBuildpacks(
settings.Buildpacks.Cpython.Online,
settings.Buildpacks.NodeEngine.Online,
settings.Buildpacks.BuildPlan.Online,
).
Expand Down Expand Up @@ -419,7 +415,6 @@ func testSimple(t *testing.T, context spec.G, it spec.S) {
image, logs, err = pack.WithNoColor().Build.
WithPullPolicy("never").
WithBuildpacks(
settings.Buildpacks.Cpython.Online,
settings.Buildpacks.NodeEngine.Deprecated,
settings.Buildpacks.BuildPlan.Online,
).
Expand Down Expand Up @@ -448,7 +443,6 @@ func testSimple(t *testing.T, context spec.G, it spec.S) {
image, logs, err = pack.WithNoColor().Build.
WithPullPolicy("never").
WithBuildpacks(
settings.Buildpacks.Cpython.Online,
settings.Buildpacks.NodeEngine.Online,
settings.Buildpacks.BuildPlan.Online,
).
Expand Down
Loading