Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

Commit 9fa29c2

Browse files
sdboyersdboyer
authored
Merge pull request #579 from xmattstrongx/update_mastermind_semver
Update mastermind semver
2 parents 2879206 + f479250 commit 9fa29c2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+498
-214
lines changed

‎Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
[[dependencies]]
33
name = "github.com/sdboyer/deptest"
4-
version = ">=0.8.0, <1.0.0"
4+
version = "^0.8.0"

‎cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
[[dependencies]]
33
name = "github.com/sdboyer/deptest"
4-
version = ">=0.8.0, <1.0.0"
4+
version = "^0.8.0"
55

66
[[dependencies]]
77
name = "github.com/sdboyer/deptestdos"

‎cmd/dep/testdata/harness_tests/remove/force/case1/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/dep/testdata/harness_tests/remove/force/case1/final/Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[[dependencies]]
66
name = "github.com/sdboyer/deptest"
7-
version = ">=0.8.0, <1.0.0"
7+
version = "^0.8.0"
88

99
[[dependencies]]
1010
name = "github.com/sdboyer/deptestdos"

‎cmd/dep/testdata/harness_tests/remove/force/case1/initial/Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[[dependencies]]
66
name = "github.com/sdboyer/deptest"
7-
version = ">=0.8.0, <1.0.0"
7+
version = "^0.8.0"
88

99
[[dependencies]]
1010
name = "github.com/sdboyer/deptestdos"

‎cmd/dep/testdata/harness_tests/remove/specific/case1/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/dep/testdata/harness_tests/remove/specific/case1/final/Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[[dependencies]]
66
name = "github.com/sdboyer/deptest"
7-
version = ">=0.8.0, <1.0.0"
7+
version = "^0.8.0"
88

99
[[dependencies]]
1010
name = "github.com/sdboyer/deptestdos"

‎cmd/dep/testdata/harness_tests/remove/specific/case1/initial/Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[[dependencies]]
66
name = "github.com/sdboyer/deptest"
7-
version = ">=0.8.0, <1.0.0"
7+
version = "^0.8.0"
88

99
[[dependencies]]
1010
name = "github.com/sdboyer/deptestdos"

‎cmd/dep/testdata/harness_tests/remove/specific/case2/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/dep/testdata/harness_tests/remove/specific/case2/final/Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[[dependencies]]
66
name = "github.com/sdboyer/deptest"
7-
version = ">=0.8.0, <1.0.0"
7+
version = "^0.8.0"
88

99
[[dependencies]]
1010
name = "github.com/sdboyer/deptestdos"

‎cmd/dep/testdata/harness_tests/remove/specific/case2/initial/Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[[dependencies]]
66
name = "github.com/sdboyer/deptest"
7-
version = ">=0.8.0, <1.0.0"
7+
version = "^0.8.0"
88

99
[[dependencies]]
1010
name = "github.com/sdboyer/deptestdos"

‎cmd/dep/testdata/harness_tests/remove/unused/case1/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/dep/testdata/harness_tests/remove/unused/case1/final/Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[[dependencies]]
66
name = "github.com/sdboyer/deptest"
7-
version = ">=0.8.0, <1.0.0"
7+
version = "^0.8.0"
88

99
[[dependencies]]
1010
name = "github.com/sdboyer/deptestdos"

‎cmd/dep/testdata/harness_tests/remove/unused/case1/initial/Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[[dependencies]]
66
name = "github.com/sdboyer/deptest"
7-
version = ">=0.8.0, <1.0.0"
7+
version = "^0.8.0"
88

99
[[dependencies]]
1010
name = "github.com/sdboyer/deptestdos"

‎cmd/dep/testdata/harness_tests/status/case1/dot/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/dep/testdata/harness_tests/status/case1/json/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/dep/testdata/harness_tests/status/case1/table/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/dep/testdata/harness_tests/status/case1/table/stdout.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
PROJECT CONSTRAINT VERSION REVISION LATEST PKGS USED
2-
github.com/sdboyer/deptest >=0.8.0, <1.0.0 v0.8.0 ff2948a 3f4c3be 1
3-
github.com/sdboyer/deptestdos * v2.0.0 5c60720 5c60720 1
1+
PROJECT CONSTRAINT VERSION REVISION LATEST PKGS USED
2+
github.com/sdboyer/deptest ^0.8.0 v0.8.0 ff2948a 3f4c3be 1
3+
github.com/sdboyer/deptestdos * v2.0.0 5c60720 5c60720 1

