Remove support for Go modules

golang-migrate · Oct 10, 2018 · 5e96539 · 5e96539
1 parent 708d67f
commit 5e96539
Show file tree

Hide file tree

Showing 59 changed files with 96 additions and 342 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,6 @@ go_import_path: github.com/golang-migrate/migrate
 
 env:
   global:
-    - GO111MODULE=on
     - MIGRATE_TEST_CONTAINER_BOOT_TIMEOUT=60
     - DOCKER_USERNAME=golangmigrate
     -   secure: "oSOznzUrgr5h45qW4PONkREpisPAt40tnM+KFWtS/Ggu5UI2Ie0CmyYXWuBjbt7B97a4yN9Qzmn8FxJHJ7kk+ABOi3muhkxeIhr6esXbzHhX/Jhv0mj1xkzX7KoVN9oHBz3cOI/QeRyEAO68xjDHNE2kby4RTT9VBt6TQUakKVkqI5qkqLBTADepCjVC+9XhxVxUNyeWKU8ormaUfJBjoNVoDlwXekUPnJenfmfZqXxUInvBCfUyp7Pq+kurBORmg4yc6qOlRYuK67Xw+i5xpjbZouNlXPk0rq7pPy5zjhmZQ3kImoFPvNMeKViDcI6kSIJKtjdhms9/g/6MgXS9HlL5kFy8tYKbsyiHnHB1BsvaLAKXctbUZFDPstgMPADfnad2kZXPrNqIhfWKZrGRWidawCYJ1sKKwYxLMKrtA0umqgMoL90MmBOELhuGmvMV0cFJB+zo+K2YWjEiMGd8xRb5mC5aAy0ZcCehO46jGtpr217EJmMF8Ywr7cFqM2Shg5U2jev9qUpYiXwmPnJKDuoT2ZHuHmPgFIkYiWC5yeJnnmG5bed1sKBp93AFrJX+1Rx5oC4BpNegewmBZKpOSwls/D1uMAeQK3dPmQHLsT6o2VBLfeDGr+zY0R85ywwPZCv00vGol02zYoTqN7eFqr6Qhjr/qx5K1nnxJdFK3Ts="
@@ -33,12 +32,12 @@ cache:
 before_install:
   - echo "TRAVIS_GO_VERSION=${TRAVIS_GO_VERSION}"
   # Download the binary to bin folder in $GOPATH
-  - if [[ "${TRAVIS_GO_VERSION}" == 1.10* ]]; then curl -L -s https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 -o $GOPATH/bin/dep; fi
+  - curl -L -s https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 -o $GOPATH/bin/dep
   # Make the binary executable
-  - if [[ "${TRAVIS_GO_VERSION}" == 1.10* ]]; then chmod +x $GOPATH/bin/dep; fi
+  - chmod +x $GOPATH/bin/dep
 
 install:
-  - if [[ "${TRAVIS_GO_VERSION}" == 1.10* ]]; then dep ensure -vendor-only; fi
+  - dep ensure -vendor-only
   - go get github.com/mattn/goveralls
 
 script:

diff --git a/Dockerfile b/Dockerfile
@@ -7,7 +7,6 @@ WORKDIR /go/src/github.com/golang-migrate/migrate
 
 COPY . ./
 
-ENV GO111MODULE=on
 ENV DATABASES="postgres mysql redshift cassandra spanner cockroachdb clickhouse"
 ENV SOURCES="file go_bindata github aws_s3 google_cloud_storage"
 

