Skip to content

Commit

Permalink
V5 (#88)
Browse files Browse the repository at this point in the history 
* Bump to v5.

* Update all deps.
  • Loading branch information
@sb10
sb10 authored Aug 23, 2024
1 parent eb7cd99 commit b4dd962
Show file tree
Hide file tree
Showing 44 changed files with 160 additions and 169 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PKG := github.com/wtsi-ssg/wrstat/v4
PKG := github.com/wtsi-ssg/wrstat/v5
VERSION := $(shell git describe --tags --always --long --dirty)
TAG := $(shell git describe --abbrev=0 --tags)
LDFLAGS = -ldflags "-X ${PKG}/cmd.Version=${VERSION}"
Expand Down
2 changes: 1 addition & 1 deletion basedirs/basedirs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"strings"

"github.com/ugorji/go/codec"
"github.com/wtsi-ssg/wrstat/v4/dgut"
"github.com/wtsi-ssg/wrstat/v5/dgut"
)

// BaseDirs is used to summarise disk usage information by base directory and
Expand Down
12 changes: 6 additions & 6 deletions basedirs/basedirs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ import (
"time"

. "github.com/smartystreets/goconvey/convey"
"github.com/wtsi-ssg/wrstat/v4/dgut"
internaldata "github.com/wtsi-ssg/wrstat/v4/internal/data"
internaldb "github.com/wtsi-ssg/wrstat/v4/internal/db"
"github.com/wtsi-ssg/wrstat/v4/internal/fixtimes"
"github.com/wtsi-ssg/wrstat/v4/internal/fs"
"github.com/wtsi-ssg/wrstat/v4/summary"
"github.com/wtsi-ssg/wrstat/v5/dgut"
internaldata "github.com/wtsi-ssg/wrstat/v5/internal/data"
internaldb "github.com/wtsi-ssg/wrstat/v5/internal/db"
"github.com/wtsi-ssg/wrstat/v5/internal/fixtimes"
"github.com/wtsi-ssg/wrstat/v5/internal/fs"
"github.com/wtsi-ssg/wrstat/v5/summary"
bolt "go.etcd.io/bbolt"
)

Expand Down
4 changes: 2 additions & 2 deletions basedirs/db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ import (
"time"

"github.com/ugorji/go/codec"
"github.com/wtsi-ssg/wrstat/v4/dgut"
"github.com/wtsi-ssg/wrstat/v4/summary"
"github.com/wtsi-ssg/wrstat/v5/dgut"
"github.com/wtsi-ssg/wrstat/v5/summary"
bolt "go.etcd.io/bbolt"
)

Expand Down
2 changes: 1 addition & 1 deletion basedirs/quotas_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"testing"

. "github.com/smartystreets/goconvey/convey"
internaldata "github.com/wtsi-ssg/wrstat/v4/internal/data"
internaldata "github.com/wtsi-ssg/wrstat/v5/internal/data"
)

func TestQuotas(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion basedirs/tree.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
package basedirs

import (
"github.com/wtsi-ssg/wrstat/v4/dgut"
"github.com/wtsi-ssg/wrstat/v5/dgut"
)

// getAllGIDsandUIDsInTree gets all the unix group and user IDs that own files
Expand Down
4 changes: 2 additions & 2 deletions basedirs/tree_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"testing"

. "github.com/smartystreets/goconvey/convey"
internaldata "github.com/wtsi-ssg/wrstat/v4/internal/data"
internaldb "github.com/wtsi-ssg/wrstat/v4/internal/db"
internaldata "github.com/wtsi-ssg/wrstat/v5/internal/data"
internaldb "github.com/wtsi-ssg/wrstat/v5/internal/db"
)

func TestTree(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion basedirs/tsv.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strconv"
"strings"

"github.com/wtsi-ssg/wrstat/v4/internal/split"
"github.com/wtsi-ssg/wrstat/v5/internal/split"
)

type ConfigAttrs struct {
Expand Down
6 changes: 3 additions & 3 deletions cmd/basedir.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ import (
"time"

"github.com/spf13/cobra"
"github.com/wtsi-ssg/wrstat/v4/basedirs"
"github.com/wtsi-ssg/wrstat/v4/dgut"
ifs "github.com/wtsi-ssg/wrstat/v4/internal/fs"
"github.com/wtsi-ssg/wrstat/v5/basedirs"
"github.com/wtsi-ssg/wrstat/v5/dgut"
ifs "github.com/wtsi-ssg/wrstat/v5/internal/fs"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/chtsv.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"os"

"github.com/spf13/cobra"
"github.com/wtsi-ssg/wrstat/v4/ch"
"github.com/wtsi-ssg/wrstat/v5/ch"
)

// chtsvCmd represents the chtsv command.
Expand Down
2 changes: 1 addition & 1 deletion cmd/cleanup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"path/filepath"

"github.com/spf13/cobra"
"github.com/wtsi-ssg/wrstat/v4/neaten"
"github.com/wtsi-ssg/wrstat/v5/neaten"
)

