Enable vendor/ for go1.7 & Godep workspace -> vendor/

go1.7beta1 is out. Time to make sure things work with go1.7+ Once go1.8 is released support for Godep workspaces (./Godeps/_workspace) will be removed.
tools · Jun 2, 2016 · acd06c8 · acd06c8
1 parent f4edf33
commit acd06c8
Show file tree

Hide file tree

Showing 35 changed files with 19 additions and 13 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,9 @@
+#v74 (2016/06/01)
+
+* Enable vendor/ on go1.7
+* No longer use a godep workspace, use vendor/ (yay!)
+* Notify that support for Godep workspaces will be removed once go1.8 ships
+
 #v73 (2016/05/31)
 
 * Fix permission changes on Windows via @alexbrand. Closes #481.

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore
diff --git a/diff.go b/diff.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/tools/godep/Godeps/_workspace/src/github.com/pmezard/go-difflib/difflib"
+	"github.com/pmezard/go-difflib/difflib"
 )
 
 var cmdDiff = &Command{

diff --git a/main.go b/main.go
@@ -77,11 +77,13 @@ func determineVendor(v string) bool {
 	go15ve := os.Getenv("GO15VENDOREXPERIMENT")
 	ev := (v == "go1.5" && go15ve == "1") ||
 		(v == "go1.6" && go15ve != "0") ||
+		(v == "go1.7") ||
 		(strings.HasPrefix(v, "devel") && go15ve != "0")
 
 	ws := filepath.Join("Godeps", "_workspace")
 	s, err := os.Stat(ws)
 	if err == nil && s.IsDir() {
+		log.Printf("WARNING: Godep workspaces (./Godeps/_workspace) are deprecated and support for them will be removed when go1.8 is released.")
 		if ev {
 			log.Printf("WARNING: Go version (%s) & $GO15VENDOREXPERIMENT=%s wants to enable the vendor experiment, but disabling because a Godep workspace (%s) exists\n", v, go15ve, ws)
 		}

diff --git a/msg.go b/msg.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/tools/godep/Godeps/_workspace/src/github.com/kr/pretty"
+	"github.com/kr/pretty"
 )
 
 func debugln(a ...interface{}) (int, error) {

diff --git a/restore.go b/restore.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/tools/godep/Godeps/_workspace/src/golang.org/x/tools/go/vcs"
+	"golang.org/x/tools/go/vcs"
 )
 
 var cmdRestore = &Command{

diff --git a/rewrite.go b/rewrite.go
@@ -13,7 +13,7 @@ import (
 	"go/printer"
 	"go/token"
 
-	"github.com/tools/godep/Godeps/_workspace/src/github.com/kr/fs"
+	"github.com/kr/fs"
 )
 
 // rewrite visits the go files in pkgs, plus all go files

diff --git a/save.go b/save.go
@@ -14,7 +14,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/tools/godep/Godeps/_workspace/src/github.com/kr/fs"
+	"github.com/kr/fs"
 )
 
 var cmdSave = &Command{

diff --git a/vcs.go b/vcs.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/tools/godep/Godeps/_workspace/src/golang.org/x/tools/go/vcs"
+	"golang.org/x/tools/go/vcs"
 )
 
 // VCS represents a version control system.

diff --git a/...s/_workspace/src/github.com/kr/fs/LICENSE → vendor/github.com/kr/fs/LICENSE b/...s/_workspace/src/github.com/kr/fs/LICENSE → vendor/github.com/kr/fs/LICENSE
diff --git a/...ps/_workspace/src/github.com/kr/fs/Readme → vendor/github.com/kr/fs/Readme b/...ps/_workspace/src/github.com/kr/fs/Readme → vendor/github.com/kr/fs/Readme
diff --git a/...kspace/src/github.com/kr/fs/filesystem.go → vendor/github.com/kr/fs/filesystem.go b/...kspace/src/github.com/kr/fs/filesystem.go → vendor/github.com/kr/fs/filesystem.go
diff --git a/...s/_workspace/src/github.com/kr/fs/walk.go → vendor/github.com/kr/fs/walk.go b/...s/_workspace/src/github.com/kr/fs/walk.go → vendor/github.com/kr/fs/walk.go
diff --git a/...space/src/github.com/kr/pretty/.gitignore → vendor/github.com/kr/pretty/.gitignore b/...space/src/github.com/kr/pretty/.gitignore → vendor/github.com/kr/pretty/.gitignore
diff --git a/...orkspace/src/github.com/kr/pretty/License → vendor/github.com/kr/pretty/License b/...orkspace/src/github.com/kr/pretty/License → vendor/github.com/kr/pretty/License
diff --git a/...workspace/src/github.com/kr/pretty/Readme → vendor/github.com/kr/pretty/Readme b/...workspace/src/github.com/kr/pretty/Readme → vendor/github.com/kr/pretty/Readme
diff --git a/...orkspace/src/github.com/kr/pretty/diff.go → vendor/github.com/kr/pretty/diff.go b/...orkspace/src/github.com/kr/pretty/diff.go → vendor/github.com/kr/pretty/diff.go
diff --git a/...ace/src/github.com/kr/pretty/formatter.go → vendor/github.com/kr/pretty/formatter.go b/...ace/src/github.com/kr/pretty/formatter.go → vendor/github.com/kr/pretty/formatter.go
diff --git a/...kspace/src/github.com/kr/pretty/pretty.go → vendor/github.com/kr/pretty/pretty.go b/...kspace/src/github.com/kr/pretty/pretty.go → vendor/github.com/kr/pretty/pretty.go
diff --git a/...orkspace/src/github.com/kr/pretty/zero.go → vendor/github.com/kr/pretty/zero.go b/...orkspace/src/github.com/kr/pretty/zero.go → vendor/github.com/kr/pretty/zero.go
diff --git a/..._workspace/src/github.com/kr/text/License → vendor/github.com/kr/text/License b/..._workspace/src/github.com/kr/text/License → vendor/github.com/kr/text/License
diff --git a/.../_workspace/src/github.com/kr/text/Readme → vendor/github.com/kr/text/Readme b/.../_workspace/src/github.com/kr/text/Readme → vendor/github.com/kr/text/Readme
diff --git a/.../_workspace/src/github.com/kr/text/doc.go → vendor/github.com/kr/text/doc.go b/.../_workspace/src/github.com/kr/text/doc.go → vendor/github.com/kr/text/doc.go
diff --git a/...orkspace/src/github.com/kr/text/indent.go → vendor/github.com/kr/text/indent.go b/...orkspace/src/github.com/kr/text/indent.go → vendor/github.com/kr/text/indent.go
diff --git a/..._workspace/src/github.com/kr/text/wrap.go → vendor/github.com/kr/text/wrap.go b/..._workspace/src/github.com/kr/text/wrap.go → vendor/github.com/kr/text/wrap.go
diff --git a/...src/github.com/pmezard/go-difflib/LICENSE → vendor/github.com/pmezard/go-difflib/LICENSE b/...src/github.com/pmezard/go-difflib/LICENSE → vendor/github.com/pmezard/go-difflib/LICENSE
diff --git a/...com/pmezard/go-difflib/difflib/difflib.go → ...com/pmezard/go-difflib/difflib/difflib.go b/...com/pmezard/go-difflib/difflib/difflib.go → ...com/pmezard/go-difflib/difflib/difflib.go
diff --git a/..._workspace/src/golang.org/x/tools/LICENSE → vendor/golang.org/x/tools/LICENSE b/..._workspace/src/golang.org/x/tools/LICENSE → vendor/golang.org/x/tools/LICENSE
diff --git a/..._workspace/src/golang.org/x/tools/PATENTS → vendor/golang.org/x/tools/PATENTS b/..._workspace/src/golang.org/x/tools/PATENTS → vendor/golang.org/x/tools/PATENTS
diff --git a/...rc/golang.org/x/tools/go/vcs/discovery.go → ...or/golang.org/x/tools/go/vcs/discovery.go b/...rc/golang.org/x/tools/go/vcs/discovery.go → ...or/golang.org/x/tools/go/vcs/discovery.go
diff --git a/...pace/src/golang.org/x/tools/go/vcs/env.go → vendor/golang.org/x/tools/go/vcs/env.go b/...pace/src/golang.org/x/tools/go/vcs/env.go → vendor/golang.org/x/tools/go/vcs/env.go
diff --git a/...ace/src/golang.org/x/tools/go/vcs/http.go → vendor/golang.org/x/tools/go/vcs/http.go b/...ace/src/golang.org/x/tools/go/vcs/http.go → vendor/golang.org/x/tools/go/vcs/http.go
diff --git a/...pace/src/golang.org/x/tools/go/vcs/vcs.go → vendor/golang.org/x/tools/go/vcs/vcs.go b/...pace/src/golang.org/x/tools/go/vcs/vcs.go → vendor/golang.org/x/tools/go/vcs/vcs.go
diff --git a/version.go b/version.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 )
 
-const version = 73
+const version = 74
 
 var cmdVersion = &Command{
 	Name:  "version",
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"fmt"
     	"log"
-    	"github.com/tools/godep/Godeps/_workspace/src/github.com/pmezard/go-difflib/difflib"
+    	"github.com/pmezard/go-difflib/difflib"
     )
     var cmdDiff = &Command{
@@ Expand Down @@