Merge pull request #15 from kcl-lang/update-go-deps

chore: update kcl go deps and CI tests
kcl-lang · Aug 23, 2024 · d2cae9a · d2cae9a
2 parents c2daad6 + ce66f15
commit d2cae9a
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 222 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,25 @@
+name: build-and-test-linux
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - "releases/*"
+jobs:
+  build-and-test:
+    # Ref: https://github.com/actions/runner-images/tree/main/images/macos
+    strategy:
+      matrix:
+        os: [ macos-12, macos-14, ubuntu-latest ]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Git checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.22
+
+      - name: go test
+        run: go test ./...
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,6 @@ __pycache__
 __kclcache__/
 build-result/
 dist/
-kclvm.egg-info/
 .eggs/
 
 # Mac OS X files

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.6.0
+0.9.0
diff --git a/a_embed.go b/a_embed.go
@@ -1,6 +1,6 @@
-// Copyright 2021 The KCL Authors. All rights reserved.
+// Copyright The KCL Authors. All rights reserved.
 
-// kclvm plugins.
+// kcl plugins.
 package kcl_plugin
 
 import (
@@ -13,7 +13,6 @@ import (
 
 //go:embed README.md
 //go:embed hello
-//go:embed project_context
 //go:embed http
 var PluginFS embed.FS
 

diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ go 1.22
 
 require (
 	github.com/valyala/fasthttp v1.55.0
-	kcl-lang.io/kcl-go v0.9.3
+	kcl-lang.io/kcl-go v0.10.0-beta.2
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -6,5 +6,5 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasthttp v1.55.0 h1:Zkefzgt6a7+bVKHnu/YaYSOPfNYNisSVBo/unVCf8k8=
 github.com/valyala/fasthttp v1.55.0/go.mod h1:NkY9JtkrpPKmgwV3HTaS2HWaJss9RSIsRVfcxxoHiOM=
-kcl-lang.io/kcl-go v0.9.3 h1:zqWgE6SSdoD7VHhapOAmmDCrtqyeBvdOcCeqUfT6eu8=
-kcl-lang.io/kcl-go v0.9.3/go.mod h1:X30Qh5/jryvnGanaXGRjsuy/dnj211vPHXpfy7AEspw=
+kcl-lang.io/kcl-go v0.10.0-beta.2 h1:MFARFYmDwjMhx1MZtJffMHrgPvHpEvyZivCPd6RrfFI=
+kcl-lang.io/kcl-go v0.10.0-beta.2/go.mod h1:I8UMn+qt/yTxwzvz85ku9mil7xwHoOjTpMYgK+9IcAg=
diff --git a/hello/plugin_test.py → hello/hello.py b/hello/plugin_test.py → hello/hello.py
@@ -1,4 +1,4 @@
-# Copyright 2020 The KCL Authors. All rights reserved.
+# Copyright The KCL Authors. All rights reserved.
 
 # python3 -m pytest
 

diff --git a/hello/plugin.py b/hello/plugin.py
@@ -1,4 +1,4 @@
-# Copyright 2020 The KCL Authors. All rights reserved.
+# Copyright The KCL Authors. All rights reserved.
 
 INFO = {
     'name': 'hello',

diff --git a/http/api.go b/http/api.go
@@ -30,7 +30,7 @@ func init() {
 						return nil, err
 					}
 					return &plugin.MethodResult{V: map[string]any{
-						"status": status,
+						"status": int(status),
 						"body":   string(body),
 					}}, nil
 				},

diff --git a/http/api_test.go b/http/api_test.go
@@ -14,7 +14,7 @@ func TestHttpGet(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if data["status"] == 200 {
-		t.Fatal(resultJson)
+	if int(data["status"].(float64)) != 200 {
+		t.Fatal(data["status"])
 	}
 }
diff --git a/http/http_test.py b/http/http_test.py
@@ -0,0 +1,8 @@
+# Copyright The KCL Authors. All rights reserved.
+
+# python3 -m pytest
+
+import plugin
+
+def test_http_get():
+    assert plugin.get("https://www.kcl-lang.io/")["status"] == 200
diff --git a/http/plugin.py b/http/plugin.py
@@ -0,0 +1,9 @@
+import requests
+
+
+def get(url: str):
+    resp = requests.get(url)
+    return {
+        "status": resp.status_code,
+        "body": str(resp.content),
+    }
diff --git a/project_context/api.md b/project_context/api.md
diff --git a/project_context/plugin.py b/project_context/plugin.py
diff --git a/project_context/plugin_test.py b/project_context/plugin_test.py
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,2 @@
+ruamel.yaml
+requests