mod fixes

crdb/crdbgorm/gorm.go

@@ -17,7 +17,7 @@ package crdbgorm
 import (
 	"context"
 	"database/sql"
-	"github.com/cockroachdb/cockroach-go/crdb"
+	"github.com/cockroachdb/cockroach-go/v2/crdb"
 	"github.com/jinzhu/gorm"
 )
 

crdb/crdbgorm/gorm_test.go

@@ -18,8 +18,8 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"github.com/cockroachdb/cockroach-go/crdb"
-	"github.com/cockroachdb/cockroach-go/testserver"
+	"github.com/cockroachdb/cockroach-go/v2/crdb"
+	"github.com/cockroachdb/cockroach-go/v2/testserver"
 	"github.com/jinzhu/gorm"
 	"testing"
 )

crdb/crdbpgx/pgx.go

@@ -16,7 +16,7 @@ package crdbpgx
 
 import (
 	"context"
-	"github.com/cockroachdb/cockroach-go/crdb"
+	"github.com/cockroachdb/cockroach-go/v2/crdb"
 
 	"github.com/jackc/pgx/v4"
 )

crdb/crdbpgx/pgx_test.go

@@ -18,8 +18,8 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"github.com/cockroachdb/cockroach-go/crdb"
-	"github.com/cockroachdb/cockroach-go/testserver"
+	"github.com/cockroachdb/cockroach-go/v2/crdb"
+	"github.com/cockroachdb/cockroach-go/v2/testserver"
 	"github.com/jackc/pgx/v4"
 	"github.com/jackc/pgx/v4/pgxpool"
 	"testing"

crdb/tx_test.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/cockroachdb/cockroach-go/testserver"
+	"github.com/cockroachdb/cockroach-go/v2/testserver"
 )
 
 // TestExecuteTx verifies transaction retry using the classic

go.mod

@@ -1,66 +1,14 @@
-module github.com/cockroachdb/cockroach-go
+module github.com/cockroachdb/cockroach-go/v2
 
 go 1.13
 
 require (
-	fyne.io/fyne v1.2.4 // indirect
-	github.com/BurntSushi/xgb v0.0.0-20200324125942-20f126ea2843 // indirect
-	github.com/aclements/go-gg v0.0.0-20170323211221-abd1f791f5ee // indirect
-	github.com/aclements/go-moremath v0.0.0-20190830160640-d16893ddf098 // indirect
-	github.com/ajstarks/deck v0.0.0-20200418042010-55a9856ad60e // indirect
-	github.com/ajstarks/deck/generate v0.0.0-20200418042010-55a9856ad60e // indirect
-	github.com/ajstarks/fc v0.0.0-20200408135412-652ab2b4470d // indirect
-	github.com/ajstarks/svgo v0.0.0-20200320125537-f189e35d30ca // indirect
-	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
-	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
-	github.com/cznic/cc v0.0.0-20181122101902-d673e9b70d4d // indirect
-	github.com/cznic/fileutil v0.0.0-20181122101858-4d67cfea8c87 // indirect
-	github.com/cznic/golex v0.0.0-20181122101858-9c343928389c // indirect
-	github.com/cznic/internal v0.0.0-20181122101858-3279554c546e // indirect
-	github.com/cznic/ir v0.0.0-20181122101859-da7ba2ecce8b // indirect
-	github.com/cznic/lex v0.0.0-20181122101858-ce0fb5e9bb1b // indirect
-	github.com/cznic/lexer v0.0.0-20181122101858-e884d4bd112e // indirect
-	github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect
-	github.com/cznic/strutil v0.0.0-20181122101858-275e90344537 // indirect
-	github.com/cznic/xc v0.0.0-20181122101856-45b06973881e // indirect
-	github.com/disintegration/gift v1.2.1 // indirect
-	github.com/edsrzf/mmap-go v1.0.0 // indirect
-	github.com/fogleman/gg v1.3.0 // indirect
-	github.com/garyburd/redigo v1.6.0 // indirect
-	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/godbus/dbus v4.1.0+incompatible // indirect
-	github.com/gogo/protobuf v1.3.1 // indirect
-	github.com/goji/param v0.0.0-20160927210335-d7f49fd7d1ed // indirect
-	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
-	github.com/gonum/blas v0.0.0-20181208220705-f22b278b28ac // indirect
-	github.com/gonum/floats v0.0.0-20181209220543-c233463c7e82 // indirect
-	github.com/gonum/internal v0.0.0-20181124074243-f884aa714029 // indirect
-	github.com/gonum/lapack v0.0.0-20181123203213-e4cdc5a0bff9 // indirect
-	github.com/gonum/matrix v0.0.0-20181209220409-c518dec07be9 // indirect
-	github.com/google/pprof v0.0.0-20200417002340-c6e0a841f49a // indirect
-	github.com/googleapis/gax-go v2.0.2+incompatible // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.14.4 // indirect
-	github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334 // indirect
-	github.com/inconshreveable/log15 v0.0.0-20200109203555-b30bc20e4fd1 // indirect
 	github.com/jackc/pgx/v4 v4.6.0
 	github.com/jinzhu/gorm v1.9.12
-	github.com/jung-kurt/gofpdf v1.16.2 // indirect
 	github.com/lib/pq v1.4.0
-	github.com/lyft/protoc-gen-star v0.4.14 // indirect
-	github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d // indirect
-	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pkg/sftp v1.11.0 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
-	github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd // indirect
 	github.com/shopspring/decimal v0.0.0-20200419222939-1884f454f8ea // indirect
-	github.com/spf13/afero v1.2.2 // indirect
-	github.com/syndtr/goleveldb v1.0.0 // indirect
-	golang.org/x/build v0.0.0-20200420204122-5910a274a238 // indirect
-	golang.org/x/image v0.0.0-20200119044424-58c23975cae1 // indirect
-	golang.org/x/mobile v0.0.0-20200329125638-4c31acba0007 // indirect
-	golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect
-	google.golang.org/api v0.22.0 // indirect
-	google.golang.org/genproto v0.0.0-20200420144010-e5e8543f8aeb // indirect
-	gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 // indirect
+	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
+	google.golang.org/appengine v1.6.5 // indirect
+	gopkg.in/yaml.v2 v2.2.3 // indirect
 )