go package to test is at rudderlabs/gopy

nishant-rudderstack · nishant-rudderstack · commit 2046c04de335 · 2022-06-20T16:13:36.000+05:30
diff --git a/_examples/cpkg/run.go b/_examples/cpkg/run.go
@@ -9,7 +9,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/go-python/gopy/_examples/cpkg"
+	"github.com/rudderlabs/gopy/_examples/cpkg"
 )
 
 func main() {
diff --git a/_examples/funcs/funcs.go b/_examples/funcs/funcs.go
@@ -7,7 +7,7 @@ package funcs
 import (
 	"fmt"
 
-	"github.com/go-python/gopy/_examples/cpkg"
+	"github.com/rudderlabs/gopy/_examples/cpkg"
 )
 
 type FunStruct struct {
diff --git a/_examples/hi/hi.go b/_examples/hi/hi.go
@@ -8,8 +8,8 @@ package hi
 import (
 	"fmt"
 
-	"github.com/go-python/gopy/_examples/cpkg"
-	"github.com/go-python/gopy/_examples/structs"
+	"github.com/rudderlabs/gopy/_examples/cpkg"
+	"github.com/rudderlabs/gopy/_examples/structs"
 )
 
 const (
diff --git a/_examples/iface/iface.go b/_examples/iface/iface.go
@@ -6,7 +6,7 @@
 package iface
 
 import (
-	"github.com/go-python/gopy/_examples/cpkg"
+	"github.com/rudderlabs/gopy/_examples/cpkg"
 )
 
 // Iface has a single F() method
diff --git a/_examples/wrapper/pywrapper/wrapper_code.go b/_examples/wrapper/pywrapper/wrapper_code.go
@@ -7,7 +7,7 @@ package pywrapper
 import (
 	"fmt"
 
-	"github.com/go-python/gopy/_examples/wrapper"
+	"github.com/rudderlabs/gopy/_examples/wrapper"
 )
 
 type WrapperStruct struct {
diff --git a/bind/gen.go b/bind/gen.go
@@ -103,7 +103,7 @@ static PyObject* Py_BuildValue2(char *format, long long arg0)
 */
 import "C"
 import (
-	"github.com/go-python/gopy/gopyh" // handler
+	"github.com/rudderlabs/gopy/gopyh" // handler
 	"%[7]s" // Error Translator
 
 	%[6]s
diff --git a/cmd_build.go b/cmd_build.go
@@ -16,7 +16,7 @@ import (
 	"github.com/gonuts/commander"
 	"github.com/gonuts/flag"
 
-	"github.com/go-python/gopy/bind"
+	"github.com/rudderlabs/gopy/bind"
 )
 
 func gopyMakeCmdBuild() *commander.Command {
@@ -29,7 +29,7 @@ build generates and compiles (C)Python language bindings for Go package(s).
 
 ex:
  $ gopy build [options] <go-package-name> [other-go-package...]
- $ gopy build github.com/go-python/gopy/_examples/hi
+ $ gopy build github.com/rudderlabs/gopy/_examples/hi
 `,
 		Flag: *flag.NewFlagSet("gopy-build", flag.ExitOnError),
 	}
diff --git a/cmd_exe.go b/cmd_exe.go
@@ -11,7 +11,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/go-python/gopy/bind"
+	"github.com/rudderlabs/gopy/bind"
 	"github.com/gonuts/commander"
 	"github.com/gonuts/flag"
 )
@@ -35,7 +35,7 @@ When including multiple packages, list in order of increasing dependency, and us
 
 ex:
  $ gopy exe [options] <go-package-name> [other-go-package...]
- $ gopy exe github.com/go-python/gopy/_examples/hi
+ $ gopy exe github.com/rudderlabs/gopy/_examples/hi
 `,
 		Flag: *flag.NewFlagSet("gopy-exe", flag.ExitOnError),
 	}
@@ -52,7 +52,7 @@ ex:
 	cmd.Flag.String("author", "gopy", "author name")
 	cmd.Flag.String("email", "gopy@example.com", "author email")
 	cmd.Flag.String("desc", "", "short description of project (long comes from README.md)")
-	cmd.Flag.String("url", "https://github.com/go-python/gopy", "home page for project")
+	cmd.Flag.String("url", "https://github.com/rudderlabs/gopy", "home page for project")
 
 	return cmd
 }
diff --git a/cmd_gen.go b/cmd_gen.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/go-python/gopy/bind"
+	"github.com/rudderlabs/gopy/bind"
 	"github.com/gonuts/commander"
 	"github.com/gonuts/flag"
 )
@@ -23,7 +23,7 @@ gen generates (C)Python language bindings for Go package(s).
 
 ex:
  $ gopy gen [options] <go-package-name> [other-go-package...]
- $ gopy gen github.com/go-python/gopy/_examples/hi
+ $ gopy gen github.com/rudderlabs/gopy/_examples/hi
 `,
 		Flag: *flag.NewFlagSet("gopy-gen", flag.ExitOnError),
 	}
diff --git a/cmd_pkg.go b/cmd_pkg.go
@@ -11,7 +11,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/go-python/gopy/bind"
+	"github.com/rudderlabs/gopy/bind"
 	"github.com/gonuts/commander"
 	"github.com/gonuts/flag"
 )
@@ -33,7 +33,7 @@ When including multiple packages, list in order of increasing dependency, and us
 
 ex:
  $ gopy pkg [options] <go-package-name> [other-go-package...]
- $ gopy pkg github.com/go-python/gopy/_examples/hi
+ $ gopy pkg github.com/rudderlabs/gopy/_examples/hi
 `,
 		Flag: *flag.NewFlagSet("gopy-pkg", flag.ExitOnError),
 	}
@@ -50,7 +50,7 @@ ex:
 	cmd.Flag.String("author", "gopy", "author name")
 	cmd.Flag.String("email", "gopy@example.com", "author email")
 	cmd.Flag.String("desc", "", "short description of project (long comes from README.md)")
-	cmd.Flag.String("url", "https://github.com/go-python/gopy", "home page for project")
+	cmd.Flag.String("url", "https://github.com/rudderlabs/gopy", "home page for project")
 
 	return cmd
 }
diff --git a/gen.go b/gen.go
@@ -19,7 +19,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/tools/go/packages"
 
-	"github.com/go-python/gopy/bind"
+	"github.com/rudderlabs/gopy/bind"
 )
 
 // argStr returns the full command args as a string, without path to exe
