New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 23 commits into from May 27, 2017

Conversation

Projects
None yet
4 participants
@sdboyer
Copy link
Member

sdboyer commented May 25, 2017

This PR is an agglomeration of a number of different open PRs - #631, #584, #538 - which collectively make breaking changes to Gopkg.toml and Gopkg.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 and Gopkg.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:

  1. In Gopkg.toml, replace all [[dependencies]] with [[constraint]]
  2. In Gopkg.toml, replace all [[overrides]] with [[override]]
  3. If you have any exact version constraints specified in 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!)
  4. In Gopkg.lock, add the following table:
[solve-meta]
  analyzer-name = "dep"
  analyzer-version = 1
  inputs-digest = "$MEMO"
  solver-name = "gps-cdcl"
  solver-version = 1

Replacing $MEMO with the value currently in the memo field of your Gopkg.lock.

fixes #225 fixes #421 fixes #508 fixes #509

felipeweb and others added some commits May 9, 2017

Incorporate lock split-up into integration branch
 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
@googlebot

This comment has been minimized.

Copy link
Collaborator

googlebot commented May 25, 2017

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 cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@@ -1,17 +1,15 @@
required = ["github.com/Masterminds/semver"]

This comment has been minimized.

@carolynvs

carolynvs May 25, 2017

Collaborator

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?

This comment has been minimized.

@sdboyer

sdboyer May 25, 2017

Member

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.

@sdboyer sdboyer merged commit ec6c4e8 into master May 27, 2017

6 checks passed

codeclimate no new or fixed issues
Details
codeclimate/coverage 73.84% (-0.1%)
Details
continuous-integration/appveyor/branch AppVeyor build succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

groob added a commit to groob/micromdm that referenced this pull request May 28, 2017

groob added a commit to micromdm/micromdm that referenced this pull request May 28, 2017

B4dM4n added a commit to B4dM4n/rclone that referenced this pull request Jun 1, 2017

migrate Gopkg.toml and Gopkg.lock to new format
Update Gopkg.toml and Gopkg.lock to follow the breaking changes
introduced by golang/dep#644

ncw added a commit to ncw/rclone that referenced this pull request Jun 1, 2017

migrate Gopkg.toml and Gopkg.lock to new format
Update Gopkg.toml and Gopkg.lock to follow the breaking changes
introduced by golang/dep#644

jamesog added a commit to jamesog/scan that referenced this pull request Jun 24, 2017

Update dependencies
`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.

@carolynvs carolynvs deleted the stabilize-files branch Jul 6, 2017

@bcongdon bcongdon referenced this pull request Aug 24, 2017

Closed

Update Gopkg.{toml, lock} #67

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment