Merge pull request #112 from wallyworld/update-loggo-dep

#112

Update the upstream loggo dependency to v2, which also needs a bump in the upstream testing dependency version.

Because this breaks the api compatibility, the module version is bumped to v4.

Makefile

@@ -7,5 +7,5 @@ check:
 	go test
 
 docs:
-	godoc2md github.com/juju/cmd/v3 > README.md
+	godoc2md github.com/juju/cmd/v4 > README.md
 

README.md

@@ -1,6 +1,6 @@
 
 # cmd
-    import "github.com/juju/cmd/v3"
+    import "github.com/juju/cmd/v4"
 
 
 
@@ -944,4 +944,4 @@ logging writer for a specified output target.
 
 
 - - -
-Generated by [godoc2md](http://godoc.org/github.com/davecheney/godoc2md)
+Generated by [godoc2md](http://godoc.org/github.com/davecheney/godoc2md)

aliasfile_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/juju/testing"
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/cmd/v3"
+	"github.com/juju/cmd/v4"
 )
 
 type ParseAliasFileSuite struct {

args_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/juju/testing"
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/cmd/v3"
+	"github.com/juju/cmd/v4"
 )
 
 type ArgsSuite struct {

cmd.go

@@ -18,8 +18,8 @@ import (
 
 	"github.com/juju/ansiterm"
 	"github.com/juju/gnuflag"
-	"github.com/juju/loggo"
-	"github.com/juju/utils/v3"
+	"github.com/juju/loggo/v2"
+	"github.com/juju/utils/v4"
 )
 
 // RcPassthroughError indicates that a Juju plugin command exited with a

cmd_test.go

@@ -11,15 +11,15 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/juju/loggo"
+	"github.com/juju/loggo/v2"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
 	"github.com/juju/gnuflag"
 	"github.com/juju/testing"
 
-	"github.com/juju/cmd/v3"
-	"github.com/juju/cmd/v3/cmdtesting"
+	"github.com/juju/cmd/v4"
+	"github.com/juju/cmd/v4/cmdtesting"
 )
 
 var _ = gc.Suite(&CmdSuite{})

cmdtesting/cmd.go

@@ -11,7 +11,7 @@ import (
 	"github.com/juju/gnuflag"
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/cmd/v3"
+	"github.com/juju/cmd/v4"
 )
 
 // NewFlagSet creates a new flag set using the standard options, particularly
@@ -43,7 +43,7 @@ func Context(c *gc.C) *cmd.Context {
 		Stdout: &bytes.Buffer{},
 		Stderr: &bytes.Buffer{},
 	}
-	ctx.Context = context.TODO()
+	ctx.Context = context.Background()
 	return ctx
 }
 
@@ -56,7 +56,7 @@ func ContextForDir(c *gc.C, dir string) *cmd.Context {
 		Stdout: &bytes.Buffer{},
 		Stderr: &bytes.Buffer{},
 	}
-	ctx.Context = context.TODO()
+	ctx.Context = context.Background()
 	return ctx
 }
 

cmdtesting/prompt.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/juju/errors"
-	"github.com/juju/loggo"
+	"github.com/juju/loggo/v2"
 	gc "gopkg.in/check.v1"
 )
 

cmdtesting/prompt_test.go

@@ -14,7 +14,7 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/cmd/v3/cmdtesting"
+	"github.com/juju/cmd/v4/cmdtesting"
 )
 
 type prompterSuite struct {

documentation_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/juju/gnuflag"
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/cmd/v3"
+	"github.com/juju/cmd/v4"
 )
 
 type documentationSuite struct{}

filevar.go

@@ -9,7 +9,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/juju/utils/v3"
+	"github.com/juju/utils/v4"
 )
 
 // FileVar represents a path to a file.

filevar_test.go

@@ -13,11 +13,11 @@ import (
 	"github.com/juju/gnuflag"
 	gitjujutesting "github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
-	"github.com/juju/utils/v3"
+	"github.com/juju/utils/v4"
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/cmd/v3"
-	"github.com/juju/cmd/v3/cmdtesting"
+	"github.com/juju/cmd/v4"
+	"github.com/juju/cmd/v4/cmdtesting"
 )
 
 type FileVarSuite struct {

go.mod

@@ -1,30 +1,31 @@
-module github.com/juju/cmd/v3
+module github.com/juju/cmd/v4
 
-go 1.17
+go 1.21
+
+toolchain go1.21.6
 
 require (
-	github.com/juju/ansiterm v0.0.0-20210706145210-9283cdf370b5
-	github.com/juju/errors v0.0.0-20220203013757-bd733f3c86b9
-	github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d
-	github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4
-	github.com/juju/testing v0.0.0-20220203020004-a0ff61f03494
-	github.com/juju/utils/v3 v3.0.0-20220203023959-c3fbc78a33b0
+	github.com/juju/ansiterm v1.0.0
+	github.com/juju/errors v1.0.0
+	github.com/juju/gnuflag v1.0.0
+	github.com/juju/loggo/v2 v2.0.0
+	github.com/juju/testing v1.2.0
+	github.com/juju/utils/v4 v4.0.0
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
-	github.com/juju/clock v0.0.0-20220203021603-d9deb868a28a // indirect
-	github.com/juju/collections v0.0.0-20220203020748-febd7cad8a7a // indirect
-	github.com/juju/mgo/v2 v2.0.0-20210302023703-70d5d206e208 // indirect
-	github.com/juju/retry v0.0.0-20180821225755-9058e192b216 // indirect
-	github.com/juju/version/v2 v2.0.0-20211007103408-2e8da085dc23 // indirect
-	github.com/kr/pretty v0.2.1 // indirect
+	github.com/juju/clock v1.0.3 // indirect
+	github.com/juju/loggo v1.0.0 // indirect
+	github.com/juju/utils/v3 v3.1.0 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/lunixbochs/vtclean v1.0.0 // indirect
-	github.com/mattn/go-colorable v0.1.8 // indirect
-	github.com/mattn/go-isatty v0.0.13 // indirect
-	golang.org/x/crypto v0.1.0 // indirect
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
+	github.com/mattn/go-colorable v0.1.10 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/rogpeppe/go-internal v1.9.0 // indirect
+	golang.org/x/crypto v0.19.0 // indirect
+	golang.org/x/net v0.21.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
 )