diff --git a/go.mod b/go.mod
@@ -3,11 +3,8 @@ module github.com/rudderlabs/gopy
 go 1.15
 
 require (
-	github.com/go-python/gopy v0.4.2 // indirect
 	github.com/gonuts/commander v0.1.0
 	github.com/gonuts/flag v0.1.0
 	github.com/pkg/errors v0.9.1
 	golang.org/x/tools v0.1.11-0.20220413170336-afc6aad76eb1
 )
-
-replace github.com/go-python/gopy => ../gopy
diff --git a/main.go b/main.go
@@ -15,7 +15,7 @@ import (
 	"github.com/gonuts/flag"
 	"github.com/pkg/errors"
 
-	"github.com/go-python/gopy/bind"
+	"github.com/rudderlabs/gopy/bind"
 )
 
 // BuildCfg contains command options and binding generation options
@@ -51,7 +51,7 @@ func NewBuildCfg(flagSet *flag.FlagSet) *BuildCfg {
 	cfg.UsePyTuple4VE = flagSet.Lookup("use-pytuple-4ve").Value.Get().(bool)
 
 	if cfg.ModPathGoErr2PyEx == "" {
-		cfg.ModPathGoErr2PyEx = "github.com/go-python/gopy/goerr2pyex/"
+		cfg.ModPathGoErr2PyEx = "github.com/rudderlabs/gopy/goerr2pyex/"
 	}
 
 	if cfg.VM == "" {
diff --git a/main_test.go b/main_test.go
@@ -17,7 +17,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/go-python/gopy/bind"
+	"github.com/rudderlabs/gopy/bind"
 )
 
 var (
@@ -117,11 +117,11 @@ func TestGoPyErrors(t *testing.T) {
 	if err != nil {
 		t.Fatalf("could not run %v: %+v\n", strings.Join(cmd.Args, " "), err)
 	}
-	contains := `--- Processing package: github.com/go-python/gopy/_examples/gopyerrors ---
-ignoring python incompatible function: .func github.com/go-python/gopy/_examples/gopyerrors.NotErrorMany() (int, int): func() (int, int): gopy: second result value must be of type error: func() (int, int)
-ignoring python incompatible method: gopyerrors.func (*github.com/go-python/gopy/_examples/gopyerrors.Struct).NotErrorMany() (int, string): func() (int, string): gopy: second result value must be of type error: func() (int, string)
-ignoring python incompatible method: gopyerrors.func (*github.com/go-python/gopy/_examples/gopyerrors.Struct).TooMany() (int, int, string): func() (int, int, string): gopy: too many results to return: func() (int, int, string)
-ignoring python incompatible function: .func github.com/go-python/gopy/_examples/gopyerrors.TooMany() (int, int, string): func() (int, int, string): gopy: too many results to return: func() (int, int, string)
+	contains := `--- Processing package: github.com/rudderlabs/gopy/_examples/gopyerrors ---
+ignoring python incompatible function: .func github.com/rudderlabs/gopy/_examples/gopyerrors.NotErrorMany() (int, int): func() (int, int): gopy: second result value must be of type error: func() (int, int)
+ignoring python incompatible method: gopyerrors.func (*github.com/rudderlabs/gopy/_examples/gopyerrors.Struct).NotErrorMany() (int, string): func() (int, string): gopy: second result value must be of type error: func() (int, string)
+ignoring python incompatible method: gopyerrors.func (*github.com/rudderlabs/gopy/_examples/gopyerrors.Struct).TooMany() (int, int, string): func() (int, int, string): gopy: too many results to return: func() (int, int, string)
+ignoring python incompatible function: .func github.com/rudderlabs/gopy/_examples/gopyerrors.TooMany() (int, int, string): func() (int, int, string): gopy: too many results to return: func() (int, int, string)
 `
 	if got, want := string(out), contains; !strings.Contains(got, want) {
 		t.Fatalf("%v does not contain\n%v\n", got, want)
@@ -983,8 +983,8 @@ func writeGoMod(t *testing.T, pkgDir, tstDir string) {
 	template := `
 module dummy
 
-require github.com/go-python/gopy v0.0.0
-replace github.com/go-python/gopy => %s
+require github.com/rudderlabs/gopy v0.0.0
+replace github.com/rudderlabs/gopy => %s
 `
 	contents := fmt.Sprintf(template, pkgDir)
 	if err := ioutil.WriteFile(filepath.Join(tstDir, "go.mod"), []byte(contents), 0666); err != nil {
diff --git a/main_windows.go b/main_windows.go
@@ -7,7 +7,7 @@
 
 package main
 
-import "github.com/go-python/gopy/bind"
+import "github.com/rudderlabs/gopy/bind"
 
 const (
 	libExt       = ".pyd"
diff --git a/pkgsetup.go b/pkgsetup.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/go-python/gopy/bind"
+	"github.com/rudderlabs/gopy/bind"
 )
 
 // 1 = pkg name, 2 = -user, 3 = version 4 = author, 5 = email, 6 = desc, 7 = url

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ package main`
`9`	`9`	`import (`
`10`	`10`	`"fmt"`
`11`	`11`
`12`		`- "github.com/go-python/gopy/_examples/cpkg"`
	`12`	`+ "github.com/rudderlabs/gopy/_examples/cpkg"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func main() {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ package funcs`
`7`	`7`	`import (`
`8`	`8`	`"fmt"`
`9`	`9`
`10`		`- "github.com/go-python/gopy/_examples/cpkg"`
	`10`	`+ "github.com/rudderlabs/gopy/_examples/cpkg"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`type FunStruct struct {`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ package hi`
`8`	`8`	`import (`
`9`	`9`	`"fmt"`
`10`	`10`
`11`		`- "github.com/go-python/gopy/_examples/cpkg"`
`12`		`- "github.com/go-python/gopy/_examples/structs"`
	`11`	`+ "github.com/rudderlabs/gopy/_examples/cpkg"`
	`12`	`+ "github.com/rudderlabs/gopy/_examples/structs"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`package iface`
`7`	`7`
`8`	`8`	`import (`
`9`		`- "github.com/go-python/gopy/_examples/cpkg"`
	`9`	`+ "github.com/rudderlabs/gopy/_examples/cpkg"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// Iface has a single F() method`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ package pywrapper`
`7`	`7`	`import (`
`8`	`8`	`"fmt"`
`9`	`9`
`10`		`- "github.com/go-python/gopy/_examples/wrapper"`
	`10`	`+ "github.com/rudderlabs/gopy/_examples/wrapper"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`type WrapperStruct struct {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`"github.com/gonuts/commander"`
`17`	`17`	`"github.com/gonuts/flag"`
`18`	`18`
`19`		`- "github.com/go-python/gopy/bind"`
	`19`	`+ "github.com/rudderlabs/gopy/bind"`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`func gopyMakeCmdBuild() *commander.Command {`
`@@ -29,7 +29,7 @@ build generates and compiles (C)Python language bindings for Go package(s).`
`29`	`29`
`30`	`30`	`ex:`
`31`	`31`	`$ gopy build [options] <go-package-name> [other-go-package...]`
`32`		`- $ gopy build github.com/go-python/gopy/_examples/hi`
	`32`	`+ $ gopy build github.com/rudderlabs/gopy/_examples/hi`
`33`	`33`	`,
`34`	`34`	`Flag: *flag.NewFlagSet("gopy-build", flag.ExitOnError),`
`35`	`35`	`}`