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

Use fork of Masterminds/semver until PR is merged #938

Merged
merged 2 commits into from
Aug 8, 2017
Merged

Use fork of Masterminds/semver until PR is merged #938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a085554
Use fork of Masterminds/semver until PR is merged
carolynvs Aug 3, 2017
0cbbebd
Fix testdata
carolynvs Aug 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions Gopkg.lock
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cmd/dep/godep_importer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion 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.

15 changes: 14 additions & 1 deletion vendor/github.com/Masterminds/semver/constraints_test.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions vendor/github.com/Masterminds/semver/parse.go
View file
Open in desktop

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