all: use git.sr.ht/~sbinet/go-arrow@v0.2.0 fork

Signed-off-by: Sebastien Binet <binet@cern.ch>
go-hep · Jul 20, 2022 · c6ebf25 · c6ebf25
1 parent 770e2dc
commit c6ebf25
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 37 deletions.
diff --git a/cmd/arrow2root/main.go b/cmd/arrow2root/main.go
@@ -11,9 +11,9 @@ import (
 	"log"
 	"os"
 
-	"github.com/apache/arrow/go/arrow/arrio"
-	"github.com/apache/arrow/go/arrow/ipc"
-	"github.com/apache/arrow/go/arrow/memory"
+	"git.sr.ht/~sbinet/go-arrow/arrio"
+	"git.sr.ht/~sbinet/go-arrow/ipc"
+	"git.sr.ht/~sbinet/go-arrow/memory"
 	"go-hep.org/x/hep/groot"
 	"go-hep.org/x/hep/groot/rarrow"
 	"go-hep.org/x/hep/groot/rtree"

diff --git a/cmd/npy2root/main.go b/cmd/npy2root/main.go
@@ -45,7 +45,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/apache/arrow/go/arrow/arrio"
+	"git.sr.ht/~sbinet/go-arrow/arrio"
 	"github.com/sbinet/npyio/npy"
 	"go-hep.org/x/hep/groot"
 	"go-hep.org/x/hep/groot/rarrow"

diff --git a/cmd/root2arrow/main.go b/cmd/root2arrow/main.go
@@ -37,9 +37,9 @@ import (
 	"log"
 	"os"
 
-	"github.com/apache/arrow/go/arrow/array"
-	"github.com/apache/arrow/go/arrow/ipc"
-	"github.com/apache/arrow/go/arrow/memory"
+	"git.sr.ht/~sbinet/go-arrow/array"
+	"git.sr.ht/~sbinet/go-arrow/ipc"
+	"git.sr.ht/~sbinet/go-arrow/memory"
 	"go-hep.org/x/hep/groot"
 	"go-hep.org/x/hep/groot/rarrow"
 	"go-hep.org/x/hep/groot/riofs"

diff --git a/cmd/root2arrow/main_test.go b/cmd/root2arrow/main_test.go
@@ -19,7 +19,7 @@ func init() {
 		return
 	}
 
-	o, err := exec.Command("go", "install", "github.com/apache/arrow/go/arrow/ipc/cmd/arrow-cat").CombinedOutput()
+	o, err := exec.Command("go", "install", "git.sr.ht/~sbinet/go-arrow/ipc/cmd/arrow-cat").CombinedOutput()
 	if err != nil {
 		panic(fmt.Errorf("could not install arrow-cat command:\n%v\nerr: %w", string(o), err))
 	}

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	gioui.org v0.0.0-20210309172710-4b377aa89637
-	github.com/apache/arrow/go/arrow v0.0.0-20201119084055-60ea0dcac5a8
+	git.sr.ht/~sbinet/go-arrow v0.2.0
 	github.com/astrogo/fitsio v0.2.1
 	github.com/campoy/embedmd v1.0.0
 	github.com/go-mmap/mmap v0.6.0
@@ -57,7 +57,6 @@ require (
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
 	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
 	golang.org/x/sys v0.0.0-20220403205710-6acee93ad0eb // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	modernc.org/b v1.0.2 // indirect
 	modernc.org/db v1.0.4 // indirect
 	modernc.org/file v1.0.3 // indirect
@@ -71,5 +70,3 @@ require (
 	modernc.org/zappy v1.0.5 // indirect
 	rsc.io/pdf v0.1.1 // indirect
 )
-
-replace github.com/apache/arrow/go/arrow => git.sr.ht/~sbinet/go-arrow v0.1.1
diff --git a/go.sum b/go.sum
@@ -4,8 +4,8 @@ gioui.org v0.0.0-20210309172710-4b377aa89637 h1:4KQLC+NC4MQdAPSuWIMZK3ZI+OlzYjUS
 gioui.org v0.0.0-20210309172710-4b377aa89637/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
 git.sr.ht/~sbinet/gg v0.3.1 h1:LNhjNn8DerC8f9DHLz6lS0YYul/b602DUxDgGkd/Aik=
 git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc=
-git.sr.ht/~sbinet/go-arrow v0.1.1 h1:JUpmPBmX0OiKQm1Jzo7QRzAnjCNCpGubwsJoG8Pboms=
-git.sr.ht/~sbinet/go-arrow v0.1.1/go.mod h1:kpXDPSKu9mrBMk+Q9XDUoZdRweuEd0aXXAp1eqXby30=
+git.sr.ht/~sbinet/go-arrow v0.2.0 h1:QIiVPcEtMb2lzOWDgBrIz9Sa+7Xvs2EJ/Icxe6IcUSI=
+git.sr.ht/~sbinet/go-arrow v0.2.0/go.mod h1:GIva9P8b7Pom+/pOUMPX5YOrtLOUdGb5tLXBfKuelTY=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY=
@@ -118,7 +118,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8=
 github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 h1:zzrxE1FKn5ryBNl9eKOeqQ58Y/Qpo3Q9QNxKHX5uzzQ=

diff --git a/groot/rarrow/option.go b/groot/rarrow/option.go
@@ -5,7 +5,7 @@
 package rarrow // import "go-hep.org/x/hep/groot/rarrow"
 
 import (
-	"github.com/apache/arrow/go/arrow/memory"
+	"git.sr.ht/~sbinet/go-arrow/memory"
 )
 
 type config struct {

diff --git a/groot/rarrow/rarrow.go b/groot/rarrow/rarrow.go
@@ -10,9 +10,9 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/apache/arrow/go/arrow"
-	"github.com/apache/arrow/go/arrow/array"
-	"github.com/apache/arrow/go/arrow/memory"
+	"git.sr.ht/~sbinet/go-arrow"
+	"git.sr.ht/~sbinet/go-arrow/array"
+	"git.sr.ht/~sbinet/go-arrow/memory"
 	"go-hep.org/x/hep/groot/root"
 	"go-hep.org/x/hep/groot/rtree"
 )

diff --git a/groot/rarrow/rarrow_test.go b/groot/rarrow/rarrow_test.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/arrow"
+	"git.sr.ht/~sbinet/go-arrow"
 	"go-hep.org/x/hep/groot"
 	"go-hep.org/x/hep/groot/riofs"
 	"go-hep.org/x/hep/groot/rtree"

diff --git a/groot/rarrow/reader.go b/groot/rarrow/reader.go
@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/arrow"
-	"github.com/apache/arrow/go/arrow/array"
-	"github.com/apache/arrow/go/arrow/memory"
+	"git.sr.ht/~sbinet/go-arrow"
+	"git.sr.ht/~sbinet/go-arrow/array"
+	"git.sr.ht/~sbinet/go-arrow/memory"
 	"go-hep.org/x/hep/groot/rtree"
 )
 

diff --git a/groot/rarrow/reader_test.go b/groot/rarrow/reader_test.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/arrow/array"
-	"github.com/apache/arrow/go/arrow/memory"
+	"git.sr.ht/~sbinet/go-arrow/array"
+	"git.sr.ht/~sbinet/go-arrow/memory"
 	"go-hep.org/x/hep/groot"
 	"go-hep.org/x/hep/groot/riofs"
 	"go-hep.org/x/hep/groot/rtree"

diff --git a/groot/rarrow/table.go b/groot/rarrow/table.go
@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/arrow"
-	"github.com/apache/arrow/go/arrow/array"
-	"github.com/apache/arrow/go/arrow/memory"
+	"git.sr.ht/~sbinet/go-arrow"
+	"git.sr.ht/~sbinet/go-arrow/array"
+	"git.sr.ht/~sbinet/go-arrow/memory"
 	"go-hep.org/x/hep/groot/rtree"
 )
 

diff --git a/groot/rarrow/table_test.go b/groot/rarrow/table_test.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/arrow/array"
-	"github.com/apache/arrow/go/arrow/memory"
+	"git.sr.ht/~sbinet/go-arrow/array"
+	"git.sr.ht/~sbinet/go-arrow/memory"
 	"go-hep.org/x/hep/groot"
 	"go-hep.org/x/hep/groot/riofs"
 	"go-hep.org/x/hep/groot/rtree"

diff --git a/groot/rarrow/tree_writer.go b/groot/rarrow/tree_writer.go
@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/apache/arrow/go/arrow"
-	"github.com/apache/arrow/go/arrow/array"
-	"github.com/apache/arrow/go/arrow/arrio"
+	"git.sr.ht/~sbinet/go-arrow"
+	"git.sr.ht/~sbinet/go-arrow/array"
+	"git.sr.ht/~sbinet/go-arrow/arrio"
 	"go-hep.org/x/hep/groot/riofs"
 	"go-hep.org/x/hep/groot/rtree"
 )

diff --git a/groot/rnpy/arrow.go b/groot/rnpy/arrow.go
@@ -10,10 +10,10 @@ import (
 	"reflect"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/arrow"
-	"github.com/apache/arrow/go/arrow/array"
-	"github.com/apache/arrow/go/arrow/arrio"
-	"github.com/apache/arrow/go/arrow/memory"
+	"git.sr.ht/~sbinet/go-arrow"
+	"git.sr.ht/~sbinet/go-arrow/array"
+	"git.sr.ht/~sbinet/go-arrow/arrio"
+	"git.sr.ht/~sbinet/go-arrow/memory"
 	"github.com/sbinet/npyio/npy"
 )