Skip to content

Commit 51fe6da

Browse files
authored
Use of/gini instead of inifrance/gini (#2331)
The github.com/irifrance/gini package has been purged from github An existing version that preserved that history has been forked to the operator-framework org, and this commit updates that dependency to use the forked version. Signed-off-by: kevinrizza <[email protected]>
1 parent cf3b8a4 commit 51fe6da

Some content is hidden

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

59 files changed

+111
-78
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ require (
1515
github.com/golang/mock v1.4.1
1616
github.com/google/go-cmp v0.5.6
1717
github.com/googleapis/gnostic v0.5.5
18-
github.com/irifrance/gini v1.0.1
1918
github.com/itchyny/gojq v0.11.0
2019
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
2120
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
@@ -26,6 +25,7 @@ require (
2625
github.com/openshift/api v0.0.0-20200331152225-585af27e34fd
2726
github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
2827
github.com/operator-framework/api v0.10.3
28+
github.com/operator-framework/gini v1.1.0
2929
github.com/operator-framework/operator-registry v1.17.5
3030
github.com/otiai10/copy v1.2.0
3131
github.com/pkg/errors v0.9.1

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -631,8 +631,6 @@ github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH
631631
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
632632
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
633633
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
634-
github.com/irifrance/gini v1.0.1 h1:oTABiARLoRsnTmda0uY2u2e5kfm8e6meBZB19lf5xhE=
635-
github.com/irifrance/gini v1.0.1/go.mod h1:swH5OTtiG/X/YrU06r288qZwq6I1agpbuXQOB55xqGU=
636634
github.com/itchyny/astgen-go v0.0.0-20200519013840-cf3ea398f645 h1:3gyXljUyTWWTv/NMFPvwgxJSdE9Mamg2r3x8HMBl+Uo=
637635
github.com/itchyny/astgen-go v0.0.0-20200519013840-cf3ea398f645/go.mod h1:296z3W7Xsrp2mlIY88ruDKscuvrkL6zXCNRtaYVshzw=
638636
github.com/itchyny/go-flags v1.5.0/go.mod h1:lenkYuCobuxLBAd/HGFE4LRoW8D3B6iXRQfWYJ+MNbA=
@@ -880,6 +878,8 @@ github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
880878
github.com/operator-framework/api v0.7.1/go.mod h1:L7IvLd/ckxJEJg/t4oTTlnHKAJIP/p51AvEslW3wYdY=
881879
github.com/operator-framework/api v0.10.3 h1:C4DE7Rr3+ztUw3mKiFyfAiUJSVOty/cJmpwE90/kYro=
882880
github.com/operator-framework/api v0.10.3/go.mod h1:tV0BUNvly7szq28ZPBXhjp1Sqg5yHCOeX19ui9K4vjI=
881+
github.com/operator-framework/gini v1.1.0 h1:w84bE/pi0nlnIRAxzYguoYAnL9s5T6RSVZKYWcxO3yI=
882+
github.com/operator-framework/gini v1.1.0/go.mod h1:L4GlF3xPPfQUoWglKhaBcR8/LZn3fWtMB1mwUyOGv98=
883883
github.com/operator-framework/operator-registry v1.17.5 h1:LR8m1rFz5Gcyje8WK6iYt+gIhtzqo52zMRALdmTYHT0=
884884
github.com/operator-framework/operator-registry v1.17.5/go.mod h1:sRQIgDMZZdUcmHltzyCnM6RUoDF+WS8Arj1BQIARDS8=
885885
github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=

pkg/controller/registry/resolver/solver/constraints.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"strings"
66

7-
"github.com/irifrance/gini/logic"
8-
"github.com/irifrance/gini/z"
7+
"github.com/operator-framework/gini/logic"
8+
"github.com/operator-framework/gini/z"
99
)
1010

1111
// Constraint implementations limit the circumstances under which a

pkg/controller/registry/resolver/solver/lit_mapping.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"strings"
66

7-
"github.com/irifrance/gini/inter"
8-
"github.com/irifrance/gini/logic"
9-
"github.com/irifrance/gini/z"
7+
"github.com/operator-framework/gini/inter"
8+
"github.com/operator-framework/gini/logic"
9+
"github.com/operator-framework/gini/z"
1010
)
1111

1212
type DuplicateIdentifier Identifier

pkg/controller/registry/resolver/solver/search.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package solver
33
import (
44
"context"
55

6-
"github.com/irifrance/gini/inter"
7-
"github.com/irifrance/gini/z"
6+
"github.com/operator-framework/gini/inter"
7+
"github.com/operator-framework/gini/z"
88
)
99

1010
type choice struct {

pkg/controller/registry/resolver/solver/search_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -o zz_search_test.go ../../../../../vendor/github.com/irifrance/gini/inter S
1+
//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -o zz_search_test.go ../../../../../vendor/github.com/operator-framework/gini/inter S
22

33
package solver
44

55
import (
66
"context"
77
"testing"
88

9-
"github.com/irifrance/gini/inter"
10-
"github.com/irifrance/gini/z"
9+
"github.com/operator-framework/gini/inter"
10+
"github.com/operator-framework/gini/z"
1111
"github.com/stretchr/testify/assert"
1212
)
1313

pkg/controller/registry/resolver/solver/solve.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"fmt"
77
"strings"
88

9-
"github.com/irifrance/gini"
10-
"github.com/irifrance/gini/inter"
11-
"github.com/irifrance/gini/z"
9+
"github.com/operator-framework/gini"
10+
"github.com/operator-framework/gini/inter"
11+
"github.com/operator-framework/gini/z"
1212
)
1313

1414
var Incomplete = errors.New("cancelled before a solution could be found")

pkg/controller/registry/resolver/solver/zz_search_test.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/irifrance/gini/go.mod

-1
This file was deleted.

vendor/github.com/irifrance/gini/README.md vendor/github.com/operator-framework/gini/README.md

+47-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/irifrance/gini/dimacs/cnf.go vendor/github.com/operator-framework/gini/dimacs/cnf.go

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/irifrance/gini/dimacs/icnf.go vendor/github.com/operator-framework/gini/dimacs/icnf.go

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/irifrance/gini/dimacs/lit.go vendor/github.com/operator-framework/gini/dimacs/lit.go

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/irifrance/gini/dimacs/vis.go vendor/github.com/operator-framework/gini/dimacs/vis.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/irifrance/gini/gini.go vendor/github.com/operator-framework/gini/gini.go

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/operator-framework/gini/go.mod

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/irifrance/gini/inter/s.go vendor/github.com/operator-framework/gini/inter/s.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/irifrance/gini/internal/xo/active.go vendor/github.com/operator-framework/gini/internal/xo/active.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/irifrance/gini/internal/xo/cdat.go vendor/github.com/operator-framework/gini/internal/xo/cdat.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/irifrance/gini/internal/xo/cdb.go vendor/github.com/operator-framework/gini/internal/xo/cdb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/irifrance/gini/internal/xo/cgc.go vendor/github.com/operator-framework/gini/internal/xo/cgc.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/irifrance/gini/internal/xo/cloc.go vendor/github.com/operator-framework/gini/internal/xo/cloc.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)