envd 1.1.0__tar.gz → 1.2.0__tar.gz

envd-1.2.0/.GIT_TAG_INFO

@@ -0,0 +1 @@
+v1.2.0

{envd-1.1.0 → envd-1.2.0}/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v1.1.0 (2025-03-10)
+
+ * [207c30e](https://github.com/tensorchord/envd/commit/207c30ee9556bb6915996166507fbc81ec26309a) feat: add pre-defined envd template (#1991)
+ * [1089f98](https://github.com/tensorchord/envd/commit/1089f98474ca85f453c90366acecf9f6a505aad0) feat: support uv (#1990)
+
+### Contributors
+
+ * Keming
+
 ## v1.0.1 (2025-02-17)
 
 

{envd-1.1.0 → envd-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: envd
-Version: 1.1.0
+Version: 1.2.0
 Summary: A development environment management tool for data scientists.
 Home-page: https://github.com/tensorchord/envd
 Author: TensorChord

{envd-1.1.0 → envd-1.2.0}/envd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: envd
-Version: 1.1.0
+Version: 1.2.0
 Summary: A development environment management tool for data scientists.
 Home-page: https://github.com/tensorchord/envd
 Author: TensorChord

{envd-1.1.0 → envd-1.2.0}/go.mod

@@ -83,7 +83,7 @@ require (
 	github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 // indirect
 	github.com/cockroachdb/redact v1.1.6 // indirect
 	github.com/containerd/containerd/api v1.8.0 // indirect
-	github.com/containerd/containerd/v2 v2.0.3 // indirect
+	github.com/containerd/containerd/v2 v2.0.4 // indirect
 	github.com/containerd/continuity v0.4.5 // indirect
 	github.com/containerd/errdefs v1.0.0 // indirect
 	github.com/containerd/errdefs/pkg v0.3.0 // indirect

{envd-1.1.0 → envd-1.2.0}/go.sum

@@ -748,8 +748,8 @@ github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMX
 github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0=
 github.com/containerd/containerd/api v1.8.0/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc=
-github.com/containerd/containerd/v2 v2.0.3 h1:zBKgwgZsuu+LPCMzCLgA4sC4MiZzZ59ZT31XkmiISQM=
-github.com/containerd/containerd/v2 v2.0.3/go.mod h1:5j9QUUaV/cy9ZeAx4S+8n9ffpf+iYnEj4jiExgcbuLY=
+github.com/containerd/containerd/v2 v2.0.4 h1:+r7yJMwhTfMm3CDyiBjMBQO8a9CTBxL2Bg/JtqtIwB8=
+github.com/containerd/containerd/v2 v2.0.4/go.mod h1:5j9QUUaV/cy9ZeAx4S+8n9ffpf+iYnEj4jiExgcbuLY=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20200928162600-f2cc35102c2a/go.mod h1:W0qIOTD7mp2He++YVq+kgfXezRYqzP1uDuMVH1bITDY=
 github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4=

{envd-1.1.0 → envd-1.2.0}/pkg/app/new.go

@@ -15,7 +15,7 @@
 package app
 
 import (
-	_ "embed"
+	"embed"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -29,31 +29,41 @@ import (
 )
 
 var (
-	//go:embed template/uv.envd
-	templateUV string
-	//go:embed template/conda.envd
-	templateConda string
-	//go:embed template/torch.envd
-	templateTorch string
-
-	templates = map[string]string{
-		"uv":    templateUV,
-		"conda": templateConda,
-		"torch": templateTorch,
-	}
+	//go:embed template/*.envd
+	envdTemplateDir      embed.FS
+	defaultEnvdTemplates []EnvdTemplate
 )
 
-func joinKeysToString(table map[string]string) string {
-	keys := make([]string, 0, len(table))
-	for k := range table {
-		keys = append(keys, k)
+type EnvdTemplate struct {
+	name    string
+	content []byte
+}
+
+func init() {
+	entries, err := envdTemplateDir.ReadDir("template")
+	if err != nil {
+		panic(errors.Wrap(err, "failed to read template directory"))
+	}
+	for _, entry := range entries {
+		if entry.IsDir() {
+			continue
+		}
+		name := strings.TrimSuffix(entry.Name(), ".envd")
+		content, err := envdTemplateDir.ReadFile(filepath.Join("template", entry.Name()))
+		if err != nil {
+			panic(errors.Wrapf(err, "failed to read template file: %s", entry.Name()))
+		}
+		defaultEnvdTemplates = append(defaultEnvdTemplates, EnvdTemplate{name: name, content: content})
 	}
-	return strings.Join(keys, ", ")
 }
 
 func isDefaultTemplate(name string) bool {
-	_, ok := templates[name]
-	return ok
+	for _, template := range defaultEnvdTemplates {
+		if template.name == name {
+			return true
+		}
+	}
+	return false
 }
 
 var CommandNew = &cli.Command{
@@ -67,7 +77,7 @@ var CommandNew = &cli.Command{
 	Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:     "template",
-			Usage:    fmt.Sprintf("Template name to use (`envd bootstrap` will add [%s])", joinKeysToString(templates)),
+			Usage:    "Template name to use (`envd bootstrap` will add some default templates to '$HOME/.config/envd/templates')",
 			Aliases:  []string{"t"},
 			Required: true,
 		},
@@ -136,24 +146,24 @@ func newCommand(clicontext *cli.Context) error {
 }
 
 func addTemplates(clicontext *cli.Context) error {
-	for name, content := range templates {
-		file, err := fileutil.TemplateFile(name + ".envd")
+	for _, template := range defaultEnvdTemplates {
+		file, err := fileutil.TemplateFile(template.name + ".envd")
 		if err != nil {
-			return errors.Wrapf(err, "failed to get template file path: %s", name)
+			return errors.Wrapf(err, "failed to get template file path: %s", template.name)
 		}
 		exist, err := fileutil.FileExists(file)
 		if err != nil {
 			return errors.Wrapf(err, "failed to check file exists: %s", file)
 		}
 		if exist {
-			logrus.Debugf("Template file `%s` already exists in `%s`", name, file)
+			logrus.Debugf("Template file `%s` already exists in `%s`", template.name, file)
 			continue
 		}
-		err = os.WriteFile(file, []byte(content), 0644)
+		err = os.WriteFile(file, template.content, 0644)
 		if err != nil {
-			return errors.Wrapf(err, "failed to write template file: %s", name)
+			return errors.Wrapf(err, "failed to write template file: %s", template.name)
 		}
-		logrus.Debugf("Template file `%s` is added to `%s`", name, file)
+		logrus.Debugf("Template file `%s` is added to `%s`", template.name, file)
 	}
 
 	return nil

{envd-1.1.0 → envd-1.2.0}/pkg/lang/ir/v1/compile.go

@@ -162,7 +162,7 @@ func (g *generalGraph) Compile(ctx context.Context, envPath string, pub string,
 
 func (g generalGraph) GetEnviron() []string {
 	return append(g.EnvString(),
-		"LC_ALL=en_US.UTF-8",
+		"LC_ALL=C.UTF-8",
 		"LANG=C.UTF-8",
 	)
 }

{envd-1.1.0 → envd-1.2.0}/pkg/lang/ir/v1/conda.go

@@ -29,7 +29,7 @@ import (
 
 const (
 	builderImage        = "curlimages/curl:8.11.1"
-	condaVersionDefault = "py311_24.11.1-0"
+	condaVersionDefault = "py311_25.1.1-2"
 	microMambaImage     = "mambaorg/micromamba:2.0.6"
 	condaRootPrefix     = "/opt/conda"
 	condaBinDir         = "/opt/conda/bin"

{envd-1.1.0 → envd-1.2.0}/pkg/lang/ir/v1/get_conda.sh

@@ -2,13 +2,13 @@ set -euo pipefail && \
 UNAME_M="$(uname -m)" && \
 if [ "${UNAME_M}" = "x86_64" ]; then \
 	MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh"; \
-	SHA256SUM="807774bae6cd87132094458217ebf713df436f64779faf9bb4c3d4b6615c1e3a"; \
+	SHA256SUM="d8c1645776c0758214e4191c605abe5878002051316bd423f2b14b22d6cb4251"; \
 elif [ "${UNAME_M}" = "s390x" ]; then \
 	MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-s390x.sh"; \
-	SHA256SUM="bb499b18dbcbb2d89b22f91fe26fe661f5ed1f1944fdc743560d69cd52a2468f"; \
+	SHA256SUM="0b4d5a3f16dcb2d230ba5dfdfdb848c854006aab6dd1bd3dbf29fcddf04b07a4"; \
 elif [ "${UNAME_M}" = "aarch64" ]; then \
 	MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-aarch64.sh"; \
-	SHA256SUM="a8846ade7a5ddd9b6a6546590054d70d1c2cbe4fbe8c79fb70227e8fd93ef9f8"; \
+	SHA256SUM="8a1d4407fce7ec552ac6ed655ce93d83549e02b819cacefbb7f640f9051e638b"; \
 fi && \
 wget "${MINICONDA_URL}" -O /tmp/miniconda.sh && \
 echo "${SHA256SUM}  /tmp/miniconda.sh" > /tmp/shasum && \

{envd-1.1.0 → envd-1.2.0}/pkg/lang/ir/v1/shell.go

@@ -15,6 +15,8 @@
 package v1
 
 import (
+	"fmt"
+
 	"github.com/cockroachdb/errors"
 	"github.com/moby/buildkit/client/llb"
 
@@ -54,7 +56,8 @@ renamed = "r"
 deleted = "x"
 `
 
-	fishVersion = "4.0b1"
+	fishVersion  = "4.0.1"
+	fishAssetURL = "https://github.com/fish-shell/fish-shell/releases/download/%[1]s/fish-static-$(uname -m)-%[1]s.tar.xz"
 )
 
 func (g *generalGraph) compileShell(root llb.State) (_ llb.State, err error) {
@@ -142,14 +145,15 @@ func (g generalGraph) compileZSH(root llb.State) (llb.State, error) {
 
 func (g generalGraph) compileFish(root llb.State) llb.State {
 	base := llb.Image(builderImage)
+	url := fmt.Sprintf(fishAssetURL, fishVersion)
 	builder := base.Run(
-		llb.Shlexf(`sh -c "wget -qO- https://github.com/fish-shell/fish-shell/releases/download/%s/fish-static-linux-$(uname -m).tar.xz | tar -xJf - -C /tmp || exit 1"`, fishVersion),
+		llb.Shlexf(`sh -c "wget -qO- %s | tar -xJf - -C /tmp || exit 1"`, url),
 		llb.WithCustomName("[internal] download fish shell"),
 	).Root()
 	root = root.File(
 		llb.Copy(builder, "/tmp/fish", "/usr/bin/fish"),
 		llb.WithCustomName("[internal] copy fish shell from the builder image")).
-		Run(llb.Shlex("fish --install"),
+		Run(llb.Shlex(`sh -c "echo yes | fish --install"`),
 			llb.WithCustomName("[internal] install fish shell")).Root()
 
 	return root

{envd-1.1.0 → envd-1.2.0}/pkg/lang/ir/v1/system.go

@@ -226,8 +226,6 @@ func (g *generalGraph) compileDevPackages(root llb.State) llb.State {
 	sb.WriteString("apt-get install -y --no-install-recommends --no-install-suggests --fix-missing ")
 	sb.WriteString(strings.Join(types.BaseAptPackage, " "))
 	sb.WriteString("&& rm -rf /var/lib/apt/lists/* ")
-	// shell prompt
-	sb.WriteString("&& locale-gen en_US.UTF-8")
 
 	run := root.Run(llb.Shlexf(`bash -c "%s"`, sb.String()),
 		llb.WithCustomName("[internal] install built-in packages"))

{envd-1.1.0 → envd-1.2.0}/pkg/types/envd.go

@@ -55,8 +55,8 @@ var BaseEnvironment = []struct {
 }{
 	{"DEBIAN_FRONTEND", "noninteractive"},
 	{"PATH", DefaultSystemPath},
-	{"LANG", "en_US.UTF-8"},
-	{"LC_ALL", "en_US.UTF-8"},
+	{"LANG", "C.UTF-8"},
+	{"LC_ALL", "C.UTF-8"},
 }
 var BaseAptPackage = []string{
 	"bash-static",

envd-1.1.0/.GIT_TAG_INFO

@@ -1 +0,0 @@
-v1.1.0