Skip to content

Commit

Permalink
Remove arch package
Browse files Browse the repository at this point in the history
Remove the arch package from the utils module. The arch package
was only there to serve juju/juju directly. It dictated what was
supported in side of juju. The juju project should dictate what
architectures are supported, not a common utils package.

The arch package will be moved into juju/juju project, within the
core package.
  • Loading branch information
SimonRichardson committed Apr 25, 2023
1 parent 770ab8d commit e33db1f
Show file tree
Hide file tree
Showing 88 changed files with 99 additions and 273 deletions.
98 changes: 0 additions & 98 deletions arch/arch.go

This file was deleted.

65 changes: 0 additions & 65 deletions arch/arch_test.go

This file was deleted.

14 changes: 0 additions & 14 deletions arch/package_test.go

This file was deleted.

2 changes: 1 addition & 1 deletion attempt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

gc "gopkg.in/check.v1"

"github.com/juju/utils/v3"
"github.com/juju/utils/v4"
)

func doSomething() (int, error) { return 0, nil }
Expand Down
2 changes: 1 addition & 1 deletion bzr/bzr_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/utils/v3/bzr"
"github.com/juju/utils/v4/bzr"
)

func Test(t *stdtesting.T) {
Expand Down
2 changes: 1 addition & 1 deletion cache/cache_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
gc "gopkg.in/check.v1"
"gopkg.in/errgo.v1"

"github.com/juju/utils/v3/cache"
"github.com/juju/utils/v4/cache"
)

type suite struct{}
Expand Down
2 changes: 1 addition & 1 deletion cert/cert_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"time"

jc "github.com/juju/testing/checkers"
"github.com/juju/utils/v3/cert"
"github.com/juju/utils/v4/cert"
gc "gopkg.in/check.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion command_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/juju/testing"
gc "gopkg.in/check.v1"

"github.com/juju/utils/v3"
"github.com/juju/utils/v4"
)

type EnvironmentPatcher interface {
Expand Down
2 changes: 1 addition & 1 deletion context_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/utils/v3"
"github.com/juju/utils/v4"
)

type contextSuite struct{}
Expand Down
2 changes: 1 addition & 1 deletion exec/exec_linux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/utils/v3/exec"
"github.com/juju/utils/v4/exec"
)

// 0 is thrown by linux because RunParams.Wait
Expand Down
2 changes: 1 addition & 1 deletion exec/exec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
gc "gopkg.in/check.v1"

"github.com/juju/clock"
"github.com/juju/utils/v3/exec"
"github.com/juju/utils/v4/exec"
)

type execSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion exec/exec_windows_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/utils/v3/exec"
"github.com/juju/utils/v4/exec"
)

// 1 is thrown by powershell after the a command is cancelled
Expand Down
2 changes: 1 addition & 1 deletion file_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/utils/v3"
"github.com/juju/utils/v4"
)

type fileSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion file_unix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
gc "gopkg.in/check.v1"

"github.com/juju/errors"
"github.com/juju/utils/v3"
"github.com/juju/utils/v4"
)

type unixFileSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion file_windows_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ package utils_test
import (
gc "gopkg.in/check.v1"

"github.com/juju/utils/v3"
"github.com/juju/utils/v4"
)

type windowsFileSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion filepath/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/juju/testing"
gc "gopkg.in/check.v1"

"github.com/juju/utils/v3/filepath"
"github.com/juju/utils/v4/filepath"
)

var _ = gc.Suite(&commonSuite{})
Expand Down
2 changes: 1 addition & 1 deletion filepath/filepath.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"

"github.com/juju/errors"
"github.com/juju/utils/v3"
"github.com/juju/utils/v4"
)

// Renderer provides methods for the different functions in
Expand Down
4 changes: 2 additions & 2 deletions filepath/filepath_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"github.com/juju/errors"
"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/utils/v3/filepath"
"github.com/juju/utils/v4/filepath"
)

type filepathSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion filepath/stdlib_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/utils/v3/filepath"
"github.com/juju/utils/v4/filepath"
)

// The tests here are mostly just sanity checks against the behavior
Expand Down
2 changes: 1 addition & 1 deletion filepath/unix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/utils/v3/filepath"
"github.com/juju/utils/v4/filepath"
)

var _ = gc.Suite(&unixSuite{})
Expand Down
2 changes: 1 addition & 1 deletion filepath/win_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/utils/v3/filepath"
"github.com/juju/utils/v4/filepath"
)

var _ = gc.Suite(&windowsSuite{})
Expand Down
2 changes: 1 addition & 1 deletion filestorage/fakes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/utils/v3/filestorage"
"github.com/juju/utils/v4/filestorage"
)

// FakeMetadataStorage is used as a DocStorage and MetadataStorage for
Expand Down
2 changes: 1 addition & 1 deletion filestorage/metadata_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/juju/testing"
gc "gopkg.in/check.v1"

"github.com/juju/utils/v3/filestorage"
"github.com/juju/utils/v4/filestorage"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion filestorage/wrapper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/utils/v3/filestorage"
"github.com/juju/utils/v4/filestorage"
)

var _ = gc.Suite(&WrapperSuite{})
Expand Down
2 changes: 1 addition & 1 deletion fs/copy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
ft "github.com/juju/testing/filetesting"
gc "gopkg.in/check.v1"

"github.com/juju/utils/v3/fs"
"github.com/juju/utils/v4/fs"
)

type copySuite struct{}
Expand Down
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/juju/utils/v3
module github.com/juju/utils/v4

go 1.17

Expand Down Expand Up @@ -35,6 +35,7 @@ require (
github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d // 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/utils/v3 v3.0.0-20220202114721-338bb0530e89 // indirect
github.com/juju/version/v2 v2.0.0-20211007103408-2e8da085dc23 // indirect
github.com/kr/pretty v0.2.1 // indirect
github.com/kr/text v0.2.0 // indirect
Expand Down
Loading

0 comments on commit e33db1f

Please sign in to comment.