Skip to content

Commit 63bc934

Browse files
authored
Merge pull request #69 from lafriks/feat/spdx_3_8
Update SPDX to version 3.8
2 parents 4f5dc53 + 9f9e9ef commit 63bc934

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
GOPATH ?= $(shell go env GOPATH)
2-
SPDX_DATA_VERSION ?= 3.0
2+
SPDX_DATA_VERSION ?= 3.8
33

44
licensedb/internal/assets/bindata.go: licenses.tar urls.csv names.csv $(GOPATH)/bin/go-bindata
55
rm -rf license-list-data-$(SPDX_DATA_VERSION)

cmd/license-detector/main_test.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,21 @@ func TestCmdMain(t *testing.T) {
1717
assert.Len(t, r, 2)
1818
assert.Equal(t, "../..", r[0].Arg)
1919
assert.Equal(t, ".", r[1].Arg)
20-
assert.Len(t, r[0].Matches, 2)
20+
assert.Len(t, r[0].Matches, 4)
2121
assert.Len(t, r[1].Matches, 0)
2222
assert.Equal(t, "", r[0].ErrStr)
2323
assert.Equal(t, "no license file was found", r[1].ErrStr)
2424
assert.Equal(t, "Apache-2.0", r[0].Matches[0].License)
25-
assert.InDelta(t, 0.9846, r[0].Matches[0].Confidence, 0.001)
25+
assert.InDelta(t, 0.9877, r[0].Matches[0].Confidence, 0.001)
2626
assert.Equal(t, "ECL-2.0", r[0].Matches[1].License)
27-
assert.InDelta(t, 0.8995, r[0].Matches[1].Confidence, 0.001)
27+
assert.InDelta(t, 0.9047, r[0].Matches[1].Confidence, 0.001)
2828
buffer.Reset()
2929
detect([]string{"../..", "."}, "text", buffer)
3030
assert.Equal(t, `../..
31-
98% Apache-2.0
31+
99% Apache-2.0
3232
90% ECL-2.0
33+
85% SHL-0.51
34+
85% SHL-0.5
3335
.
3436
no license file was found
3537
`, buffer.String())

licensedb/internal/assets/bindata.go

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)