Skip to content

Commit

Permalink
change import paths to forked yaml libs
Browse files Browse the repository at this point in the history
  • Loading branch information
natasha41575 committed Oct 23, 2023
1 parent b96582b commit 70ebea7
Show file tree
Hide file tree
Showing 16 changed files with 13 additions and 25 deletions.
2 changes: 1 addition & 1 deletion bench_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"testing"

"gopkg.in/yaml.v2"
"sigs.k8s.io/yaml/goyaml.v2"
)

func newBenchmarkObject() interface{} {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ go 1.12

require (
github.com/google/go-cmp v0.5.9
gopkg.in/yaml.v2 v2.4.0
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405
)
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
2 changes: 1 addition & 1 deletion goyaml.v2/decode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

. "gopkg.in/check.v1"
"gopkg.in/yaml.v2"
"sigs.k8s.io/yaml/goyaml.v2"
)

var unmarshalIntTest = 123
Expand Down
2 changes: 1 addition & 1 deletion goyaml.v2/encode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"os"

. "gopkg.in/check.v1"
"gopkg.in/yaml.v2"
"sigs.k8s.io/yaml/goyaml.v2"
)

type jsonNumberT string
Expand Down
2 changes: 1 addition & 1 deletion goyaml.v2/example_embedded_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

"gopkg.in/yaml.v2"
"sigs.k8s.io/yaml/goyaml.v2"
)

// An example showing how to unmarshal embedded
Expand Down
5 changes: 0 additions & 5 deletions goyaml.v2/go.mod

This file was deleted.

2 changes: 1 addition & 1 deletion goyaml.v2/limit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

. "gopkg.in/check.v1"
"gopkg.in/yaml.v2"
"sigs.k8s.io/yaml/goyaml.v2"
)

var limitTests = []struct {
Expand Down
2 changes: 1 addition & 1 deletion goyaml.v3/decode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"time"

. "gopkg.in/check.v1"
"gopkg.in/yaml.v3"
"sigs.k8s.io/yaml/goyaml.v3"
)

var unmarshalIntTest = 123
Expand Down
2 changes: 1 addition & 1 deletion goyaml.v3/encode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"os"

. "gopkg.in/check.v1"
"gopkg.in/yaml.v3"
"sigs.k8s.io/yaml/goyaml.v3"
)

var marshalIntTest = 123
Expand Down
2 changes: 1 addition & 1 deletion goyaml.v3/example_embedded_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"
"log"

"gopkg.in/yaml.v3"
"sigs.k8s.io/yaml/goyaml.v3"
)

// An example showing how to unmarshal embedded
Expand Down
5 changes: 0 additions & 5 deletions goyaml.v3/go.mod

This file was deleted.

2 changes: 1 addition & 1 deletion goyaml.v3/limit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

. "gopkg.in/check.v1"
"gopkg.in/yaml.v3"
"sigs.k8s.io/yaml/goyaml.v3"
)

var limitTests = []struct {
Expand Down
2 changes: 1 addition & 1 deletion goyaml.v3/node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"os"

. "gopkg.in/check.v1"
"gopkg.in/yaml.v3"
"io"
"sigs.k8s.io/yaml/goyaml.v3"
"strings"
)

Expand Down
2 changes: 1 addition & 1 deletion yaml.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"reflect"
"strconv"

"gopkg.in/yaml.v2"
"sigs.k8s.io/yaml/goyaml.v2"
)

// Marshal marshals obj into JSON using stdlib json.Marshal, and then converts JSON to YAML using JSONToYAML (see that method for more reference)
Expand Down
2 changes: 1 addition & 1 deletion yaml_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
yaml "gopkg.in/yaml.v2"
yaml "sigs.k8s.io/yaml/goyaml.v2"
)

/* Test helper functions */
Expand Down

0 comments on commit 70ebea7

Please sign in to comment.