use GO15VENDOREXPERIMENT instead of party

.travis.yml

@@ -1,7 +1,10 @@
 language: go
 
 go:
-  - 1.4
+  - 1.5
+
+env
+  - GO15VENDOREXPERIMENT=1
 
 install:
   - go install -race -v std

Dockerfile

@@ -2,6 +2,7 @@ FROM daaku/arch
 RUN pacman --noconfirm --sync go
 ENV GOPATH /go
 COPY . /go/src/github.com/daaku/rell
+ENV GO15VENDOREXPERIMENT=1
 RUN go install github.com/daaku/rell
 COPY Dockerfile.run /go/bin/Dockerfile
 COPY public /go/bin/public

adminweb/adminweb.go

@@ -8,9 +8,9 @@ import (
 	"path"
 	"sync"
 
-	"github.com/daaku/rell/internal/github.com/daaku/go.httpdev"
-	"github.com/daaku/rell/internal/github.com/daaku/go.trustforward"
-	"github.com/daaku/rell/internal/github.com/daaku/go.viewvar"
+	"github.com/daaku/go.httpdev"
+	"github.com/daaku/go.trustforward"
+	"github.com/daaku/go.viewvar"
 )
 
 type Handler struct {

bin/compile

@@ -9,7 +9,7 @@ BUILD_DIR=$(cd "$1/" && pwd)
 CACHE_DIR=$(cd "$2/" && pwd)
 
 GO_IMPORT_PATH=github.com/daaku/rell
-GO_VERSION=1.4.2
+GO_VERSION=1.5
 GO_URL=https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz
 BUILD_GOPATH=$CACHE_DIR/go
 GO_PACKAGE_DIR=$BUILD_GOPATH/src/$GO_IMPORT_PATH
@@ -18,9 +18,10 @@ OUTPUT_BIN=$BUILD_DIR/$(basename $GO_IMPORT_PATH)
 export GOROOT=$CACHE_DIR/$GO_VERSION/go
 export GOPATH=$BUILD_GOPATH
 export PATH=$GOROOT/bin:$BUILD_GOPATH/bin:$PATH
+export GO15VENDOREXPERIMENT=1
 
-GO_LDFLAGS="-X $GO_IMPORT_PATH/internal/github.com/facebookgo/stack.gopath $GOPATH"
-GO_LDFLAGS="$GO_LDFLAGS -X $GO_IMPORT_PATH/rellenv/viewcontext.rev $SOURCE_VERSION"
+GO_LDFLAGS="-X github.com/facebookgo/stack.gopath=$GOPATH"
+GO_LDFLAGS="$GO_LDFLAGS -X $GO_IMPORT_PATH/rellenv/viewcontext.rev=$SOURCE_VERSION"
 
 if test -d $CACHE_DIR/$GO_VERSION/go; then
   echo "-----> Using existing go $GO_VERSION"

examples/examples.go

@@ -14,9 +14,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/daaku/rell/internal/github.com/daaku/go.errcode"
-	"github.com/daaku/rell/internal/github.com/facebookgo/parse"
-	"github.com/daaku/rell/internal/github.com/golang/groupcache/lru"
+	"github.com/daaku/go.errcode"
+	"github.com/facebookgo/parse"
+	"github.com/golang/groupcache/lru"
 )
 
 // Some categories are hidden from the listing.

examples/viewexamples/examples.go

@@ -14,17 +14,17 @@ import (
 	"strings"
 
 	"github.com/daaku/rell/examples"
-	"github.com/daaku/rell/internal/github.com/daaku/ctxerr"
-	"github.com/daaku/rell/internal/github.com/daaku/go.errcode"
-	"github.com/daaku/rell/internal/github.com/daaku/go.fburl"
-	"github.com/daaku/rell/internal/github.com/daaku/go.h"
-	"github.com/daaku/rell/internal/github.com/daaku/go.h.ui"
-	"github.com/daaku/rell/internal/github.com/daaku/go.htmlwriter"
-	"github.com/daaku/rell/internal/github.com/daaku/go.static"
-	"github.com/daaku/rell/internal/github.com/daaku/go.xsrf"
-	"github.com/daaku/rell/internal/github.com/daaku/sortutil"
-	"github.com/daaku/rell/internal/github.com/facebookgo/counting"
-	"github.com/daaku/rell/internal/golang.org/x/net/context"
+	"github.com/daaku/ctxerr"
+	"github.com/daaku/go.errcode"
+	"github.com/daaku/go.fburl"
+	"github.com/daaku/go.h"
+	"github.com/daaku/go.h.ui"
+	"github.com/daaku/go.htmlwriter"
+	"github.com/daaku/go.static"
+	"github.com/daaku/go.xsrf"
+	"github.com/daaku/sortutil"
+	"github.com/facebookgo/counting"
+	"golang.org/x/net/context"
 	"github.com/daaku/rell/rellenv"
 	"github.com/daaku/rell/view"
 )

