Merge pull request #938 from carolynvs/use-semver-PR

Use fork of Masterminds/semver until PR is merged
golang · Aug 8, 2017 · 843f6f2 · 843f6f2
2 parents b8ecfaa + 0cbbebd
commit 843f6f2
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 8 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -1,6 +1,7 @@
 [[constraint]]
-  branch = "2.x"
+  branch = "parse-constraints-with-dash-in-pre"
   name = "github.com/Masterminds/semver"
+  source = "https://github.com/carolynvs/semver.git"
 
 [[constraint]]
   name = "github.com/Masterminds/vcs"

diff --git a/cmd/dep/godep_importer_test.go b/cmd/dep/godep_importer_test.go
@@ -192,8 +192,8 @@ func TestGodepConfig_ConvertProject_WithSemverSuffix(t *testing.T) {
 	}
 
 	v := d.Constraint.String()
-	if v != ">=1.12.0, <=12.0.0-g2fd980e" {
-		t.Fatalf("Expected manifest constraint to be >=1.12.0, <=12.0.0-g2fd980e, got %s", v)
+	if v != "^1.12.0-12-g2fd980e" {
+		t.Fatalf("Expected manifest constraint to be ^1.12.0-12-g2fd980e, got %s", v)
 	}
 
 	p := lock.P[0]

diff --git a/vendor/github.com/Masterminds/semver/constraints.go b/vendor/github.com/Masterminds/semver/constraints.go
diff --git a/vendor/github.com/Masterminds/semver/constraints_test.go b/vendor/github.com/Masterminds/semver/constraints_test.go
diff --git a/vendor/github.com/Masterminds/semver/parse.go b/vendor/github.com/Masterminds/semver/parse.go