Skip to content

Commit 7f4e705

Browse files
committed
migrate to ginkgo v2
Upgrade github.com/onsi/ginkgo v1.16.5 -> v2 and update all import paths from github.com/onsi/ginkgo to github.com/onsi/ginkgo/v2.
1 parent 6d334b7 commit 7f4e705

468 files changed

Lines changed: 76635 additions & 2919 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

go.mod

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cloudfoundry/python-buildpack
22

3-
go 1.23.4
3+
go 1.24.0
44

55
require (
66
github.com/Dynatrace/libbuildpack-dynatrace v1.8.0
@@ -9,16 +9,17 @@ require (
99
github.com/cloudfoundry/switchblade v0.9.4
1010
github.com/golang/mock v1.6.0
1111
github.com/kr/text v0.2.0
12-
github.com/onsi/ginkgo v1.16.5
13-
github.com/onsi/gomega v1.36.2
12+
github.com/onsi/ginkgo/v2 v2.28.1
13+
github.com/onsi/gomega v1.39.0
1414
github.com/sclevine/spec v1.4.0
15-
golang.org/x/crypto v0.32.0
15+
golang.org/x/crypto v0.47.0
1616
gopkg.in/ini.v1 v1.67.0
1717
)
1818

1919
require (
2020
code.cloudfoundry.org/lager v2.0.0+incompatible // indirect
2121
github.com/Masterminds/semver v1.5.0 // indirect
22+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2223
github.com/Microsoft/go-winio v0.6.2 // indirect
2324
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2425
github.com/containerd/log v0.1.0 // indirect
@@ -30,18 +31,20 @@ require (
3031
github.com/felixge/httpsnoop v1.0.4 // indirect
3132
github.com/fsnotify/fsnotify v1.8.0 // indirect
3233
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
33-
github.com/go-logr/logr v1.4.2 // indirect
34+
github.com/go-logr/logr v1.4.3 // indirect
3435
github.com/go-logr/stdr v1.2.2 // indirect
36+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3537
github.com/gogo/protobuf v1.3.2 // indirect
36-
github.com/google/go-cmp v0.6.0 // indirect
38+
github.com/google/go-cmp v0.7.0 // indirect
39+
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
3740
github.com/moby/docker-image-spec v1.3.1 // indirect
3841
github.com/nxadm/tail v1.4.11 // indirect
42+
github.com/onsi/ginkgo v1.16.5 // indirect
3943
github.com/opencontainers/go-digest v1.0.0 // indirect
4044
github.com/opencontainers/image-spec v1.1.0 // indirect
4145
github.com/paketo-buildpacks/packit v1.3.1 // indirect
4246
github.com/paketo-buildpacks/packit/v2 v2.16.0 // indirect
4347
github.com/pkg/errors v0.9.1 // indirect
44-
github.com/rogpeppe/go-internal v1.13.1 // indirect
4548
github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569 // indirect
4649
github.com/tidwall/gjson v1.18.0 // indirect
4750
github.com/tidwall/match v1.1.1 // indirect
@@ -53,14 +56,17 @@ require (
5356
go.opentelemetry.io/otel/metric v1.32.0 // indirect
5457
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
5558
go.opentelemetry.io/otel/trace v1.32.0 // indirect
56-
golang.org/x/net v0.34.0 // indirect
57-
golang.org/x/sys v0.29.0 // indirect
58-
golang.org/x/text v0.21.0 // indirect
59+
go.yaml.in/yaml/v3 v3.0.4 // indirect
60+
golang.org/x/mod v0.32.0 // indirect
61+
golang.org/x/net v0.49.0 // indirect
62+
golang.org/x/sync v0.19.0 // indirect
63+
golang.org/x/sys v0.40.0 // indirect
64+
golang.org/x/text v0.33.0 // indirect
65+
golang.org/x/tools v0.41.0 // indirect
5966
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
6067
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
6168
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
6269
gopkg.in/yaml.v2 v2.4.0 // indirect
63-
gopkg.in/yaml.v3 v3.0.1 // indirect
6470
)
6571

6672
exclude google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd

go.sum

Lines changed: 46 additions & 22 deletions
Large diffs are not rendered by default.

src/python/brats/brats_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/cloudfoundry/libbuildpack/bratshelper"
1313
"github.com/cloudfoundry/libbuildpack/cutlass"
1414

15-
. "github.com/onsi/ginkgo"
15+
. "github.com/onsi/ginkgo/v2"
1616
. "github.com/onsi/gomega"
1717
)
1818

src/python/brats/brats_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package brats_test
33
import (
44
"github.com/cloudfoundry/libbuildpack/bratshelper"
55
"github.com/cloudfoundry/libbuildpack/cutlass"
6-
. "github.com/onsi/ginkgo"
6+
. "github.com/onsi/ginkgo/v2"
77
. "github.com/onsi/gomega"
88
"golang.org/x/crypto/bcrypt"
99
)

src/python/conda/conda_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package conda_test
22

33
import (
4-
. "github.com/onsi/ginkgo"
4+
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
66

77
"testing"

src/python/conda/conda_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/cloudfoundry/libbuildpack"
1212
"github.com/cloudfoundry/libbuildpack/ansicleaner"
1313
"github.com/golang/mock/gomock"
14-
. "github.com/onsi/ginkgo"
14+
. "github.com/onsi/ginkgo/v2"
1515
. "github.com/onsi/gomega"
1616
)
1717

src/python/finalize/cli/cli_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main_test
22

33
import (
4-
. "github.com/onsi/ginkgo"
4+
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
66

77
"testing"

src/python/finalize/finalize_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package finalize_test
22

33
import (
4-
. "github.com/onsi/ginkgo"
4+
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
66

77
"testing"

src/python/finalize/finalize_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/cloudfoundry/libbuildpack"
1414
"github.com/cloudfoundry/libbuildpack/ansicleaner"
1515
"github.com/golang/mock/gomock"
16-
. "github.com/onsi/ginkgo"
16+
. "github.com/onsi/ginkgo/v2"
1717
. "github.com/onsi/gomega"
1818
)
1919

src/python/hooks/appdynamics_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"github.com/cloudfoundry/libbuildpack"
1414
"github.com/cloudfoundry/libbuildpack/ansicleaner"
15-
. "github.com/onsi/ginkgo"
15+
. "github.com/onsi/ginkgo/v2"
1616
. "github.com/onsi/gomega"
1717
)
1818

0 commit comments

Comments
 (0)