fix(codegen): module version should be the trailer

fredbi · fredbi · commit b89af8b87172 · 2026-01-02T18:58:46.000+01:00
Signed-off-by: Frederic BIDON &lt;fredbi@yahoo.com&gt;
diff --git a/codegen/go.mod b/codegen/go.mod
@@ -1,11 +1,10 @@
-module github.com/go-openapi/testify/v2/codegen
+module github.com/go-openapi/testify/codegen/v2
 
 go 1.24.0
 
 toolchain go1.25.0
 
 require (
-	github.com/go-openapi/testify/v2 v2.0.2
 	golang.org/x/text v0.32.0
 	golang.org/x/tools v0.40.0
 )
@@ -14,3 +13,5 @@ require (
 	golang.org/x/mod v0.31.0 // indirect
 	golang.org/x/sync v0.19.0 // indirect
 )
+
+replace github.com/go-openapi/testify/v2 => ..
diff --git a/codegen/go.sum b/codegen/go.sum
@@ -1,5 +1,3 @@
-github.com/go-openapi/testify/v2 v2.0.2 h1:X999g3jeLcoY8qctY/c/Z8iBHTbwLz7R2WXd6Ub6wls=
-github.com/go-openapi/testify/v2 v2.0.2/go.mod h1:HCPmvFFnheKK2BuwSA0TbbdxJ3I16pjwMkYkP4Ywn54=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
diff --git a/codegen/internal/generator/doc_generator.go b/codegen/internal/generator/doc_generator.go
@@ -11,9 +11,9 @@ import (
 	"path"
 	"path/filepath"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/generator/domains"
-	"github.com/go-openapi/testify/v2/codegen/internal/generator/funcmaps"
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
+	"github.com/go-openapi/testify/codegen/v2/internal/generator/domains"
+	"github.com/go-openapi/testify/codegen/v2/internal/generator/funcmaps"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
 )
 
 const (
diff --git a/codegen/internal/generator/domains/domains.go b/codegen/internal/generator/domains/domains.go
@@ -9,7 +9,7 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
 )
 
 const (
diff --git a/codegen/internal/generator/domains/domains_test.go b/codegen/internal/generator/domains/domains_test.go
@@ -8,7 +8,7 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
 )
 
 const (
diff --git a/codegen/internal/generator/domains/sorting_test.go b/codegen/internal/generator/domains/sorting_test.go
@@ -8,7 +8,7 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
 )
 
 // TestCompareIdents verifies Ident comparison by Name.