main.go

@@ -15,18 +15,18 @@ import (
 	"github.com/daaku/rell/adminweb"
 	"github.com/daaku/rell/examples"
 	"github.com/daaku/rell/examples/viewexamples"
-	"github.com/daaku/rell/internal/github.com/daaku/go.browserid"
-	"github.com/daaku/rell/internal/github.com/daaku/go.static"
-	"github.com/daaku/rell/internal/github.com/daaku/go.trustforward"
-	"github.com/daaku/rell/internal/github.com/daaku/go.xsrf"
-	"github.com/daaku/rell/internal/github.com/facebookgo/devrestarter"
-	"github.com/daaku/rell/internal/github.com/facebookgo/fbapi"
-	"github.com/daaku/rell/internal/github.com/facebookgo/fbapp"
-	"github.com/daaku/rell/internal/github.com/facebookgo/flagenv"
-	"github.com/daaku/rell/internal/github.com/facebookgo/httpcontrol"
-	"github.com/daaku/rell/internal/github.com/facebookgo/httpdown"
-	"github.com/daaku/rell/internal/github.com/facebookgo/parse"
-	"github.com/daaku/rell/internal/github.com/golang/groupcache/lru"
+	"github.com/daaku/go.browserid"
+	"github.com/daaku/go.static"
+	"github.com/daaku/go.trustforward"
+	"github.com/daaku/go.xsrf"
+	"github.com/facebookgo/devrestarter"
+	"github.com/facebookgo/fbapi"
+	"github.com/facebookgo/fbapp"
+	"github.com/facebookgo/flagenv"
+	"github.com/facebookgo/httpcontrol"
+	"github.com/facebookgo/httpdown"
+	"github.com/facebookgo/parse"
+	"github.com/golang/groupcache/lru"
 	"github.com/daaku/rell/oauth"
 	"github.com/daaku/rell/og"
 	"github.com/daaku/rell/og/viewog"

oauth/oauth.go

@@ -10,13 +10,13 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/daaku/rell/internal/github.com/daaku/ctxerr"
-	"github.com/daaku/rell/internal/github.com/daaku/go.browserid"
-	"github.com/daaku/rell/internal/github.com/daaku/go.fburl"
-	"github.com/daaku/rell/internal/github.com/daaku/go.h"
-	"github.com/daaku/rell/internal/github.com/daaku/go.static"
-	"github.com/daaku/rell/internal/github.com/facebookgo/fbapp"
-	"github.com/daaku/rell/internal/golang.org/x/net/context"
+	"github.com/daaku/ctxerr"
+	"github.com/daaku/go.browserid"
+	"github.com/daaku/go.fburl"
+	"github.com/daaku/go.h"
+	"github.com/daaku/go.static"
+	"github.com/facebookgo/fbapp"
+	"golang.org/x/net/context"
 	"github.com/daaku/rell/rellenv"
 )
 

og/og.go

@@ -14,9 +14,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/daaku/rell/internal/github.com/daaku/go.fburl"
-	"github.com/daaku/rell/internal/github.com/daaku/go.static"
-	"github.com/daaku/rell/internal/golang.org/x/net/context"
+	"github.com/daaku/go.fburl"
+	"github.com/daaku/go.static"
+	"golang.org/x/net/context"
 	"github.com/daaku/rell/rellenv"
 )
 

og/og_test.go

@@ -5,9 +5,9 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/daaku/rell/internal/github.com/daaku/go.static"
-	"github.com/daaku/rell/internal/github.com/facebookgo/fbapp"
-	"github.com/daaku/rell/internal/golang.org/x/net/context"
+	"github.com/daaku/go.static"
+	"github.com/facebookgo/fbapp"
+	"golang.org/x/net/context"
 	"github.com/daaku/rell/rellenv"
 )
 

og/viewog/og.go

