Merge branch 'master' of github.com:gobuffalo/pop into pop

.gitignore

@@ -32,4 +32,3 @@ migrations/schema.sql
 .grifter/
 cockroach-data/
 vendor/
-cockroach-data/

.goreleaser.yml

@@ -1,7 +1,7 @@
 project_name: pop
 release:
   github:
-    owner: markbates
+    owner: gobuffalo
     name: pop
   name_template: '{{.Tag}}'
 brew:
@@ -21,7 +21,6 @@ builds:
       - "6"
     main: ./soda/main.go
     binary: soda-no-sqlite
-    flags: -tags nosqlite
   -
     goos:
       - darwin
@@ -31,6 +30,7 @@ builds:
       - "6"
     main: ./soda/main.go
     binary: soda-with-sqlite
+    flags: -tags sqlite
 archive:
   name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm
     }}v{{ .Arm }}{{ end }}'

.travis.yml

@@ -7,13 +7,14 @@ sudo: required
 go:
   - 1.8
   - 1.9
+  - "1.10"
   - tip
 
 install:
  - go get -t -v ./...
 
 before_script:
-    - go build -o tsoda ./soda
+    - go build -v -tags sqlite -o tsoda ./soda
     # travis hangs when trying to create mysql db using soda. not sure why
     - mysql -e 'create database pop_test;'
     - ./tsoda create -e "postgres"
@@ -22,7 +23,7 @@ before_script:
     - ./tsoda migrate -e "postgres"
     - ./tsoda migrate -e "sqlite"
 
-script: go test ./... -v
+script: go test -tags sqlite ./... -v
 
 global_env:
   - MYSQL_USER="travis"

Dockerfile

@@ -1,8 +1,8 @@
 from golang:1.7
 
 RUN echo $GOPATH
-RUN mkdir -p $GOPATH/src/github.com/markbates/pop
-WORKDIR $GOPATH/src/github.com/markbates/pop
+RUN mkdir -p $GOPATH/src/github.com/gobuffalo/pop
+WORKDIR $GOPATH/src/github.com/gobuffalo/pop
 ADD . .
 RUN go get -t -v ./...
 RUN SODA_DIALECT=sqlite go test ./...

Gopkg.toml

@@ -1,3 +0,0 @@
-[[constraint]]
-  revision = "36e9d2ebbde5e3f13ab2e25625fd453271d6522e"
-  name = "github.com/satori/go.uuid"