Skip to content

Commit 82503af

Browse files
elrayleelrayle
authored
Merge pull request #26 from github/elr/refactor-spdxexp
rename spdx package expression
2 parents 1cab0d6 + e0d36d1 commit 82503af

19 files changed

+29
-29
lines changed

Diff for: ‎CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
## Contributing
22

3-
[fork]: https://github.com/github/spdx-expression/fork
4-
[pr]: https://github.com/github/spdx-expression/compare
5-
[style]: https://github.com/github/spdx-expression/blob/main/.golangci.yaml
3+
[fork]: https://github.com/github/go-spdx
4+
[pr]: https://github.com/github/go-spdx/compare
5+
[style]: https://github.com/github/go-spdx/blob/main/.golangci.yaml
66
[code-of-conduct]: CODE_OF_CONDUCT.md
77

88
Hi there! We're thrilled that you'd like to contribute to this project. Your help is essential for keeping it great.

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# spdx-expression
1+
# go-spdx
22

33
Golang implementation of a checker for determining if a set of SPDX IDs satisfies an SPDX Expression.
44

Diff for: ‎SUPPORT.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
## How to file issues and get help
44

5-
This project uses GitHub [issues](https://github.com/github/spdx-expression/issues) to track bugs and feature requests. Please search the existing issues before filing new issues to avoid duplicates. If not found, file your bug or feaure request as a new issue.
5+
This project uses GitHub [issues](https://github.com/github/go-spdx/issues) to track bugs and feature requests. Please search the existing issues before filing new issues to avoid duplicates. If not found, file your bug or feaure request as a new issue.
66

7-
For help or questions about using this project, please see the project [Discussions](https://github.com/github/spdx-expression/discussions) where you can ask a question in [Q&A](https://github.com/github/spdx-expression/discussions/categories/q-a), propose an idea in [Ideas](https://github.com/github/spdx-expression/discussions/categories/ideas), or share your work in [Show and Tell](https://github.com/github/spdx-expression/discussions/categories/show-and-tell).
7+
For help or questions about using this project, please see the project [Discussions](https://github.com/github/go-spdx/discussions) where you can ask a question in [Q&A](https://github.com/github/go-spdx/discussions/categories/q-a), propose an idea in [Ideas](https://github.com/github/go-spdx/discussions/categories/ideas), or share your work in [Show and Tell](https://github.com/github/go-spdx/discussions/categories/show-and-tell).
88

9-
The spdx-expression package is under active development and maintained by GitHub staff. Community [contributions](./CONTRIBUTING.md) are always welcome. We will do our best to respond to issues, feature requests, and community questions in a timely manner.
9+
The go-spdx package is under active development and maintained by GitHub staff. Community [contributions](./CONTRIBUTING.md) are always welcome. We will do our best to respond to issues, feature requests, and community questions in a timely manner.
1010

1111
Support for this project is limited to the resources listed above.

Diff for: ‎spdxexp/compare.go renamed to ‎expression/compare.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package spdxexp
1+
package expression
22

33
func compareGT(first *node, second *node) bool {
44
if !first.isLicense() || !second.isLicense() {

Diff for: ‎spdxexp/compare_test.go renamed to ‎expression/compare_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package spdxexp
1+
package expression
22

33
import (
44
"testing"

Diff for: ‎expression/doc.go

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/*
2+
Expression package validates licenses and determines if a license expression is satisfied by a list of licenses.
3+
Validity of a license is determined by the [SPDX license list].
4+
5+
[SPDX license list]: https://spdx.org/licenses/
6+
*/
7+
package expression

Diff for: ‎spdxexp/license.go renamed to ‎expression/license.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package spdxexp
1+
package expression
22

33
import (
44
"strings"

Diff for: ‎spdxexp/license_test.go renamed to ‎expression/license_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package spdxexp
1+
package expression
22

33
import (
44
"testing"

Diff for: ‎spdxexp/node.go renamed to ‎expression/node.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package spdxexp
1+
package expression
22

33
import (
44
"sort"

Diff for: ‎spdxexp/node_test.go renamed to ‎expression/node_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package spdxexp
1+
package expression
22

33
import (
44
"testing"

Diff for: ‎spdxexp/parse.go renamed to ‎expression/parse.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package spdxexp
1+
package expression
22

33
import (
44
"errors"

Diff for: ‎spdxexp/parse_test.go renamed to ‎expression/parse_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package spdxexp
1+
package expression
22

33
import (
44
"errors"

Diff for: ‎spdxexp/satisfies.go renamed to ‎expression/satisfies.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package spdxexp
1+
package expression
22

33
import (
44
"errors"

Diff for: ‎spdxexp/satisfies_test.go renamed to ‎expression/satisfies_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package spdxexp
1+
package expression
22

33
import (
44
"errors"
@@ -31,7 +31,7 @@ func TestValidateLicenses(t *testing.T) {
3131

3232
// TestSatisfiesSingle lets you quickly test a single call to Satisfies with a specific license expression and allowed list of licenses.
3333
// To test a different expression, change the expression, allowed licenses, and expected result in the function body.
34-
// TO RUN: go test ./spdxexp -run TestSatisfiesSingle
34+
// TO RUN: go test ./expression -run TestSatisfiesSingle
3535
func TestSatisfiesSingle(t *testing.T) {
3636
// Update these to test a different expression.
3737
expression := "BSD-3-Clause AND GPL-2.0"

Diff for: ‎spdxexp/scan.go renamed to ‎expression/scan.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package spdxexp
1+
package expression
22

33
/* Translation to Go from javascript code: https://github.com/clearlydefined/spdx-expression-parse.js/blob/master/scan.js */
44

Diff for: ‎spdxexp/scan_test.go renamed to ‎expression/scan_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package spdxexp
1+
package expression
22

33
import (
44
"errors"

Diff for: ‎spdxexp/test_helper.go renamed to ‎expression/test_helper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package spdxexp
1+
package expression
22

33
// getLicenseNode is a test helper method that is expected to create a valid
44
// license node. Use this function when the test data is known to be a valid

Diff for: ‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/github/spdx-expression
1+
module github.com/github/go-spdx
22

33
go 1.18
44

Diff for: ‎spdxexp/doc.go

-7
This file was deleted.

0 commit comments

Comments
 (0)