@@ -7,11 +7,11 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/daaku/rell/internal/github.com/daaku/go.errcode"
-	"github.com/daaku/rell/internal/github.com/daaku/go.h"
-	"github.com/daaku/rell/internal/github.com/daaku/go.h.js.fb"
-	"github.com/daaku/rell/internal/github.com/daaku/go.static"
-	"github.com/daaku/rell/internal/golang.org/x/net/context"
+	"github.com/daaku/go.errcode"
+	"github.com/daaku/go.h"
+	"github.com/daaku/go.h.js.fb"
+	"github.com/daaku/go.static"
+	"golang.org/x/net/context"
 	"github.com/daaku/rell/og"
 	"github.com/daaku/rell/rellenv"
 	"github.com/daaku/rell/view"

readme.md

@@ -13,7 +13,7 @@ Development Environment
 You'll need [Go](https://golang.org/) to work on rell. Once you have it:
 
 ```sh
-go get github.com/daaku/rell
+GO15VENDOREXPERIMENT=1 go get github.com/daaku/rell
 rell
 ```
 
@@ -48,11 +48,3 @@ A Docker container can be built using:
 ```sh
 docker build -t rell-builder . && docker run rell-builder | docker build -t daaku/rell -
 ```
-
-Upgrade Vendored Dependencies
------------------------------
-
-```sh
-go get github.com/daaku/party
-party -c -d=internal -u -t -x=false
-```

rellenv/appns/appns.go

@@ -7,9 +7,9 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/daaku/rell/internal/github.com/facebookgo/fbapi"
-	"github.com/daaku/rell/internal/github.com/facebookgo/fbapp"
-	"github.com/daaku/rell/internal/github.com/golang/groupcache/lru"
+	"github.com/facebookgo/fbapi"
+	"github.com/facebookgo/fbapp"
+	"github.com/golang/groupcache/lru"
 )
 
 type cacheKey uint64

rellenv/context.go

@@ -14,13 +14,13 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/daaku/rell/internal/github.com/daaku/ctxerr"
-	"github.com/daaku/rell/internal/github.com/daaku/go.fburl"
-	"github.com/daaku/rell/internal/github.com/daaku/go.signedrequest/appdata"
-	"github.com/daaku/rell/internal/github.com/daaku/go.signedrequest/fbsr"
-	"github.com/daaku/rell/internal/github.com/daaku/go.trustforward"
-	"github.com/daaku/rell/internal/github.com/facebookgo/fbapp"
-	"github.com/daaku/rell/internal/golang.org/x/net/context"
+	"github.com/daaku/ctxerr"
+	"github.com/daaku/go.fburl"
+	"github.com/daaku/go.signedrequest/appdata"
+	"github.com/daaku/go.signedrequest/fbsr"
+	"github.com/daaku/go.trustforward"
+	"github.com/facebookgo/fbapp"
+	"golang.org/x/net/context"
 )
 
 var envRegexp = regexp.MustCompile(`^[a-zA-Z0-9-_.]*$`)

rellenv/context_test.go

@@ -6,10 +6,10 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/daaku/rell/internal/github.com/daaku/go.trustforward"
-	"github.com/daaku/rell/internal/github.com/facebookgo/ensure"
-	"github.com/daaku/rell/internal/github.com/facebookgo/fbapp"
-	"github.com/daaku/rell/internal/golang.org/x/net/context"
+	"github.com/daaku/go.trustforward"
+	"github.com/facebookgo/ensure"
+	"github.com/facebookgo/fbapp"
+	"golang.org/x/net/context"
 	"github.com/daaku/rell/rellenv"
 )
 

rellenv/empcheck/empcheck.go

@@ -6,9 +6,9 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/daaku/rell/internal/github.com/facebookgo/fbapi"
-	"github.com/daaku/rell/internal/github.com/facebookgo/fbapp"
-	"github.com/daaku/rell/internal/github.com/golang/groupcache/lru"
+	"github.com/facebookgo/fbapi"
+	"github.com/facebookgo/fbapp"
+	"github.com/golang/groupcache/lru"
 )
 
 var fields = fbapi.ParamFields("is_employee")

rellenv/viewcontext/context.go

@@ -4,8 +4,8 @@ package viewcontext
 import (
 	"net/http"
 
-	"github.com/daaku/rell/internal/github.com/daaku/go.httpdev"
-	"github.com/daaku/rell/internal/golang.org/x/net/context"
+	"github.com/daaku/go.httpdev"
+	"golang.org/x/net/context"
 	"github.com/daaku/rell/rellenv"
 )