diff --git a/codegen/internal/generator/funcmaps/funcmaps.go b/codegen/internal/generator/funcmaps/funcmaps.go
@@ -17,9 +17,8 @@ import (
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
-	parser "github.com/go-openapi/testify/v2/codegen/internal/scanner/comments-parser"
-	"github.com/go-openapi/testify/v2/internal/spew"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
+	parser "github.com/go-openapi/testify/codegen/v2/internal/scanner/comments-parser"
 )
 
 const (
@@ -338,7 +337,7 @@ func godocbadge(pkggodevURL string) (string, error) {
 }
 
 func printDebug(in any) string {
-	return spew.Sdump(in)
+	return fmt.Sprintf("%#v", in)
 }
 
 func printDate() string {
diff --git a/codegen/internal/generator/funcmaps/funcmaps_test.go b/codegen/internal/generator/funcmaps/funcmaps_test.go
@@ -10,8 +10,8 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
-	parser "github.com/go-openapi/testify/v2/codegen/internal/scanner/comments-parser"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
+	parser "github.com/go-openapi/testify/codegen/v2/internal/scanner/comments-parser"
 )
 
 const (
@@ -294,7 +294,7 @@ func TestDebug(t *testing.T) {
 	t.Parallel()
 
 	result := printDebug(1)
-	const expected = "(int) 1\n"
+	const expected = "1"
 	if result != expected {
 		t.Errorf("Expected: %q, Got: %q", expected, result)
 	}
diff --git a/codegen/internal/generator/generator.go b/codegen/internal/generator/generator.go
@@ -12,7 +12,7 @@ import (
 	"path/filepath"
 	"text/template"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
 )
 
 const (
diff --git a/codegen/internal/generator/generator_test.go b/codegen/internal/generator/generator_test.go
@@ -8,8 +8,8 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/generator/funcmaps"
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
+	"github.com/go-openapi/testify/codegen/v2/internal/generator/funcmaps"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
 )
 
 const (
diff --git a/codegen/internal/generator/templates.go b/codegen/internal/generator/templates.go
@@ -10,7 +10,7 @@ import (
 	"sort"
 	"text/template"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/generator/funcmaps"
+	"github.com/go-openapi/testify/codegen/v2/internal/generator/funcmaps"
 )
 
 // buildTemplateIndex extracts template names from the index and returns them sorted.
diff --git a/codegen/internal/scanner/comments-parser/examples.go b/codegen/internal/scanner/comments-parser/examples.go
@@ -7,7 +7,7 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
 )
 
 // ParseTestExamples extracts test examples from doc comment text.
diff --git a/codegen/internal/scanner/comments-parser/examples_test.go b/codegen/internal/scanner/comments-parser/examples_test.go
@@ -8,7 +8,7 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
 )
 
 func TestParseTestExamples(t *testing.T) {
diff --git a/codegen/internal/scanner/comments-parser/expressions.go b/codegen/internal/scanner/comments-parser/expressions.go
@@ -11,7 +11,7 @@ import (
 	"go/token"
 	"strings"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
 )
 
 // ParseTestValues parses a comma-separated list of Go expressions.
diff --git a/codegen/internal/scanner/comments-parser/expressions_test.go b/codegen/internal/scanner/comments-parser/expressions_test.go
@@ -9,7 +9,7 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
 )
 
 // TestParseTestValues tests parsing of test value expressions.
diff --git a/codegen/internal/scanner/comments-parser/relocation.go b/codegen/internal/scanner/comments-parser/relocation.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
 )
 
 const (
diff --git a/codegen/internal/scanner/comments-parser/tags.go b/codegen/internal/scanner/comments-parser/tags.go
@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
 )
 
 // ParseTaggedComments extracts tagged comments from text.
diff --git a/codegen/internal/scanner/comments-parser/tags_test.go b/codegen/internal/scanner/comments-parser/tags_test.go
@@ -8,7 +8,7 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
 )
 
 func TestParseTaggedComments(t *testing.T) {
diff --git a/codegen/internal/scanner/comments/extractor.go b/codegen/internal/scanner/comments/extractor.go
@@ -10,8 +10,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
-	parser "github.com/go-openapi/testify/v2/codegen/internal/scanner/comments-parser"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
+	parser "github.com/go-openapi/testify/codegen/v2/internal/scanner/comments-parser"
 )
 
 var copyrightRex = regexp.MustCompile(`(?i)copyright`)
diff --git a/codegen/internal/scanner/comments/extractor_test.go b/codegen/internal/scanner/comments/extractor_test.go
@@ -10,7 +10,7 @@ import (
 
 	"golang.org/x/tools/go/packages"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
 )
 
 //nolint:gochecknoglobals // we use [sync.Once] to cache the parsed test source and run the tests faster
