Skip to content

update kcl.mod package.edition with the kcl compiler version #250

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pkg/client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func TestInitEmptyPkg(t *testing.T) {
assert.Equal(t, err, nil)
assert.Equal(t, testKclPkg.ModFile.Pkg.Name, "test_name")
assert.Equal(t, testKclPkg.ModFile.Pkg.Version, "0.0.1")
assert.Equal(t, testKclPkg.ModFile.Pkg.Edition, "0.0.1")
assert.Equal(t, testKclPkg.ModFile.Pkg.Edition, runner.GetKclVersion())
}

func TestUpdateKclModAndLock(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/test_data/expected/kcl.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test_add_deps"
edition = "0.0.1"
edition = "v0.7.0"
version = "0.0.1"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/test_data/expected/kcl.reverse.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test_add_deps"
edition = "0.0.1"
edition = "v0.7.0"
version = "0.0.1"

[dependencies]
Expand Down
3 changes: 2 additions & 1 deletion pkg/package/modfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"kcl-lang.io/kcl-go/pkg/kcl"
"kcl-lang.io/kpm/pkg/opt"
"kcl-lang.io/kpm/pkg/reporter"
"kcl-lang.io/kpm/pkg/runner"
"kcl-lang.io/kpm/pkg/settings"
"kcl-lang.io/kpm/pkg/utils"
)
Expand Down Expand Up @@ -315,7 +316,7 @@ func (mfile *ModFile) GetModLockFilePath() string {
}

const defaultVerion = "0.0.1"
const defaultEdition = "0.0.1"
var defaultEdition = runner.GetKclVersion()

func NewModFile(opts *opt.InitOptions) *ModFile {
return &ModFile{
Expand Down
3 changes: 2 additions & 1 deletion pkg/package/modfile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/stretchr/testify/assert"
"kcl-lang.io/kpm/pkg/opt"
"kcl-lang.io/kpm/pkg/runner"
"kcl-lang.io/kpm/pkg/utils"
)

Expand Down Expand Up @@ -81,7 +82,7 @@ func TestModFileExists(t *testing.T) {
}

NewModFile, err := LoadModFile(testDir)
if err != nil || NewModFile.Pkg.Name != "test_kcl_pkg" || NewModFile.Pkg.Version != "0.0.1" || NewModFile.Pkg.Edition != "0.0.1" {
if err != nil || NewModFile.Pkg.Name != "test_kcl_pkg" || NewModFile.Pkg.Version != "0.0.1" || NewModFile.Pkg.Edition != runner.GetKclVersion() {
t.Errorf("test 'LoadModFile' failed.")
}
}
Expand Down
3 changes: 2 additions & 1 deletion pkg/package/package_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"kcl-lang.io/kpm/pkg/env"
"kcl-lang.io/kpm/pkg/opt"
"kcl-lang.io/kpm/pkg/reporter"
"kcl-lang.io/kpm/pkg/runner"
"kcl-lang.io/kpm/pkg/utils"
)

Expand Down Expand Up @@ -47,7 +48,7 @@ func TestLoadKclPkg(t *testing.T) {
}
assert.Equal(t, kclPkg.ModFile.Pkg.Name, "test_name")
assert.Equal(t, kclPkg.ModFile.Pkg.Version, "0.0.1")
assert.Equal(t, kclPkg.ModFile.Pkg.Edition, "0.0.1")
assert.Equal(t, kclPkg.ModFile.Pkg.Edition, runner.GetKclVersion())
assert.Equal(t, len(kclPkg.ModFile.Dependencies.Deps), 0)
assert.Equal(t, len(kclPkg.Dependencies.Deps), 0)
}
Expand Down
6 changes: 6 additions & 0 deletions pkg/runner/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"

"kcl-lang.io/kcl-go/pkg/kcl"
"kcl-lang.io/kcl-go/scripts"
"kcl-lang.io/kpm/pkg/opt"
)

Expand Down Expand Up @@ -50,3 +51,8 @@ func (compiler *Compiler) AddDepPath(depName string, depPath string) *Compiler {
func (compiler *Compiler) Run() (*kcl.KCLResultList, error) {
return kcl.RunWithOpts(*compiler.opts.Option)
}

// GetKclVersion fetches the kcl version
func GetKclVersion() string {
return string(scripts.KclvmVersionType_latest)
}