diff --git a/README.md b/README.md
@@ -107,9 +107,9 @@ __[Go Documentation](https://godoc.org/github.com/golang-migrate/migrate)__
 
 ```go
 import (
-    "github.com/golang-migrate/migrate/v3"
-    _ "github.com/golang-migrate/migrate/v3/database/postgres"
-    _ "github.com/golang-migrate/migrate/v3/source/github"
+    "github.com/golang-migrate/migrate"
+    _ "github.com/golang-migrate/migrate/database/postgres"
+    _ "github.com/golang-migrate/migrate/source/github"
 )
 
 func main() {
@@ -126,9 +126,9 @@ Want to use an existing database client?
 import (
     "database/sql"
     _ "github.com/lib/pq"
-    "github.com/golang-migrate/migrate/v3"
-    "github.com/golang-migrate/migrate/v3/database/postgres"
-    _ "github.com/golang-migrate/migrate/v3/source/file"
+    "github.com/golang-migrate/migrate"
+    "github.com/golang-migrate/migrate/database/postgres"
+    _ "github.com/golang-migrate/migrate/source/file"
 )
 
 func main() {

diff --git a/cli/build_aws-s3.go b/cli/build_aws-s3.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/source/aws_s3"
+	_ "github.com/golang-migrate/migrate/source/aws_s3"
 )
diff --git a/cli/build_cassandra.go b/cli/build_cassandra.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/cassandra"
+	_ "github.com/golang-migrate/migrate/database/cassandra"
 )
diff --git a/cli/build_clickhouse.go b/cli/build_clickhouse.go
@@ -3,6 +3,6 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/clickhouse"
+	_ "github.com/golang-migrate/migrate/database/clickhouse"
 	_ "github.com/kshvakov/clickhouse"
 )
diff --git a/cli/build_cockroachdb.go b/cli/build_cockroachdb.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/cockroachdb"
+	_ "github.com/golang-migrate/migrate/database/cockroachdb"
 )
diff --git a/cli/build_github.go b/cli/build_github.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/source/github"
+	_ "github.com/golang-migrate/migrate/source/github"
 )
diff --git a/cli/build_go-bindata.go b/cli/build_go-bindata.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/source/go_bindata"
+	_ "github.com/golang-migrate/migrate/source/go_bindata"
 )
diff --git a/cli/build_godoc-vfs.go b/cli/build_godoc-vfs.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/source/godoc_vfs"
+	_ "github.com/golang-migrate/migrate/source/godoc_vfs"
 )
diff --git a/cli/build_google-cloud-storage.go b/cli/build_google-cloud-storage.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/source/google_cloud_storage"
+	_ "github.com/golang-migrate/migrate/source/google_cloud_storage"
 )
diff --git a/cli/build_mysql.go b/cli/build_mysql.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/mysql"
+	_ "github.com/golang-migrate/migrate/database/mysql"
 )
diff --git a/cli/build_postgres.go b/cli/build_postgres.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/postgres"
+	_ "github.com/golang-migrate/migrate/database/postgres"
 )
diff --git a/cli/build_ql.go b/cli/build_ql.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/ql"
+	_ "github.com/golang-migrate/migrate/database/ql"
 )
diff --git a/cli/build_redshift.go b/cli/build_redshift.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/redshift"
+	_ "github.com/golang-migrate/migrate/database/redshift"
 )
diff --git a/cli/build_spanner.go b/cli/build_spanner.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/spanner"
+	_ "github.com/golang-migrate/migrate/database/spanner"
 )
diff --git a/cli/build_sqlite3.go b/cli/build_sqlite3.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/sqlite3"
+	_ "github.com/golang-migrate/migrate/database/sqlite3"
 )
diff --git a/cli/commands.go b/cli/commands.go
@@ -3,9 +3,9 @@ package main
 import (
 	"errors"
 	"fmt"
-	"github.com/golang-migrate/migrate/v3"
-	_ "github.com/golang-migrate/migrate/v3/database/stub" // TODO remove again
-	_ "github.com/golang-migrate/migrate/v3/source/file"
+	"github.com/golang-migrate/migrate"
+	_ "github.com/golang-migrate/migrate/database/stub" // TODO remove again
+	_ "github.com/golang-migrate/migrate/source/file"
 	"os"
 	"path/filepath"
 	"strconv"

diff --git a/cli/main.go b/cli/main.go
@@ -10,9 +10,9 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/golang-migrate/migrate/v3"
-	"github.com/golang-migrate/migrate/v3/database"
-	"github.com/golang-migrate/migrate/v3/source"
+	"github.com/golang-migrate/migrate"
+	"github.com/golang-migrate/migrate/database"
+	"github.com/golang-migrate/migrate/source"
 )
 
 const defaultTimeFormat = "20060102150405"

diff --git a/database/cassandra/cassandra.go b/database/cassandra/cassandra.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/gocql/gocql"
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate/database"
 )
 
 func init() {

diff --git a/database/cassandra/cassandra_test.go b/database/cassandra/cassandra_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/gocql/gocql"
 
-	dt "github.com/golang-migrate/migrate/v3/database/testing"
-	mt "github.com/golang-migrate/migrate/v3/testing"
+	dt "github.com/golang-migrate/migrate/database/testing"
+	mt "github.com/golang-migrate/migrate/testing"
 )
 
 var versions = []mt.Version{

diff --git a/database/clickhouse/clickhouse.go b/database/clickhouse/clickhouse.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/golang-migrate/migrate/v3"
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate"
+	"github.com/golang-migrate/migrate/database"
 )
 
 var DefaultMigrationsTable = "schema_migrations"

diff --git a/database/cockroachdb/cockroachdb.go b/database/cockroachdb/cockroachdb.go
@@ -17,8 +17,8 @@ import (
 )
 
 import (
-	"github.com/golang-migrate/migrate/v3"
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate"
+	"github.com/golang-migrate/migrate/database"
 )
 
 func init() {

diff --git a/database/cockroachdb/cockroachdb_test.go b/database/cockroachdb/cockroachdb_test.go
@@ -10,8 +10,8 @@ import (
 	"testing"
 
 	"bytes"
-	dt "github.com/golang-migrate/migrate/v3/database/testing"
-	mt "github.com/golang-migrate/migrate/v3/testing"
+	dt "github.com/golang-migrate/migrate/database/testing"
+	mt "github.com/golang-migrate/migrate/testing"
 	"github.com/lib/pq"
 )
 

diff --git a/database/mysql/mysql.go b/database/mysql/mysql.go
@@ -20,8 +20,8 @@ import (
 )
 
 import (
-	"github.com/golang-migrate/migrate/v3"
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate"
+	"github.com/golang-migrate/migrate/database"
 )
 
 func init() {

diff --git a/database/mysql/mysql_test.go b/database/mysql/mysql_test.go
@@ -13,8 +13,8 @@ import (
 )
 
 import (
-	dt "github.com/golang-migrate/migrate/v3/database/testing"
-	mt "github.com/golang-migrate/migrate/v3/testing"
+	dt "github.com/golang-migrate/migrate/database/testing"
+	mt "github.com/golang-migrate/migrate/testing"
 )
 
 var versions = []mt.Version{

diff --git a/database/postgres/postgres.go b/database/postgres/postgres.go
@@ -12,8 +12,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/golang-migrate/migrate/v3"
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate"
+	"github.com/golang-migrate/migrate/database"
 	"github.com/lib/pq"
 )
 

diff --git a/database/postgres/postgres_test.go b/database/postgres/postgres_test.go
@@ -13,8 +13,8 @@ import (
 	"strings"
 	"testing"
 
-	dt "github.com/golang-migrate/migrate/v3/database/testing"
-	mt "github.com/golang-migrate/migrate/v3/testing"
+	dt "github.com/golang-migrate/migrate/database/testing"
+	mt "github.com/golang-migrate/migrate/testing"
 )
 
 var versions = []mt.Version{

diff --git a/database/ql/ql.go b/database/ql/ql.go
@@ -10,8 +10,8 @@ import (
 	nurl "net/url"
 
 	_ "github.com/cznic/ql/driver"
-	"github.com/golang-migrate/migrate/v3"
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate"
+	"github.com/golang-migrate/migrate/database"
 )
 
 func init() {

diff --git a/database/ql/ql_test.go b/database/ql/ql_test.go
@@ -9,9 +9,9 @@ import (
 	"testing"
 
 	_ "github.com/cznic/ql/driver"
-	"github.com/golang-migrate/migrate/v3"
-	dt "github.com/golang-migrate/migrate/v3/database/testing"
-	_ "github.com/golang-migrate/migrate/v3/source/file"
+	"github.com/golang-migrate/migrate"
+	dt "github.com/golang-migrate/migrate/database/testing"
+	_ "github.com/golang-migrate/migrate/source/file"
 )
 
 func Test(t *testing.T) {

diff --git a/database/redshift/redshift.go b/database/redshift/redshift.go
@@ -3,8 +3,8 @@ package redshift
 import (
 	"net/url"
 
-	"github.com/golang-migrate/migrate/v3/database"
-	"github.com/golang-migrate/migrate/v3/database/postgres"
+	"github.com/golang-migrate/migrate/database"
+	"github.com/golang-migrate/migrate/database/postgres"
 )
 
 // init registers the driver under the name 'redshift'

diff --git a/database/spanner/spanner.go b/database/spanner/spanner.go
@@ -14,8 +14,8 @@ import (
 	"cloud.google.com/go/spanner"
 	sdb "cloud.google.com/go/spanner/admin/database/apiv1"
 
-	"github.com/golang-migrate/migrate/v3"
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate"
+	"github.com/golang-migrate/migrate/database"
 
 	"google.golang.org/api/iterator"
 	adminpb "google.golang.org/genproto/googleapis/spanner/admin/database/v1"

diff --git a/database/spanner/spanner_test.go b/database/spanner/spanner_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	dt "github.com/golang-migrate/migrate/v3/database/testing"
+	dt "github.com/golang-migrate/migrate/database/testing"
 )
 
 func Test(t *testing.T) {

diff --git a/database/sqlite3/sqlite3.go b/database/sqlite3/sqlite3.go
@@ -3,8 +3,8 @@ package sqlite3
 import (
 	"database/sql"
 	"fmt"
-	"github.com/golang-migrate/migrate/v3"
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate"
+	"github.com/golang-migrate/migrate/database"
 	_ "github.com/mattn/go-sqlite3"
 	"io"
 	"io/ioutil"

diff --git a/database/sqlite3/sqlite3_test.go b/database/sqlite3/sqlite3_test.go
@@ -3,9 +3,9 @@ package sqlite3
 import (
 	"database/sql"
 	"fmt"
-	"github.com/golang-migrate/migrate/v3"
-	dt "github.com/golang-migrate/migrate/v3/database/testing"
-	_ "github.com/golang-migrate/migrate/v3/source/file"
+	"github.com/golang-migrate/migrate"
+	dt "github.com/golang-migrate/migrate/database/testing"
+	_ "github.com/golang-migrate/migrate/source/file"
 	_ "github.com/mattn/go-sqlite3"
 	"io/ioutil"
 	"os"

diff --git a/database/stub/stub.go b/database/stub/stub.go
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"reflect"
 
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate/database"
 )
 
 func init() {

diff --git a/database/stub/stub_test.go b/database/stub/stub_test.go
@@ -3,7 +3,7 @@ package stub
 import (
 	"testing"
 
-	dt "github.com/golang-migrate/migrate/v3/database/testing"
+	dt "github.com/golang-migrate/migrate/database/testing"
 )
 
 func Test(t *testing.T) {

diff --git a/database/testing/testing.go b/database/testing/testing.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate/database"
 )
 
 // Test runs tests against database implementations.