Uses PYTHONPYCACHEPREFIX to control where __pycache__ goes

paketo-buildpacks · May 9, 2022 · 22d754f · 22d754f
1 parent fb81f17
commit 22d754f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/build.go b/build.go
@@ -145,7 +145,8 @@ func Build(dependencies DependencyManager, sbomGenerator SBOMGenerator, logger s
 			DepKey: dependency.SHA256,
 		}
 
-		cpythonLayer.SharedEnv.Override("PYTHONPATH", cpythonLayer.Path)
+		cpythonLayer.SharedEnv.Default("PYTHONPATH", cpythonLayer.Path)
+		cpythonLayer.SharedEnv.Default("PYTHONPYCACHEPREFIX", "$HOME/.pycache")
 
 		logger.Break()
 		logger.Process("Configuring environment")

diff --git a/build_test.go b/build_test.go
@@ -118,7 +118,8 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 		Expect(layer.Path).To(Equal(filepath.Join(layersDir, "cpython")))
 
 		Expect(layer.SharedEnv).To(Equal(packit.Environment{
-			"PYTHONPATH.override": filepath.Join(layersDir, "cpython"),
+			"PYTHONPATH.default":          filepath.Join(layersDir, "cpython"),
+			"PYTHONPYCACHEPREFIX.default": "$HOME/.pycache",
 		}))
 		Expect(layer.BuildEnv).To(BeEmpty())
 		Expect(layer.LaunchEnv).To(BeEmpty())

diff --git a/integration/buildpack_yml_test.go b/integration/buildpack_yml_test.go
@@ -89,7 +89,8 @@ func testBuildpackYAML(t *testing.T, context spec.G, it spec.S) {
 			))
 			Expect(logs).To(ContainLines(
 				"  Configuring environment",
-				MatchRegexp(fmt.Sprintf(`    PYTHONPATH -> "/layers/%s/cpython"`, strings.ReplaceAll(buildpackInfo.Buildpack.ID, "/", "_"))),
+				fmt.Sprintf(`    PYTHONPATH          -> "/layers/%s/cpython"`, strings.ReplaceAll(buildpackInfo.Buildpack.ID, "/", "_")),
+				`    PYTHONPYCACHEPREFIX -> "$HOME/.pycache"`,
 			))
 		})
 	})

diff --git a/integration/default_test.go b/integration/default_test.go
@@ -84,7 +84,8 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
 			))
 			Expect(logs).To(ContainLines(
 				"  Configuring environment",
-				MatchRegexp(fmt.Sprintf(`    PYTHONPATH -> "/layers/%s/cpython"`, strings.ReplaceAll(buildpackInfo.Buildpack.ID, "/", "_"))),
+				fmt.Sprintf(`    PYTHONPATH          -> "/layers/%s/cpython"`, strings.ReplaceAll(buildpackInfo.Buildpack.ID, "/", "_")),
+				`    PYTHONPYCACHEPREFIX -> "$HOME/.pycache"`,
 			))
 		})
 
@@ -217,7 +218,8 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
 
 				Expect(logs).To(ContainLines(
 					"  Configuring environment",
-					MatchRegexp(fmt.Sprintf(`    PYTHONPATH -> "/layers/%s/cpython"`, strings.ReplaceAll(buildpackInfo.Buildpack.ID, "/", "_"))),
+					fmt.Sprintf(`    PYTHONPATH          -> "/layers/%s/cpython"`, strings.ReplaceAll(buildpackInfo.Buildpack.ID, "/", "_")),
+					`    PYTHONPYCACHEPREFIX -> "$HOME/.pycache"`,
 				))
 			})
 		})