From e30ea31eca5bd02e3e6fc390aba6a0832f4618b6 Mon Sep 17 00:00:00 2001 From: Elliot Chance Date: Mon, 29 Apr 2019 10:15:44 +1000 Subject: [PATCH] go modules: fix for v2 The module name must include the major version otherwise the package must be marked as incompatible. --- cmd_connection.go | 2 +- cmd_generic.go | 2 +- cmd_hash.go | 2 +- cmd_list.go | 2 +- cmd_pubsub.go | 2 +- cmd_scripting.go | 2 +- cmd_server.go | 2 +- cmd_set.go | 2 +- cmd_sorted_set.go | 2 +- cmd_string.go | 2 +- cmd_transactions.go | 2 +- example_test.go | 2 +- go.mod | 2 +- integration/generic_test.go | 2 +- integration/list_test.go | 2 +- integration/pubsub_test.go | 2 +- integration/test.go | 2 +- lua.go | 2 +- miniredis.go | 2 +- pubsub.go | 2 +- redis.go | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/cmd_connection.go b/cmd_connection.go index 78c13cd8..37b04ebc 100644 --- a/cmd_connection.go +++ b/cmd_connection.go @@ -5,7 +5,7 @@ package miniredis import ( "strconv" - "github.com/alicebob/miniredis/server" + "github.com/alicebob/miniredis/v2/server" ) func commandsConnection(m *Miniredis) { diff --git a/cmd_generic.go b/cmd_generic.go index 129df634..a9209ed8 100644 --- a/cmd_generic.go +++ b/cmd_generic.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/alicebob/miniredis/server" + "github.com/alicebob/miniredis/v2/server" ) // commandsGeneric handles EXPIRE, TTL, PERSIST, &c. diff --git a/cmd_hash.go b/cmd_hash.go index 78fffb2c..a1b8589d 100644 --- a/cmd_hash.go +++ b/cmd_hash.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/alicebob/miniredis/server" + "github.com/alicebob/miniredis/v2/server" ) // commandsHash handles all hash value operations. diff --git a/cmd_list.go b/cmd_list.go index 23aa62f4..d9521af6 100644 --- a/cmd_list.go +++ b/cmd_list.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/alicebob/miniredis/server" + "github.com/alicebob/miniredis/v2/server" ) type leftright int diff --git a/cmd_pubsub.go b/cmd_pubsub.go index 4763f9bf..41c94413 100644 --- a/cmd_pubsub.go +++ b/cmd_pubsub.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "github.com/alicebob/miniredis/server" + "github.com/alicebob/miniredis/v2/server" ) // commandsPubsub handles all PUB/SUB operations. diff --git a/cmd_scripting.go b/cmd_scripting.go index 65c6114b..fbec0fe5 100644 --- a/cmd_scripting.go +++ b/cmd_scripting.go @@ -12,7 +12,7 @@ import ( lua "github.com/yuin/gopher-lua" "github.com/yuin/gopher-lua/parse" - "github.com/alicebob/miniredis/server" + "github.com/alicebob/miniredis/v2/server" ) func commandsScripting(m *Miniredis) { diff --git a/cmd_server.go b/cmd_server.go index 1ed9ad2f..2f4b7156 100644 --- a/cmd_server.go +++ b/cmd_server.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/alicebob/miniredis/server" + "github.com/alicebob/miniredis/v2/server" ) func commandsServer(m *Miniredis) { diff --git a/cmd_set.go b/cmd_set.go index 4cb6ee1b..1ef93c5c 100644 --- a/cmd_set.go +++ b/cmd_set.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/alicebob/miniredis/server" + "github.com/alicebob/miniredis/v2/server" ) // commandsSet handles all set value operations. diff --git a/cmd_sorted_set.go b/cmd_sorted_set.go index afc0a632..9bff614f 100644 --- a/cmd_sorted_set.go +++ b/cmd_sorted_set.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/alicebob/miniredis/server" + "github.com/alicebob/miniredis/v2/server" ) var ( diff --git a/cmd_string.go b/cmd_string.go index b99a34bd..1dea14f7 100644 --- a/cmd_string.go +++ b/cmd_string.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/alicebob/miniredis/server" + "github.com/alicebob/miniredis/v2/server" ) // commandsString handles all string value operations. diff --git a/cmd_transactions.go b/cmd_transactions.go index d90ff73d..fe0e6f1c 100644 --- a/cmd_transactions.go +++ b/cmd_transactions.go @@ -3,7 +3,7 @@ package miniredis import ( - "github.com/alicebob/miniredis/server" + "github.com/alicebob/miniredis/v2/server" ) // commandsTransaction handles MULTI &c. diff --git a/example_test.go b/example_test.go index 72bbb93f..bd72fddd 100644 --- a/example_test.go +++ b/example_test.go @@ -3,7 +3,7 @@ package miniredis_test import ( "time" - "github.com/alicebob/miniredis" + "github.com/alicebob/miniredis/v2" "github.com/gomodule/redigo/redis" ) diff --git a/go.mod b/go.mod index f15be7b4..412b3492 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/alicebob/miniredis +module github.com/alicebob/miniredis/v2 require ( github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6 diff --git a/integration/generic_test.go b/integration/generic_test.go index b3f15480..e008cc28 100644 --- a/integration/generic_test.go +++ b/integration/generic_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/alicebob/miniredis" + "github.com/alicebob/miniredis/v2" ) func TestEcho(t *testing.T) { diff --git a/integration/list_test.go b/integration/list_test.go index 94a62e1e..4ad67f49 100644 --- a/integration/list_test.go +++ b/integration/list_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/alicebob/miniredis" + "github.com/alicebob/miniredis/v2" ) func TestLPush(t *testing.T) { diff --git a/integration/pubsub_test.go b/integration/pubsub_test.go index 2263fe88..909cd973 100644 --- a/integration/pubsub_test.go +++ b/integration/pubsub_test.go @@ -6,7 +6,7 @@ import ( "sync" "testing" - "github.com/alicebob/miniredis" + "github.com/alicebob/miniredis/v2" ) func TestSubscribe(t *testing.T) { diff --git a/integration/test.go b/integration/test.go index f55f8715..07f9bbef 100644 --- a/integration/test.go +++ b/integration/test.go @@ -12,7 +12,7 @@ import ( "sync" "testing" - "github.com/alicebob/miniredis" + "github.com/alicebob/miniredis/v2" "github.com/gomodule/redigo/redis" ) diff --git a/lua.go b/lua.go index 0487f874..31a6b995 100644 --- a/lua.go +++ b/lua.go @@ -4,7 +4,7 @@ import ( redigo "github.com/gomodule/redigo/redis" lua "github.com/yuin/gopher-lua" - "github.com/alicebob/miniredis/server" + "github.com/alicebob/miniredis/v2/server" ) func mkLuaFuncs(conn redigo.Conn) map[string]lua.LGFunction { diff --git a/miniredis.go b/miniredis.go index bd93cd04..923a543a 100644 --- a/miniredis.go +++ b/miniredis.go @@ -23,7 +23,7 @@ import ( redigo "github.com/gomodule/redigo/redis" - "github.com/alicebob/miniredis/server" + "github.com/alicebob/miniredis/v2/server" ) type hashKey map[string]string diff --git a/pubsub.go b/pubsub.go index 2d0f04ec..0a9b400d 100644 --- a/pubsub.go +++ b/pubsub.go @@ -5,7 +5,7 @@ import ( "sort" "sync" - "github.com/alicebob/miniredis/server" + "github.com/alicebob/miniredis/v2/server" ) // PubsubMessage is what gets broadcasted over pubsub channels. diff --git a/redis.go b/redis.go index ab353dbc..8b01a427 100644 --- a/redis.go +++ b/redis.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/alicebob/miniredis/server" + "github.com/alicebob/miniredis/v2/server" ) const (