Merge pull request #1559 from sdboyer/v040-release-prep

v0.4.0 release prep

CHANGELOG.md

@@ -1,4 +1,12 @@
-# v0.4.0 (Unreleased)
+# (next version)
+
+NEW FEATURES:
+
+BUG FIXES:
+
+IMPROVEMENTS:
+
+# v0.4.0
 
 NEW FEATURES:
 * Add support for importing from [glock](https://github.com/robfig/glock) based projects. ([#1422](https://github.com/golang/dep/pull/1422)

cmd/dep/testdata/harness_tests/init/glide/case4/final/Gopkg.toml

@@ -2,3 +2,7 @@
 [[constraint]]
   name = "github.com/sdboyer/deptestdos"
   version = "2.0.0"
+
+[prune]
+  go-tests = true
+  unused-packages = true

docs/introduction.md

@@ -6,6 +6,6 @@ title: Getting Started
 
 Welcome! This is documentation for dep, the "official experiment" dependency management tool for the Go language. Dep is a tool intended primarily for use by developers, to support the work of actually writing and shipping code. It is _not_ intended for end users who are installing Go software - that's what `go get` does.
 
-This site has both guides and reference documents. The guides are practical explanations of how to actually do things with dep, whereas the reference material provides deeper dives on specific topics. Of particular note is the [glossary](#glossary.md) - if you're unfamiliar with terminology used in this documentation, make sure to check there!
+This site has both guides and reference documents. The guides are practical explanations of how to actually do things with dep, whereas the reference material provides deeper dives on specific topics. Of particular note is the [glossary](glossary.md) - if you're unfamiliar with terminology used in this documentation, make sure to check there!
 
 After [installing dep](installation.md), if you're using it for the first time, check out [Creating a New Project](new-project.md). Or, if you have an existing Go project that you want to convert to dep, [Migrating to Dep](migrating.md) is probably the place to start.

hack/validate-vendor.bash

@@ -33,12 +33,11 @@ unset IFS
 if [ ${#files[@]} -gt 0 ]; then
 	go build ./cmd/dep
 	./dep ensure -vendor-only
-	./dep prune
 	# Let see if the working directory is clean
 	diffs="$(git status --porcelain -- vendor Gopkg.toml Gopkg.lock 2>/dev/null)"
 	if [ "$diffs" ]; then
 		{
-			echo 'The contents of vendor differ after "dep ensure && dep prune":'
+			echo 'The contents of vendor differ after "dep ensure":'
 			echo
 			echo "$diffs"
 			echo