Merge remote-tracking branch 'kirr/t' into t

* kirr/t:
  X wcfs: make it to use go modules for dependencies

setup.py

@@ -350,7 +350,7 @@ setup(
                   ],
 
     extras_require = {
-                   'test': ['pytest'],
+                   'test': ['pytest', 'scipy'],
     },
 
     cmdclass    = {'build_ext':     build_ext,

wcfs/go.mod

+module lab.nexedi.com/nexedi/wendelin.core/wcfs
+
+go 1.14
+
+require (
+	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
+	github.com/hanwen/go-fuse/v2 v2.0.3 // replaced to -> kirr/go-fuse@y/nodefs-cancel
+	github.com/johncgriffin/overflow v0.0.0-20170615021017-4d914c927216
+	github.com/kisielk/og-rek v1.0.1-0.20180928202415-8b25c4cefd6c
+	github.com/pkg/errors v0.9.1
+	github.com/stretchr/testify v1.6.1
+	lab.nexedi.com/kirr/go123 v0.0.0-20200916121347-316617668e12
+	lab.nexedi.com/kirr/neo/go v0.0.0-20200915143710-5ee3c077b3d0
+)
+
+// we use kirr/go-fuse@y/nodefs-cancel
+// see https://github.com/hanwen/go-fuse/pull/343 for details
+replace github.com/hanwen/go-fuse/v2 v2.0.3 => lab.nexedi.com/kirr/go-fuse/v2 v2.0.0-20200916080003-8c439061f8c9

wcfs/misc.go

@@ -32,8 +32,8 @@ import (
 
 	log "github.com/golang/glog"
 
-	"github.com/hanwen/go-fuse/fuse"
-	"github.com/hanwen/go-fuse/fuse/nodefs"
+	"github.com/hanwen/go-fuse/v2/fuse"
+	"github.com/hanwen/go-fuse/v2/fuse/nodefs"
 	"github.com/pkg/errors"
 
 	"lab.nexedi.com/kirr/go123/xcontext"

wcfs/wcfs.go

@@ -507,8 +507,8 @@ import (
 	_ "lab.nexedi.com/kirr/neo/go/zodb/wks"
 
 	"github.com/johncgriffin/overflow"
-	"github.com/hanwen/go-fuse/fuse"
-	"github.com/hanwen/go-fuse/fuse/nodefs"
+	"github.com/hanwen/go-fuse/v2/fuse"
+	"github.com/hanwen/go-fuse/v2/fuse/nodefs"
 	"github.com/pkg/errors"
 )
 

wcfs/zblk.go

@@ -52,7 +52,7 @@ import (
 	pickle "github.com/kisielk/og-rek"
 	"github.com/johncgriffin/overflow"
 
-	"./internal/pycompat"
+	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/pycompat"
 )
 
 // zBlk is the interface that every ZBlk* block implements.