‎internal/gps/constraints.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func NewSemverConstraint(body string) (Constraint, error) {
5858
}
5959
// If we got a simple semver.Version, simplify by returning our
6060
// corresponding type
61-
if sv, ok := c.(*semver.Version); ok {
61+
if sv, ok := c.(semver.Version); ok {
6262
return semVersion{sv: sv}, nil
6363
}
6464
return semverConstraint{c: c}, nil

‎internal/gps/manager_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func (a naiveAnalyzer) Info() (name string, version int) {
3535
return "naive-analyzer", 1
3636
}
3737

38-
func sv(s string) *semver.Version {
38+
func sv(s string) semver.Version {
3939
sv, err := semver.NewVersion(s)
4040
if err != nil {
4141
panic(fmt.Sprintf("Error creating semver from %q: %s", s, err))

‎internal/gps/solve_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ func fixtureSolveSimpleChecks(fix specfix, soln Solution, err error, t *testing.
204204
if err != nil {
205205
if fixfail == nil {
206206
t.Errorf("Solve failed unexpectedly:\n%s", err)
207-
} else if !reflect.DeepEqual(fixfail, err) {
207+
} else if !(fixfail.Error() == err.Error()) {
208208
// TODO(sdboyer) reflect.DeepEqual works for now, but once we start
209209
// modeling more complex cases, this should probably become more robust
210210
t.Errorf("Failure mismatch:\n\t(GOT): %s\n\t(WNT): %s", err, fixfail)

‎internal/gps/vcs_source.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ func (s *gopkginSource) listVersions(ctx context.Context) ([]PairedVersion, erro
291291
vlist := make([]PairedVersion, len(ovlist))
292292
k := 0
293293
var dbranch int // index of branch to be marked default
294-
var bsv *semver.Version
294+
var bsv semver.Version
295295
for _, v := range ovlist {
296296
// all git versions will always be paired
297297
pv := v.(versionPair)
@@ -318,7 +318,7 @@ func (s *gopkginSource) listVersions(ctx context.Context) ([]PairedVersion, erro
318318
// which one to mark as default until we've seen them all
319319
tv.isDefault = false
320320
// Figure out if this is the current leader for default branch
321-
if bsv == nil || bsv.LessThan(sv) {
321+
if bsv == (semver.Version{}) || bsv.LessThan(sv) {
322322
bsv = sv
323323
dbranch = k
324324
}
@@ -331,7 +331,7 @@ func (s *gopkginSource) listVersions(ctx context.Context) ([]PairedVersion, erro
331331
}
332332

333333
vlist = vlist[:k]
334-
if bsv != nil {
334+
if bsv != (semver.Version{}) {
335335
dbv := vlist[dbranch].(versionPair)
336336
vlist[dbranch] = branchVersion{
337337
name: dbv.v.(branchVersion).name,

‎internal/gps/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ func (v plainVersion) Is(r Revision) PairedVersion {
344344
}
345345

346346
type semVersion struct {
347-
sv *semver.Version
347+
sv semver.Version
348348
}
349349

350350
func (v semVersion) String() string {

‎manifest_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestWriteManifest(t *testing.T) {
6161

6262
golden := "manifest/golden.toml"
6363
want := h.GetTestFileString(golden)
64-
c, _ := gps.NewSemverConstraint("^v0.12.0")
64+
c, _ := gps.NewSemverConstraint(">=0.12.0, <1.0.0")
6565
m := &Manifest{
6666
Dependencies: map[gps.ProjectRoot]gps.ProjectProperties{
6767
gps.ProjectRoot("github.com/golang/dep/internal/gps"): {

‎vendor/github.com/Masterminds/semver/.travis.yml

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Masterminds/semver/collection.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Masterminds/semver/collection_test.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Masterminds/semver/constraints.go

Lines changed: 35 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)