const uniqueLen = 20
Expand Down
4 changes: 2 additions & 2 deletions cmd/combine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"sync"

"github.com/spf13/cobra"
"github.com/wtsi-ssg/wrstat/v4/combine"
"github.com/wtsi-ssg/wrstat/v4/fs"
"github.com/wtsi-ssg/wrstat/v5/combine"
"github.com/wtsi-ssg/wrstat/v5/fs"
)

const combineStatsOutputFileBasename = "combine.stats.gz"
Expand Down
2 changes: 1 addition & 1 deletion cmd/mergedbs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ package cmd

import (
"github.com/spf13/cobra"
"github.com/wtsi-ssg/wrstat/v4/merge"
"github.com/wtsi-ssg/wrstat/v5/merge"
)

const mergeArgs = 2
Expand Down
4 changes: 2 additions & 2 deletions cmd/multi.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (
"github.com/VertebrateResequencing/wr/jobqueue"
jqs "github.com/VertebrateResequencing/wr/jobqueue/scheduler"
"github.com/spf13/cobra"
"github.com/wtsi-ssg/wrstat/v4/merge"
"github.com/wtsi-ssg/wrstat/v4/scheduler"
"github.com/wtsi-ssg/wrstat/v5/merge"
"github.com/wtsi-ssg/wrstat/v5/scheduler"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
"github.com/VertebrateResequencing/wr/jobqueue"
"github.com/inconshreveable/log15"
"github.com/spf13/cobra"
"github.com/wtsi-ssg/wrstat/v4/scheduler"
"github.com/wtsi-ssg/wrstat/v5/scheduler"
)

const userGroupPerm = 0770
Expand Down
6 changes: 3 additions & 3 deletions cmd/stat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ import (
"time"

"github.com/spf13/cobra"
"github.com/wtsi-ssg/wrstat/v4/ch"
"github.com/wtsi-ssg/wrstat/v4/stat"
"github.com/wtsi-ssg/wrstat/v4/summary"
"github.com/wtsi-ssg/wrstat/v5/ch"
"github.com/wtsi-ssg/wrstat/v5/stat"
"github.com/wtsi-ssg/wrstat/v5/summary"
)

const reportFrequency = 10 * time.Minute
Expand Down
2 changes: 1 addition & 1 deletion cmd/tidy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"path/filepath"

"github.com/spf13/cobra"
"github.com/wtsi-ssg/wrstat/v4/neaten"
"github.com/wtsi-ssg/wrstat/v5/neaten"
)

// destDirPerms are the permissions of the dest directory, to be used in making
Expand Down
4 changes: 2 additions & 2 deletions cmd/walk.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (

"github.com/VertebrateResequencing/wr/jobqueue"
"github.com/spf13/cobra"
"github.com/wtsi-ssg/wrstat/v4/scheduler"
"github.com/wtsi-ssg/wrstat/v4/walk"
"github.com/wtsi-ssg/wrstat/v5/scheduler"
"github.com/wtsi-ssg/wrstat/v5/walk"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion combine/combine_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"testing"

. "github.com/smartystreets/goconvey/convey"
"github.com/wtsi-ssg/wrstat/v4/fs"
"github.com/wtsi-ssg/wrstat/v5/fs"
)

// TestConcatenateMergeAndCompress tests the concat, merge, and compress
Expand Down
2 changes: 1 addition & 1 deletion combine/dgut.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package combine
import (
"io"

"github.com/wtsi-ssg/wrstat/v4/dgut"
"github.com/wtsi-ssg/wrstat/v5/dgut"
)

const dgutStoreBatchSize = 10000
Expand Down
6 changes: 3 additions & 3 deletions combine/dgut_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ import (
"testing"

. "github.com/smartystreets/goconvey/convey"
"github.com/wtsi-ssg/wrstat/v4/dgut"
"github.com/wtsi-ssg/wrstat/v4/fs"
"github.com/wtsi-ssg/wrstat/v4/summary"
"github.com/wtsi-ssg/wrstat/v5/dgut"
"github.com/wtsi-ssg/wrstat/v5/fs"
"github.com/wtsi-ssg/wrstat/v5/summary"
)

