Skip to content

Commit 3d4fd11

Browse files
authored
Update to use internal testify submodule (jmespath#57)
Updates go-jmespath to use the internal testify submodule to in order to modify the yaml.v2 version transient dependency of testify. A version of testify that is updated with the yaml.v2 is not compatible with Go 1.12 and older
1 parent ff168ca commit 3d4fd11

File tree

9 files changed

+11
-14
lines changed

9 files changed

+11
-14
lines changed

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ help:
1313
generate:
1414
go generate ${SRC_PKGS}
1515

16-
get-deps:
17-
go get -v -t ./ ./cmd/... ./compliance/... ./fuzz/...
18-
1916
build:
2017
rm -f $(CMD)
2118
go build ${SRC_PKGS}

api_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/json"
55
"testing"
66

7-
"github.com/stretchr/testify/assert"
7+
"github.com/jmespath/go-jmespath/internal/testify/assert"
88
)
99

1010
func TestValidUncompiledExpressionSearches(t *testing.T) {

compliance_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"path/filepath"
99
"testing"
1010

11-
"github.com/stretchr/testify/assert"
11+
"github.com/jmespath/go-jmespath/internal/testify/assert"
1212
)
1313

1414
type TestSuite struct {

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module github.com/jmespath/go-jmespath
22

33
go 1.14
44

5-
require github.com/stretchr/testify v1.5.1
5+
require github.com/jmespath/go-jmespath/internal/testify v1.5.1

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
22
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3+
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
4+
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
35
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
46
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
57
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
6-
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
7-
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
88
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
99
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
10-
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
11-
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
10+
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
11+
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

interpreter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/json"
55
"testing"
66

7-
"github.com/stretchr/testify/assert"
7+
"github.com/jmespath/go-jmespath/internal/testify/assert"
88
)
99

1010
type scalars struct {

lexer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/stretchr/testify/assert"
7+
"github.com/jmespath/go-jmespath/internal/testify/assert"
88
)
99

1010
var lexingTests = []struct {

parser_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/stretchr/testify/assert"
7+
"github.com/jmespath/go-jmespath/internal/testify/assert"
88
)
99

1010
var parsingErrorTests = []struct {

util_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package jmespath
33
import (
44
"testing"
55

6-
"github.com/stretchr/testify/assert"
6+
"github.com/jmespath/go-jmespath/internal/testify/assert"
77
)
88

99
func TestSlicePositiveStep(t *testing.T) {

0 commit comments

Comments
 (0)