Skip to content

Commit

Permalink
fix: add conda&python path for non-conda mode (#1376)
Browse files Browse the repository at this point in the history
Signed-off-by: Keming <kemingy94@gmail.com>

Signed-off-by: Keming <kemingy94@gmail.com>
  • Loading branch information
kemingy committed Jan 4, 2023
1 parent 8bbcd32 commit 51b586e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 0 additions & 2 deletions pkg/lang/ir/v1/conda.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
"github.com/sirupsen/logrus"

"github.com/tensorchord/envd/pkg/flag"
"github.com/tensorchord/envd/pkg/types"
)

const (
Expand Down Expand Up @@ -153,7 +152,6 @@ func (g generalGraph) compileCondaEnvironment(root llb.State) (llb.State, error)
}

func (g *generalGraph) installConda(root llb.State) llb.State {
root = g.updateEnvPath(root, types.DefaultCondaPath)
if g.Dev {
// We only create envd user for dev env.
// This directory is related to conda envd env meta (used by `conda env config vars set key=value`)
Expand Down
2 changes: 2 additions & 0 deletions pkg/lang/ir/v1/python.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/sirupsen/logrus"

"github.com/tensorchord/envd/pkg/flag"
"github.com/tensorchord/envd/pkg/types"
)

const (
Expand All @@ -33,6 +34,7 @@ const (
)

func (g *generalGraph) installPython(root llb.State) (llb.State, error) {
root = g.updateEnvPath(root, types.DefaultCondaPath)
if g.CondaConfig == nil {
version, err := g.getAppropriatePythonVersion()
if err != nil {
Expand Down

0 comments on commit 51b586e

Please sign in to comment.