Merge branch version/0-35-0-RC1 to adopt changes from PR #2113

Author: as-builds

pkg/platform/runtime/setup/implementations/camel/prepare_mac.go

@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 package camel
@@ -7,6 +8,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"strings"
 
 	"github.com/ActiveState/cli/internal/constants"
 	"github.com/ActiveState/cli/internal/errs"
@@ -55,6 +57,9 @@ func (m *MetaData) Prepare(installRoot string) error {
 	if pythonpath, ok := os.LookupEnv("PYTHONPATH"); ok {
 		m.PathListEnv["PYTHONPATH"] = pythonpath
 	} else if fileutils.DirExists(sitePackages) {
+		if strings.HasPrefix(sitePackages, installRoot) {
+			sitePackages = strings.Replace(sitePackages, installRoot, "${INSTALLDIR}", 1)
+		}
 		m.PathListEnv["PYTHONPATH"] = sitePackages
 	}
 

test/integration/activate_int_test.go

@@ -221,6 +221,26 @@ func (suite *ActivateIntegrationTestSuite) TestActivate_PythonPath() {
 	// ensure that shell is functional
 	cp.WaitForInput()
 
+	// Verify that PYTHONPATH is set correctly to the installed site-packages, not a temp runtime
+	// setup directory.
+	if runtime.GOOS == "windows" {
+		cp.Send("echo %PYTHONPATH%")
+	} else {
+		cp.Send("echo $PYTHONPATH")
+	}
+	suite.Assert().NotContains(cp.TrimmedSnapshot(), constants.LocalRuntimeTempDirectory)
+	// Verify the temp runtime setup directory has been removed.
+	runtimeFound := false
+	entries, err := fileutils.ListDir(ts.Dirs.Cache, true)
+	suite.Require().NoError(err)
+	for _, entry := range entries {
+		if entry.IsDir() && fileutils.DirExists(filepath.Join(entry.Path(), constants.LocalRuntimeEnvironmentDirectory)) {
+			runtimeFound = true
+			suite.Assert().NoDirExists(filepath.Join(entry.Path(), constants.LocalRuntimeTempDirectory))
+		}
+	}
+	suite.Assert().True(runtimeFound, "runtime directory was not found in ts.Dirs.Cache")
+
 	// test that PYTHONPATH is preserved in environment (https://www.pivotaltracker.com/story/show/178458102)
 	if runtime.GOOS == "windows" {
 		cp.Send("set PYTHONPATH=/custom_pythonpath")