From c6416e075777b27843c5acff90e4a516a53650e4 Mon Sep 17 00:00:00 2001 From: Will Charczuk Date: Mon, 11 Sep 2023 16:10:03 -0400 Subject: [PATCH] updates to ci, fixing busts in examples --- .circleci/config.yml | 14 ---------- .github/workflows/ci.yml | 33 ++++++++++++++++++++++++ examples/horizontal_stacked_bar/main.go | 6 ++--- examples/stacked_bar_labels/main.go | 6 ++--- go.mod | 2 +- go.sum | 34 +++++++++++++++++++++++-- value_formatter_test.go | 8 +++--- 7 files changed, 75 insertions(+), 28 deletions(-) delete mode 100644 .circleci/config.yml create mode 100644 .github/workflows/ci.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 007a11c..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: 2 -jobs: - build: - working_directory: /go/src/github.com/wcharczuk/go-chart - docker: - - image: circleci/golang:1.15 - steps: - - checkout - - run: - name: new-install - command: make new-install - - run: - name: Continuous Integration - command: make \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..b48761c --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,33 @@ +name: "Continuous Integration" + +on: + workflow_dispatch: + push: + branches: [ main ] + paths: [ "*.go" ] + pull_request: + branches: [ main ] + paths: [ "*.go" ] + +jobs: + ci: + name: "Tests" + runs-on: ubuntu-latest + + env: + GOOS: "linux" + GOARCH: "amd64" + GO111MODULE: "on" + CGO_ENABLED: "0" + + steps: + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: 1.21 + + - name: Check out go-incr + uses: actions/checkout@v3 + + - name: Run all tests + run: go test ./... diff --git a/examples/horizontal_stacked_bar/main.go b/examples/horizontal_stacked_bar/main.go index 5151524..f078d09 100644 --- a/examples/horizontal_stacked_bar/main.go +++ b/examples/horizontal_stacked_bar/main.go @@ -23,7 +23,7 @@ func main() { stackedBarChart := chart.StackedBarChart{ Title: "Quarterly Sales", - TitleStyle: chart.StyleShow(), + TitleStyle: chart.Shown(), Background: chart.Style{ Padding: chart.Box{ Top: 75, @@ -31,8 +31,8 @@ func main() { }, Width: 800, Height: 600, - XAxis: chart.StyleShow(), - YAxis: chart.StyleShow(), + XAxis: chart.Shown(), + YAxis: chart.Shown(), BarSpacing: 40, IsHorizontal: true, Bars: []chart.StackedBar{ diff --git a/examples/stacked_bar_labels/main.go b/examples/stacked_bar_labels/main.go index a62103f..314f1b4 100644 --- a/examples/stacked_bar_labels/main.go +++ b/examples/stacked_bar_labels/main.go @@ -23,7 +23,7 @@ func main() { stackedBarChart := chart.StackedBarChart{ Title: "Quarterly Sales", - TitleStyle: chart.StyleShow(), + TitleStyle: chart.Shown(), Background: chart.Style{ Padding: chart.Box{ Top: 100, @@ -31,8 +31,8 @@ func main() { }, Width: 810, Height: 500, - XAxis: chart.StyleShow(), - YAxis: chart.StyleShow(), + XAxis: chart.Shown(), + YAxis: chart.Shown(), BarSpacing: 50, Bars: []chart.StackedBar{ { diff --git a/go.mod b/go.mod index 3824b21..bcec18f 100644 --- a/go.mod +++ b/go.mod @@ -4,5 +4,5 @@ go 1.15 require ( github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 - golang.org/x/image v0.0.0-20200927104501-e162460cd6b5 + golang.org/x/image v0.12.0 ) diff --git a/go.sum b/go.sum index 066121a..9bcd006 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,35 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -golang.org/x/image v0.0.0-20200927104501-e162460cd6b5 h1:QelT11PB4FXiDEXucrfNckHoFxwt8USGY1ajP1ZF5lM= -golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/image v0.12.0 h1:w13vZbU4o5rKOFFR8y7M+c4A5jXDC0uXTdHYRP8X2DQ= +golang.org/x/image v0.12.0/go.mod h1:Lu90jvHG7GfemOIcldsh9A2hS01ocl6oNO7ype5mEnk= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/value_formatter_test.go b/value_formatter_test.go index 86e0301..5ef94a8 100644 --- a/value_formatter_test.go +++ b/value_formatter_test.go @@ -4,7 +4,6 @@ import ( "testing" "time" - "github.com/blend/go-sdk/assert" "github.com/wcharczuk/go-chart/v2/testutil" ) @@ -59,8 +58,7 @@ func TestFloatValueFormatterWithFormat(t *testing.T) { } func TestExponentialValueFormatter(t *testing.T) { - assert := assert.New(t) - assert.Equal("1.23e+02", ExponentialValueFormatter(123.456)) - assert.Equal("1.24e+07", ExponentialValueFormatter(12421243.424)) - assert.Equal("4.50e-01", ExponentialValueFormatter(0.45)) + testutil.AssertEqual(t, "1.23e+02", ExponentialValueFormatter(123.456)) + testutil.AssertEqual(t, "1.24e+07", ExponentialValueFormatter(12421243.424)) + testutil.AssertEqual(t, "4.50e-01", ExponentialValueFormatter(0.45)) }