-
Notifications
You must be signed in to change notification settings - Fork 1k
Meta-merge of all changes to stabilize Gopkg.{toml,lock} #644
Conversation
Conflicts: cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.lock cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.lock cmd/dep/testdata/harness_tests/remove/force/case1/final/Gopkg.lock cmd/dep/testdata/harness_tests/remove/specific/case1/final/Gopkg.lock cmd/dep/testdata/harness_tests/remove/specific/case2/final/Gopkg.lock cmd/dep/testdata/harness_tests/remove/unused/case1/final/Gopkg.lock cmd/dep/testdata/harness_tests/status/case1/dot/final/Gopkg.lock cmd/dep/testdata/harness_tests/status/case1/json/final/Gopkg.lock cmd/dep/testdata/harness_tests/status/case1/table/final/Gopkg.lock txn_writer_test.go
So there's good news and bad news. 👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there. 😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that they're okay with their commits being contributed to this project. Please have them confirm that here in the pull request. Note to project maintainer: This is a terminal state, meaning the |
@@ -1,17 +1,15 @@ | |||
required = ["github.com/Masterminds/semver"] |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
Update Gopkg.toml and Gopkg.lock to follow the breaking changes introduced by golang/dep#644
Update Gopkg.toml and Gopkg.lock to follow the breaking changes introduced by golang/dep#644
`dep` changed the manifest file slightly, so this brings in the new metadata and updates dependencies with it. See golang/dep#644 for the manifest changes.
As described at golang/dep#644
This PR is an agglomeration of a number of different open PRs - #631, #584, #538 - which collectively make breaking changes to
Gopkg.toml
andGopkg.lock
's structure in order to bring them into a stable, backwards-compatibility friendly form - it closes #276.I've smashed everything together into one PR in order to make the changes all at once, preventing any pesky merge conflicts that might appear incrementally. Reviews are welcome, though the individual PRs have all already been reviewed, so they can probably be restricted to checking for integration issues.
Merging this will cause all existing
Gopkg.toml
andGopkg.lock
files to become invalid. This is the last time we plan to have a backwards-incompatible change to the files.If folks want to avoid throwing away their existing files, manually applying the following series of changes should work:
Gopkg.toml
, replace all[[dependencies]]
with[[constraint]]
Gopkg.toml
, replace all[[overrides]]
with[[override]]
Gopkg.toml
, e.g.version = "1.1.0"
, the meaning of these will change; you may want to convert them to e.g.version = "=1.1.0"
to achieve the same effect. (But please consider not doing that - having a flexible version should not be harmful to you!)Gopkg.lock
, add the following table:Replacing
$MEMO
with the value currently in thememo
field of your Gopkg.lock.fixes #225 fixes #421 fixes #508 fixes #509