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

Rename [[dependencies]] to [[constraint]] #538

Merged
merged 5 commits into from
May 27, 2017
Merged

Conversation

felipeweb
Copy link
Contributor

related issue #509

Copy link
Member

@sdboyer sdboyer left a comment

Choose a reason for hiding this comment

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

looks pretty good, thank you!!! 🎉

one wording nit, then a request for a bit more work 😄

txn_writer.go Outdated
@@ -36,9 +36,9 @@ const exampleTOML = `
## or in a dependency.
# ignored = ["github.com/user/project/badpkg"]

## Dependencies define constraints on dependent projects. They are respected by
## Constraint define constraints on dependent projects. They are respected by
Copy link
Member

Choose a reason for hiding this comment

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

This stutters a bit now, with the repetition of constraint. Let's modify the first sentence to read:

Constraints are rules for how directly imported projects may be incorporated into the depgraph.

manifest.go Outdated
Ignored []string `toml:"ignored,omitempty"`
Required []string `toml:"required,omitempty"`
Constraints []rawProject `toml:"constraint,omitempty"`
Overrides []rawProject `toml:"overrides,omitempty"`
Copy link
Member

Choose a reason for hiding this comment

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

As long as we're in here changing things, let's also change [[overrides]] to the singular, [[override]] (but keep the property name plural, rawManifest.Overrides).

@felipeweb felipeweb force-pushed the issue_509 branch 3 times, most recently from c87e45d to 065c23f Compare May 10, 2017 04:40
@felipeweb
Copy link
Contributor Author

@sdboyer done!

@sdboyer
Copy link
Member

sdboyer commented May 10, 2017

OK, this is looking good - thank you! I'm going to wait on merging until we get the other breaking changes sorted, then do them as a batch.

## Overrides have the same structure as [[dependencies]], but supercede all
## [[dependencies]] declarations from all projects. Only the current project's
## [[overrides]] are applied.
## Override have the same structure as [[constraint]], but supercede all

Choose a reason for hiding this comment

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

"Override" should probably be "Overrides" here to be grammatically correct and consistent with line 15.

Or, this sentence could be "Override has ..." and line 15 can be changed to "Constraint is a rule ..."

Copy link
Member

Choose a reason for hiding this comment

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

Agreed, the former is preferred, primarily for consistency.

##
## Overrides are a sledgehammer. Use them only as a last resort.
# [[overrides]]
## Override is a sledgehammer. Use them only as a last resort.

Choose a reason for hiding this comment

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

"Override is a sledgehammer. Use it only as a last resort."

or

"Overrides are a sledgehammer. Use them only as a last resort."

Copy link
Member

Choose a reason for hiding this comment

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

The latter, please 😄

@sdboyer
Copy link
Member

sdboyer commented May 11, 2017

Gotta chase the conflicts :/

FYI, I'm planning on merging this into a feature branch. Hopefully a short-lived one - I'm aiming for only until Monday.

@zkanda
Copy link
Contributor

zkanda commented May 21, 2017

Hello, what's the status of this? I can fix the conflict and willing to take it forward on getting merge.

@sdboyer sdboyer added this to the Manifest and Lock committable milestone May 21, 2017
@sdboyer
Copy link
Member

sdboyer commented May 21, 2017

Bleh, yeah, the conflict will need fixing.

The status is that this is waiting to be merged simultaneously with a number of other issues that will be the last backwards-compatibility break with Gopkg.toml and Gopkg.lock. Unfortunately, they weren't all quite ready last week, so the merging of this was delayed.

At present, all that's left is #225 and a small addition to #584 that incorporates #421 - that, and, I need to write up some release notes + caveat emptor.

@sdboyer
Copy link
Member

sdboyer commented May 23, 2017

FYI, this has been incorporated into the stabilize-files branch, which we'll merge all at once when everything in #277 is ready.

@sdboyer sdboyer merged commit 5cb3e51 into golang:master May 27, 2017
ibrasho added a commit to ibrasho-forks/dep that referenced this pull request Jun 10, 2017
…ndencies)

[[dependencies]] was changed to [[constraint]] but the FAQ had answers
that used the old field.

Signed-off-by: Ibrahim AshShohail <ibra.sho@gmail.com>
sdboyer added a commit that referenced this pull request Jun 12, 2017
Update the FAQ to use constraint instead of dependencies (reflect #538)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants