Merge pull request #1792 from carolynvs/bump-semver

Bump github.com/Masterminds/semver

CHANGELOG.md

@@ -14,6 +14,7 @@ IMPROVEMENTS:
 ([#1549](https://github.com/golang/dep/pull/1549)).
 * Reduce network access by trusting local source information and only pulling
 from upstream when necessary ([#1250](https://github.com/golang/dep/pull/1250)).
+* Update our dependency on Masterminds/semver to follow upstream again now that [Masterminds/semver#67](https://github.com/Masterminds/semver/pull/67) is merged([#1792](https://github.com/golang/dep/pull/1792)).
 
 WIP:
 * Enable importing external configuration from dependencies during init (#1277). This

Gopkg.lock

@@ -2,11 +2,10 @@
 
 
 [[projects]]
-  branch = "parse-constraints-with-dash-in-pre"
+  branch = "2.x"
   name = "github.com/Masterminds/semver"
   packages = ["."]
-  revision = "a93e51b5a57ef416dac8bb02d11407b6f55d8929"
+  revision = "24642bd0573145a5ee04f9be773641695289be46"
-  source = "https://github.com/carolynvs/semver.git"
 
 [[projects]]
   name = "github.com/Masterminds/vcs"
@@ -89,6 +88,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "215239f4e1109f268dd0eb48480c4987cd66da5deb9ae0b0da15b3cd35d02cd3"
+  inputs-digest = "460ad7112866da4b9a0a626aa3e2fe80699c17bf871afb73b93f836418fb9298"
   solver-name = "gps-cdcl"
   solver-version = 1

Gopkg.toml

@@ -1,8 +1,6 @@
-# https://github.com/Masterminds/semver/pull/60
 [[constraint]]
   name = "github.com/Masterminds/semver"
-  source = "https://github.com/carolynvs/semver.git"
+  branch = "2.x"
-  branch = "parse-constraints-with-dash-in-pre"
 
 [[constraint]]
   name = "github.com/Masterminds/vcs"

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

@@ -42,7 +42,7 @@ func init() {
 		cvRegex))
 
 	constraintRangeRegex = regexp.MustCompile(fmt.Sprintf(
-		`\s*(%s)\s*-\s*(%s)\s*`,
+		`\s*(%s)\s* - \s*(%s)\s*`,
 		cvRegex, cvRegex))
 }
 

vendor/github.com/Masterminds/semver/parse.go

@@ -13,9 +13,6 @@ func rewriteRange(i string) string {
 	}
 	o := i
 	for _, v := range m {
-		if strings.HasPrefix(v[0], "v") && versionRegex.MatchString(v[0]) {
-			continue
-		}
 		t := fmt.Sprintf(">= %s, <= %s", v[1], v[11])
 		o = strings.Replace(o, v[0], t, 1)
 	}