Remove gopkg.in

.travis.yml

@@ -6,8 +6,8 @@ services:
 
 go:
   - 1.4
-  - 1.6
   - 1.7
+  - 1.8
   - tip
 
 matrix:
@@ -18,5 +18,3 @@ matrix:
 install:
   - go get github.com/onsi/ginkgo
   - go get github.com/onsi/gomega
-  - mkdir -p $HOME/gopath/src/gopkg.in
-  - mv `pwd` $HOME/gopath/src/gopkg.in/redis.v5

bench_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 )
 
 func benchmarkRedisClient(poolSize int) *redis.Client {

cluster.go

@@ -7,10 +7,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"gopkg.in/redis.v5/internal"
-	"gopkg.in/redis.v5/internal/hashtag"
-	"gopkg.in/redis.v5/internal/pool"
-	"gopkg.in/redis.v5/internal/proto"
+	"github.com/go-redis/redis/internal"
+	"github.com/go-redis/redis/internal/hashtag"
+	"github.com/go-redis/redis/internal/pool"
+	"github.com/go-redis/redis/internal/proto"
 )
 
 var errClusterNoNodes = internal.RedisError("redis: cluster has no nodes")

cluster_test.go

@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/redis.v5"
-	"gopkg.in/redis.v5/internal/hashtag"
+	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/internal/hashtag"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"

command.go

@@ -7,9 +7,9 @@ import (
 	"strings"
 	"time"
 
-	"gopkg.in/redis.v5/internal"
-	"gopkg.in/redis.v5/internal/pool"
-	"gopkg.in/redis.v5/internal/proto"
+	"github.com/go-redis/redis/internal"
+	"github.com/go-redis/redis/internal/pool"
+	"github.com/go-redis/redis/internal/proto"
 )
 
 var (

command_test.go

@@ -1,10 +1,10 @@
 package redis_test
 
 import (
+	"github.com/go-redis/redis"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5"
 )
 
 var _ = Describe("Cmd", func() {

commands.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"time"
 
-	"gopkg.in/redis.v5/internal"
+	"github.com/go-redis/redis/internal"
 )
 
 func readTimeout(timeout time.Duration) time.Duration {

commands_test.go

@@ -9,7 +9,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 )
 
 var _ = Describe("Commands", func() {

example_instrumentation_test.go

@@ -5,7 +5,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	redis "gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 )
 
 func Example_instrumentation() {

example_test.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 )
 
 var client *redis.Client

export_test.go

@@ -3,7 +3,7 @@ package redis
 import (
 	"time"
 
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 func (c *baseClient) Pool() pool.Pooler {

internal/pool/bench_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 func benchmarkPoolGetPut(b *testing.B, poolSize int) {

internal/pool/conn.go

@@ -5,7 +5,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"gopkg.in/redis.v5/internal/proto"
+	"github.com/go-redis/redis/internal/proto"
 )
 
 var noDeadline = time.Time{}

internal/pool/pool.go

@@ -8,7 +8,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"gopkg.in/redis.v5/internal"
+	"github.com/go-redis/redis/internal"
 )
 
 var (

internal/pool/pool_test.go

@@ -5,10 +5,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-redis/redis/internal/pool"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5/internal/pool"
 )
 
 var _ = Describe("ConnPool", func() {

internal/proto/reader.go

@@ -6,7 +6,7 @@ import (
 	"io"
 	"strconv"
 
-	"gopkg.in/redis.v5/internal"
+	"github.com/go-redis/redis/internal"
 )
 
 const bytesAllocLimit = 1024 * 1024 // 1mb

internal/proto/reader_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"gopkg.in/redis.v5/internal/proto"
+	"github.com/go-redis/redis/internal/proto"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"

internal/proto/scan.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"gopkg.in/redis.v5/internal"
+	"github.com/go-redis/redis/internal"
 )
 
 func Scan(b []byte, v interface{}) error {

internal/proto/write_buffer_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/redis.v5/internal/proto"
+	"github.com/go-redis/redis/internal/proto"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"

iterator_test.go

@@ -3,10 +3,10 @@ package redis_test
 import (
 	"fmt"
 
+	"github.com/go-redis/redis"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5"
 )
 
 var _ = Describe("ScanIterator", func() {

main_test.go

@@ -12,10 +12,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-redis/redis"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5"
 )
 
 const (
@@ -95,7 +95,7 @@ var _ = AfterSuite(func() {
 
 func TestGinkgoSuite(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "gopkg.in/redis.v5")
+	RunSpecs(t, "go-redis")
 }
 
 //------------------------------------------------------------------------------

options.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 type Options struct {

parser.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"time"
 
-	"gopkg.in/redis.v5/internal/proto"
+	"github.com/go-redis/redis/internal/proto"
 )
 
 // Implements proto.MultiBulkParse

pipeline.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"sync"
 
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 type pipelineExecer func([]Cmder) error

pipeline_test.go

@@ -1,7 +1,7 @@
 package redis_test
 
 import (
-	"gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"

pool_test.go

@@ -3,10 +3,10 @@ package redis_test
 import (
 	"time"
 
+	"github.com/go-redis/redis"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5"
 )
 
 var _ = Describe("pool", func() {

pubsub.go

@@ -6,8 +6,8 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/redis.v5/internal"
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 // PubSub implements Pub/Sub commands as described in

pubsub_test.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"

race_test.go

@@ -8,10 +8,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-redis/redis"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5"
 )
 
 var _ = Describe("races", func() {

redis.go

@@ -1,13 +1,13 @@
-package redis // import "gopkg.in/redis.v5"
+package redis
 
 import (
 	"fmt"
 	"log"
 	"time"
 
-	"gopkg.in/redis.v5/internal"
-	"gopkg.in/redis.v5/internal/pool"
-	"gopkg.in/redis.v5/internal/proto"
+	"github.com/go-redis/redis/internal"
+	"github.com/go-redis/redis/internal/pool"
+	"github.com/go-redis/redis/internal/proto"
 )
 
 // Redis nil reply, .e.g. when key does not exist.

redis_context.go

@@ -5,7 +5,7 @@ package redis
 import (
 	"context"
 
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 type baseClient struct {

redis_no_context.go

@@ -3,7 +3,7 @@
 package redis
 
 import (
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 type baseClient struct {

redis_test.go

@@ -5,7 +5,7 @@ import (
 	"net"
 	"time"
 
-	"gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"

ring.go

@@ -9,10 +9,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"gopkg.in/redis.v5/internal"
-	"gopkg.in/redis.v5/internal/consistenthash"
-	"gopkg.in/redis.v5/internal/hashtag"
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal"
+	"github.com/go-redis/redis/internal/consistenthash"
+	"github.com/go-redis/redis/internal/hashtag"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 var errRingShardsDown = errors.New("redis: all ring shards are down")

ring_test.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/go-redis/redis"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5"
 )
 
 var _ = Describe("Redis Ring", func() {

sentinel.go

@@ -8,8 +8,8 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/redis.v5/internal"
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 //------------------------------------------------------------------------------

sentinel_test.go

@@ -1,10 +1,10 @@
 package redis_test
 
 import (
+	"github.com/go-redis/redis"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5"
 )
 
 var _ = Describe("Sentinel", func() {

tx.go

@@ -1,8 +1,8 @@
 package redis
 
 import (
-	"gopkg.in/redis.v5/internal"
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 // Redis transaction failed.

tx_test.go

@@ -4,10 +4,10 @@ import (
 	"strconv"
 	"sync"
 
+	"github.com/go-redis/redis"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5"
 )
 
 var _ = Describe("Tx", func() {