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

Update mastermind semver #579

Merged
merged 5 commits into from
May 18, 2017
Merged

Update mastermind semver #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e644239
Updating mastermind semver
xmattstrongx May 14, 2017
c871d11
fixing first test. Still working on integration tests for gps
xmattstrongx May 14, 2017
6b60e63
Removing broken deepequal check
xmattstrongx May 14, 2017
e069f16
Got integration tests green by modified test data. Still trying to ve…
xmattstrongx May 14, 2017
f479250
Merge branch 'master' into update_mastermind_semver
sdboyer May 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

[[dependencies]]
name = "github.com/sdboyer/deptest"
version = ">=0.8.0, <1.0.0"
version = "^0.8.0"
2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

[[dependencies]]
name = "github.com/sdboyer/deptest"
version = ">=0.8.0, <1.0.0"
version = "^0.8.0"

[[dependencies]]
name = "github.com/sdboyer/deptestdos"
Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/remove/force/case1/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/remove/force/case1/final/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[[dependencies]]
name = "github.com/sdboyer/deptest"
version = ">=0.8.0, <1.0.0"
version = "^0.8.0"

[[dependencies]]
name = "github.com/sdboyer/deptestdos"
Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/remove/force/case1/initial/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[[dependencies]]
name = "github.com/sdboyer/deptest"
version = ">=0.8.0, <1.0.0"
version = "^0.8.0"

[[dependencies]]
name = "github.com/sdboyer/deptestdos"
Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/remove/specific/case1/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/remove/specific/case1/final/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[[dependencies]]
name = "github.com/sdboyer/deptest"
version = ">=0.8.0, <1.0.0"
version = "^0.8.0"

[[dependencies]]
name = "github.com/sdboyer/deptestdos"
Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/remove/specific/case1/initial/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[[dependencies]]
name = "github.com/sdboyer/deptest"
version = ">=0.8.0, <1.0.0"
version = "^0.8.0"

[[dependencies]]
name = "github.com/sdboyer/deptestdos"
Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/remove/specific/case2/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/remove/specific/case2/final/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[[dependencies]]
name = "github.com/sdboyer/deptest"
version = ">=0.8.0, <1.0.0"
version = "^0.8.0"

[[dependencies]]
name = "github.com/sdboyer/deptestdos"
Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/remove/specific/case2/initial/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[[dependencies]]
name = "github.com/sdboyer/deptest"
version = ">=0.8.0, <1.0.0"
version = "^0.8.0"

[[dependencies]]
name = "github.com/sdboyer/deptestdos"
Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/remove/unused/case1/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/remove/unused/case1/final/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[[dependencies]]
name = "github.com/sdboyer/deptest"
version = ">=0.8.0, <1.0.0"
version = "^0.8.0"

[[dependencies]]
name = "github.com/sdboyer/deptestdos"
Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/remove/unused/case1/initial/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[[dependencies]]
name = "github.com/sdboyer/deptest"
version = ">=0.8.0, <1.0.0"
version = "^0.8.0"

[[dependencies]]
name = "github.com/sdboyer/deptestdos"
Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/status/case1/dot/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/status/case1/json/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/status/case1/table/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions cmd/dep/testdata/harness_tests/status/case1/table/stdout.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
PROJECT CONSTRAINT VERSION REVISION LATEST PKGS USED
github.com/sdboyer/deptest >=0.8.0, <1.0.0 v0.8.0 ff2948a 3f4c3be 1
github.com/sdboyer/deptestdos * v2.0.0 5c60720 5c60720 1
PROJECT CONSTRAINT VERSION REVISION LATEST PKGS USED
github.com/sdboyer/deptest ^0.8.0 v0.8.0 ff2948a 3f4c3be 1
github.com/sdboyer/deptestdos * v2.0.0 5c60720 5c60720 1
2 changes: 1 addition & 1 deletion internal/gps/constraints.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func NewSemverConstraint(body string) (Constraint, error) {
}
// If we got a simple semver.Version, simplify by returning our
// corresponding type
if sv, ok := c.(*semver.Version); ok {
if sv, ok := c.(semver.Version); ok {
return semVersion{sv: sv}, nil
}
return semverConstraint{c: c}, nil
Expand Down
2 changes: 1 addition & 1 deletion internal/gps/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func (a naiveAnalyzer) Info() (name string, version int) {
return "naive-analyzer", 1
}

func sv(s string) *semver.Version {
func sv(s string) semver.Version {
sv, err := semver.NewVersion(s)
if err != nil {
panic(fmt.Sprintf("Error creating semver from %q: %s", s, err))
Expand Down
2 changes: 1 addition & 1 deletion internal/gps/solve_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ func fixtureSolveSimpleChecks(fix specfix, soln Solution, err error, t *testing.
if err != nil {
if fixfail == nil {
t.Errorf("Solve failed unexpectedly:\n%s", err)
} else if !reflect.DeepEqual(fixfail, err) {
} else if !(fixfail.Error() == err.Error()) {
// TODO(sdboyer) reflect.DeepEqual works for now, but once we start
// modeling more complex cases, this should probably become more robust
t.Errorf("Failure mismatch:\n\t(GOT): %s\n\t(WNT): %s", err, fixfail)
Expand Down
6 changes: 3 additions & 3 deletions internal/gps/vcs_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ func (s *gopkginSource) listVersions(ctx context.Context) ([]PairedVersion, erro
vlist := make([]PairedVersion, len(ovlist))
k := 0
var dbranch int // index of branch to be marked default
var bsv *semver.Version
var bsv semver.Version
for _, v := range ovlist {
// all git versions will always be paired
pv := v.(versionPair)
Expand All @@ -318,7 +318,7 @@ func (s *gopkginSource) listVersions(ctx context.Context) ([]PairedVersion, erro
// which one to mark as default until we've seen them all
tv.isDefault = false
// Figure out if this is the current leader for default branch
if bsv == nil || bsv.LessThan(sv) {
if bsv == (semver.Version{}) || bsv.LessThan(sv) {
bsv = sv
dbranch = k
}
Expand All @@ -331,7 +331,7 @@ func (s *gopkginSource) listVersions(ctx context.Context) ([]PairedVersion, erro
}

vlist = vlist[:k]
if bsv != nil {
if bsv != (semver.Version{}) {
dbv := vlist[dbranch].(versionPair)
vlist[dbranch] = branchVersion{
name: dbv.v.(branchVersion).name,
Expand Down
2 changes: 1 addition & 1 deletion internal/gps/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ func (v plainVersion) Is(r Revision) PairedVersion {
}

type semVersion struct {
sv *semver.Version
sv semver.Version
}

func (v semVersion) String() string {
Expand Down
2 changes: 1 addition & 1 deletion manifest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func TestWriteManifest(t *testing.T) {

golden := "manifest/golden.toml"
want := h.GetTestFileString(golden)
c, _ := gps.NewSemverConstraint("^v0.12.0")
c, _ := gps.NewSemverConstraint(">=0.12.0, <1.0.0")
m := &Manifest{
Dependencies: map[gps.ProjectRoot]gps.ProjectProperties{
gps.ProjectRoot("github.com/golang/dep/internal/gps"): {
Expand Down
5 changes: 2 additions & 3 deletions vendor/github.com/Masterminds/semver/.travis.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/Masterminds/semver/collection.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/Masterminds/semver/collection_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 35 additions & 15 deletions vendor/github.com/Masterminds/semver/constraints.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading