change import paths to go-python and remove the attempt to type-qualify enum constants -- didn't work.

Author: Randall C. O'Reilly

format.go

@@ -15,7 +15,7 @@ import (
 	"go/ast"
 	"go/token"
 
-	"github.com/goki/gotopy/pyprint"
+	"github.com/go-python/gotopy/pyprint"
 )
 
 // format formats the given package file originally obtained from src

gotopy.go

@@ -26,8 +26,8 @@ import (
 	"runtime/pprof"
 	"strings"
 
-	"github.com/goki/gotopy/diff"
-	"github.com/goki/gotopy/pyprint"
+	"github.com/go-python/gotopy/diff"
+	"github.com/go-python/gotopy/pyprint"
 )
 
 var (

pyedits.go

@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"strings"
 
-	"github.com/goki/gotopy/pyprint"
+	"github.com/go-python/gotopy/pyprint"
 )
 
 // moveLines moves the st,ed region to 'to' line

pyprint/nodes.go

@@ -793,13 +793,13 @@ func isBinary(expr ast.Expr) bool {
 }
 
 func (p *printer) ident(id *ast.Ident) {
-	// if id.Name == "AlphaCycle" {
-	// 	fmt.Printf("%+V\n", id)
+	// todo: this was an attempt to deal with "enums" by printing type then
+	// name -- didn't work -- could return to this but not high priority
+	// if id.Obj != nil && id.Obj.Kind == ast.Con && id.Name != id.Obj.Name {
+	// 	// constants are assumed to be Enums -- use type scoping for python
+	// 	// fmt.Printf("id: %+v\n", id)
+	// 	p.print(id.Obj.Name, token.PERIOD)
 	// }
-	// todo: seems like Obj is typically nil.. not sure how to fix this..
-	if id.Obj != nil && id.Obj.Kind == ast.Con { // constants are assumed to be Enums -- use type scoping for python
-		p.print(id.Obj.Name, token.PERIOD)
-	}
 	p.print(id.Pos(), id)
 }
 

testdata/ra25.golden

@@ -55,7 +55,7 @@ def guirun():
     win.StartEventLoop()
 
     # LogPrec is precision for saving float values in logs
-LogPrec.LogPrec = 4
+LogPrec = 4
 
 # ParamSets is the default set of parameters -- Base is always applied, and others can be optionally
 # selected to apply on top of that
@@ -849,7 +849,7 @@ class Sim(pygiv.ClassViewObj):
         dt.SetMetaData("name", "TrnEpcLog")
         dt.SetMetaData("desc", "Record of performance over epochs of training")
         dt.SetMetaData("read-only", "true")
-        dt.SetMetaData("precision", str(LogPrec.LogPrec))
+        dt.SetMetaData("precision", str(LogPrec))
 
         sch = etable.Schema(
             ("Run", etensor.INT64, go.nil, go.nil),
@@ -928,7 +928,7 @@ class Sim(pygiv.ClassViewObj):
         dt.SetMetaData("name", "TstTrlLog")
         dt.SetMetaData("desc", "Record of testing per input pattern")
         dt.SetMetaData("read-only", "true")
-        dt.SetMetaData("precision", str(LogPrec.LogPrec))
+        dt.SetMetaData("precision", str(LogPrec))
 
         nt = ss.TestEnv.Table.Len() # number in view
         sch = etable.Schema(
@@ -1012,7 +1012,7 @@ class Sim(pygiv.ClassViewObj):
         dt.SetMetaData("name", "TstEpcLog")
         dt.SetMetaData("desc", "Summary stats for testing trials")
         dt.SetMetaData("read-only", "true")
-        dt.SetMetaData("precision", str(LogPrec.LogPrec))
+        dt.SetMetaData("precision", str(LogPrec))
 
         dt.SetFromSchema(etable.Schema(
             ("Run", etensor.INT64, go.nil, go.nil),
@@ -1060,7 +1060,7 @@ class Sim(pygiv.ClassViewObj):
         dt.SetMetaData("name", "TstCycLog")
         dt.SetMetaData("desc", "Record of activity etc over one trial by cycle")
         dt.SetMetaData("read-only", "true")
-        dt.SetMetaData("precision", str(LogPrec.LogPrec))
+        dt.SetMetaData("precision", str(LogPrec))
 
         np = 100 # max cycles
         sch = etable.Schema(
@@ -1127,7 +1127,7 @@ class Sim(pygiv.ClassViewObj):
         dt.SetMetaData("name", "RunLog")
         dt.SetMetaData("desc", "Record of performance at end of training")
         dt.SetMetaData("read-only", "true")
-        dt.SetMetaData("precision", str(LogPrec.LogPrec))
+        dt.SetMetaData("precision", str(LogPrec))
 
         dt.SetFromSchema(etable.Schema(
             ("Run", etensor.INT64, go.nil, go.nil),