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

Meta-merge of all changes to stabilize Gopkg.{toml,lock} #644

Merged
merged 23 commits into from
May 27, 2017
Merged

Meta-merge of all changes to stabilize Gopkg.{toml,lock} #644

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ff254a8
rename for constraint
felipeweb May 9, 2017
b76e416
fixtures rename
felipeweb May 9, 2017
942792a
fix tests
felipeweb May 9, 2017
bb8a327
update Gopkg.toml
felipeweb May 9, 2017
5cb3e51
rename [[overrides]] to [[override]]
felipeweb May 10, 2017
8be9bb6
Split input components out in Gopkg.lock
sdboyer May 16, 2017
2081136
s/LockFromInterface/LockFromSolution/
sdboyer May 16, 2017
bf737b6
Expand Solver, Solution to report name/version
sdboyer May 22, 2017
75ac569
Incorporate solver name and version in Gopkg.lock
sdboyer May 22, 2017
f6c2b15
Incorporate lock split-up into integration branch
sdboyer May 22, 2017
f0a81f4
Incorporate pr/538, change manifest prop names
sdboyer May 23, 2017
0081879
Respond to review
sdboyer May 23, 2017
ab84520
Merge branch 'split-up-hash' into stabilize-files
sdboyer May 23, 2017
2e9aecc
Update FAQ with new Gopkg.toml key names
sdboyer May 24, 2017
a75d6d2
Support implied carets in gps
carolynvs May 24, 2017
ecf43b9
Always use implied carets in dep
carolynvs May 24, 2017
5285e62
Preserve previous test behavior before implied caret
carolynvs May 24, 2017
8dcaab5
Fix deduceConstraint test to not rely upon the types being comparable
carolynvs May 23, 2017
16e350f
Update testdata now that init omits carets in the manifest
carolynvs May 24, 2017
a926aa2
Incorporate implicit caret into stabilize-files
sdboyer May 25, 2017
f1bd538
Tidy up docs a bit
sdboyer May 25, 2017
4df9c95
Update Gopkg.toml, Gopkg.lock to new forms
sdboyer May 25, 2017
ec6c4e8
Fix out-of-date vendor
sdboyer May 25, 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
10 changes: 9 additions & 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.

6 changes: 2 additions & 4 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
required = ["github.com/Masterminds/semver"]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this required to begin with? I would have thought the direct dependency (below) would have been enough, so I'm not sure why it was needed before and not anymore?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for a while there (pre gps move) we didn't directly import it, and thus couldn't constrain it, so we kept getting the wrong version.


[[constraint]]
branch = "2.x"
name = "github.com/Masterminds/semver"

[[constraint]]
name = "github.com/Masterminds/vcs"
version = "^1.11.0"
version = "1.11.0"

[[constraint]]
branch = "master"
name = "github.com/pelletier/go-toml"

[[constraint]]
name = "github.com/pkg/errors"
version = ">=0.8.0, <1.0.0"
version = "0.8.0"