diff --git a/codegen/internal/scanner/module_test.go b/codegen/internal/scanner/module_test.go
@@ -3,7 +3,7 @@ package scanner
 import "testing"
 
 func TestModuleName(t *testing.T) {
-	const expected = "github.com/go-openapi/testify/v2/codegen"
+	const expected = "github.com/go-openapi/testify/codegen/v2"
 	result := moduleName()
 	if result != expected {
 		t.Errorf("Expected %q but got %q", expected, result)
diff --git a/codegen/internal/scanner/scanner.go b/codegen/internal/scanner/scanner.go
@@ -14,10 +14,10 @@ import (
 
 	"golang.org/x/tools/go/packages"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
-	"github.com/go-openapi/testify/v2/codegen/internal/scanner/comments"
-	parser "github.com/go-openapi/testify/v2/codegen/internal/scanner/comments-parser"
-	"github.com/go-openapi/testify/v2/codegen/internal/scanner/signature"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
+	"github.com/go-openapi/testify/codegen/v2/internal/scanner/comments"
+	parser "github.com/go-openapi/testify/codegen/v2/internal/scanner/comments-parser"
+	"github.com/go-openapi/testify/codegen/v2/internal/scanner/signature"
 )
 
 const pkgLoadMode = packages.NeedName | packages.NeedFiles | packages.NeedImports | packages.NeedDeps | packages.NeedTypes | packages.NeedSyntax | packages.NeedTypesInfo
diff --git a/codegen/internal/scanner/scanner_test.go b/codegen/internal/scanner/scanner_test.go
@@ -6,8 +6,6 @@ package scanner
 import (
 	"os"
 	"testing"
-
-	"github.com/go-openapi/testify/v2/internal/spew"
 )
 
 // TestScanner exercises the [Scanner] without asserting anything else than running without error.
@@ -26,9 +24,6 @@ func TestScanner(t *testing.T) {
 		// skip output when run on CI
 		return
 	}
-	spew.Config = spew.ConfigState{
-		DisableMethods: true,
-	}
 
-	spew.Dump(r)
+	t.Logf("%#v", r)
 }
diff --git a/codegen/internal/scanner/signature/extractor.go b/codegen/internal/scanner/signature/extractor.go
@@ -7,7 +7,7 @@ import (
 	"go/types"
 	"strings"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
 )
 
 // Extractor extracts function signatures and formats types with proper package qualification.
diff --git a/codegen/main.go b/codegen/main.go
@@ -12,9 +12,9 @@ import (
 	"log"
 	"strings"
 
-	"github.com/go-openapi/testify/v2/codegen/internal/generator"
-	"github.com/go-openapi/testify/v2/codegen/internal/model"
-	"github.com/go-openapi/testify/v2/codegen/internal/scanner"
+	"github.com/go-openapi/testify/codegen/v2/internal/generator"
+	"github.com/go-openapi/testify/codegen/v2/internal/model"
+	"github.com/go-openapi/testify/codegen/v2/internal/scanner"
 )
 
 type config struct {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-github.com/go-openapi/testify/v2 v2.0.2 h1:X999g3jeLcoY8qctY/c/Z8iBHTbwLz7R2WXd6Ub6wls=`
`2`		`-github.com/go-openapi/testify/v2 v2.0.2/go.mod h1:HCPmvFFnheKK2BuwSA0TbbdxJ3I16pjwMkYkP4Ywn54=`
`3`	`1`	`github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=`
`4`	`2`	`github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=`
`5`	`3`	`golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"slices"`
`10`	`10`	`"strings"`
`11`	`11`
`12`		`- "github.com/go-openapi/testify/v2/codegen/internal/model"`
	`12`	`+ "github.com/go-openapi/testify/codegen/v2/internal/model"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"slices"`
`9`	`9`	`"testing"`
`10`	`10`
`11`		`- "github.com/go-openapi/testify/v2/codegen/internal/model"`
	`11`	`+ "github.com/go-openapi/testify/codegen/v2/internal/model"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,8 @@ import (`
`17`	`17`	`"golang.org/x/text/cases"`
`18`	`18`	`"golang.org/x/text/language"`
`19`	`19`
`20`		`- "github.com/go-openapi/testify/v2/codegen/internal/model"`
`21`		`- parser "github.com/go-openapi/testify/v2/codegen/internal/scanner/comments-parser"`
`22`		`- "github.com/go-openapi/testify/v2/internal/spew"`
	`20`	`+ "github.com/go-openapi/testify/codegen/v2/internal/model"`
	`21`	`+ parser "github.com/go-openapi/testify/codegen/v2/internal/scanner/comments-parser"`
`23`	`22`	`)`
`24`	`23`
`25`	`24`	`const (`
`@@ -338,7 +337,7 @@ func godocbadge(pkggodevURL string) (string, error) {`
`338`	`337`	`}`
`339`	`338`
`340`	`339`	`func printDebug(in any) string {`
`341`		`- return spew.Sdump(in)`
	`340`	`+ return fmt.Sprintf("%#v", in)`
`342`	`341`	`}`
`343`	`342`
`344`	`343`	`func printDate() string {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"path/filepath"`
`13`	`13`	`"text/template"`
`14`	`14`
`15`		`- "github.com/go-openapi/testify/v2/codegen/internal/model"`
	`15`	`+ "github.com/go-openapi/testify/codegen/v2/internal/model"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ import (`
`8`	`8`	`"slices"`
`9`	`9`	`"testing"`
`10`	`10`
`11`		`- "github.com/go-openapi/testify/v2/codegen/internal/generator/funcmaps"`
`12`		`- "github.com/go-openapi/testify/v2/codegen/internal/model"`
	`11`	`+ "github.com/go-openapi/testify/codegen/v2/internal/generator/funcmaps"`
	`12`	`+ "github.com/go-openapi/testify/codegen/v2/internal/model"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`const (`