// TestDGUTFiles tests that the DGUT files merge properly to the output.
Expand Down
2 changes: 1 addition & 1 deletion combine/log_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"testing"

. "github.com/smartystreets/goconvey/convey"
"github.com/wtsi-ssg/wrstat/v4/fs"
"github.com/wtsi-ssg/wrstat/v5/fs"
)

// TestLogFiles tests that the log files merge and compress properly.
Expand Down
2 changes: 1 addition & 1 deletion combine/stat_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"testing"

. "github.com/smartystreets/goconvey/convey"
"github.com/wtsi-ssg/wrstat/v4/fs"
"github.com/wtsi-ssg/wrstat/v5/fs"
)

// TestStatFiles tests that the stat files concatenate and compress properly.
Expand Down
2 changes: 1 addition & 1 deletion combine/usergroup_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"testing"

. "github.com/smartystreets/goconvey/convey"
"github.com/wtsi-ssg/wrstat/v4/fs"
"github.com/wtsi-ssg/wrstat/v5/fs"
)

// TestByUserGroupFiles tests that the .byusergroup files merge and compress
Expand Down
2 changes: 1 addition & 1 deletion dgut/db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (

"github.com/hashicorp/go-multierror"
"github.com/ugorji/go/codec"
"github.com/wtsi-ssg/wrstat/v4/summary"
"github.com/wtsi-ssg/wrstat/v5/summary"
bolt "go.etcd.io/bbolt"
)

Expand Down
2 changes: 1 addition & 1 deletion dgut/dgut.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ package dgut

import (
"github.com/ugorji/go/codec"
"github.com/wtsi-ssg/wrstat/v4/summary"
"github.com/wtsi-ssg/wrstat/v5/summary"
)

// DGUT handles all the *GUT information for a directory.
Expand Down
4 changes: 2 additions & 2 deletions dgut/dgut_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (

. "github.com/smartystreets/goconvey/convey"
"github.com/ugorji/go/codec"
internaldata "github.com/wtsi-ssg/wrstat/v4/internal/data"
"github.com/wtsi-ssg/wrstat/v4/summary"
internaldata "github.com/wtsi-ssg/wrstat/v5/internal/data"
"github.com/wtsi-ssg/wrstat/v5/summary"
bolt "go.etcd.io/bbolt"
)

Expand Down
2 changes: 1 addition & 1 deletion dgut/gut.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"sort"
"time"

"github.com/wtsi-ssg/wrstat/v4/summary"
"github.com/wtsi-ssg/wrstat/v5/summary"
"golang.org/x/exp/constraints"
)

Expand Down
2 changes: 1 addition & 1 deletion dgut/parse.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"strconv"
"strings"

"github.com/wtsi-ssg/wrstat/v4/summary"
"github.com/wtsi-ssg/wrstat/v5/summary"
)

type Error string
Expand Down
4 changes: 2 additions & 2 deletions dgut/tree.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"sort"
"time"

"github.com/wtsi-ssg/wrstat/v4/internal/split"
"github.com/wtsi-ssg/wrstat/v4/summary"
"github.com/wtsi-ssg/wrstat/v5/internal/split"
"github.com/wtsi-ssg/wrstat/v5/summary"
)

// Tree is used to do high-level queries on DB.Store() database files.
Expand Down
8 changes: 4 additions & 4 deletions dgut/tree_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ import (
"time"

. "github.com/smartystreets/goconvey/convey"
internaldata "github.com/wtsi-ssg/wrstat/v4/internal/data"
"github.com/wtsi-ssg/wrstat/v4/internal/fs"
"github.com/wtsi-ssg/wrstat/v4/internal/split"
"github.com/wtsi-ssg/wrstat/v4/summary"
internaldata "github.com/wtsi-ssg/wrstat/v5/internal/data"
"github.com/wtsi-ssg/wrstat/v5/internal/fs"
"github.com/wtsi-ssg/wrstat/v5/internal/split"
"github.com/wtsi-ssg/wrstat/v5/summary"
)

func TestTree(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion fs/fs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"

. "github.com/smartystreets/goconvey/convey"
"github.com/wtsi-ssg/wrstat/v4/combine"
"github.com/wtsi-ssg/wrstat/v5/combine"
)

//nolint:lll
Expand Down
Loading

0 comments on commit b4dd962

Please sign in to comment.