Skip to content

Commit d3e4b96

Browse files
authored
Update our vendored deps to more modern versions. (#47)
## Summary: The vendored `golangci-lint` didn't work with the version of Go we're using now. The vendored `pyflakes` didn't work with python3.12. (Which is not the version we're using now, but some people have it installed as their default.) I should probably update the javascript deps as well, but they don't seem to be broken for anything so I'm leaving them alone for now. I don't know how to test the upgrades very well. I now match the versions we use in webapp. Issue: https://khanacademy.slack.com/archives/C02NV1DPJ/p1726506371960829 ## Test plan: For Go, I successfully ran `ka-lint formatter.go` in the Khan/stackdriver-gae-logrus-plugin directory. For Python, I successfully ran ``` python3.12 -c 'import flake8.api.legacy; flake8.api.legacy.get_style_guide() ``` Before this change, it gave an import error. Author: csilvers Reviewers: MiguelCastillo Required Reviewers: Approved By: MiguelCastillo Checks: Pull Request URL: #47
1 parent 024a286 commit d3e4b96

File tree

3,319 files changed

+493450
-222878
lines changed

Some content is hidden

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

3,319 files changed

+493450
-222878
lines changed

go.mod

+183-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,190 @@
11
module khan_linter
22

3-
go 1.12
3+
// This file is taken from the go.mod in Khan/webapp.
44

5-
require github.com/golangci/golangci-lint v1.21.0
5+
go 1.22.2
66

7-
require gopkg.in/yaml.v2 v2.2.7 // Lock the version to the same as golangci-lint
7+
require github.com/golangci/golangci-lint v1.42.0
8+
9+
require (
10+
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
11+
4d63.com/gochecknoglobals v0.2.1 // indirect
12+
github.com/4meepo/tagalign v1.3.3 // indirect
13+
github.com/Abirdcfly/dupword v0.0.14 // indirect
14+
github.com/Antonboom/errname v0.1.12 // indirect
15+
github.com/Antonboom/nilnil v0.1.7 // indirect
16+
github.com/Antonboom/testifylint v1.2.0 // indirect
17+
github.com/BurntSushi/toml v1.3.2 // indirect
18+
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
19+
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 // indirect
20+
github.com/Masterminds/semver v1.5.0 // indirect
21+
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
22+
github.com/alecthomas/go-check-sumtype v0.1.4 // indirect
23+
github.com/alexkohler/nakedret/v2 v2.0.4 // indirect
24+
github.com/alexkohler/prealloc v1.0.0 // indirect
25+
github.com/alingse/asasalint v0.0.11 // indirect
26+
github.com/ashanbrown/forbidigo v1.6.0 // indirect
27+
github.com/ashanbrown/makezero v1.1.1 // indirect
28+
github.com/beorn7/perks v1.0.1 // indirect
29+
github.com/bkielbasa/cyclop v1.2.1 // indirect
30+
github.com/blizzy78/varnamelen v0.8.0 // indirect
31+
github.com/bombsimon/wsl/v4 v4.2.1 // indirect
32+
github.com/breml/bidichk v0.2.7 // indirect
33+
github.com/breml/errchkjson v0.3.6 // indirect
34+
github.com/butuzov/ireturn v0.3.0 // indirect
35+
github.com/butuzov/mirror v1.1.0 // indirect
36+
github.com/catenacyber/perfsprint v0.7.1 // indirect
37+
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
38+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
39+
github.com/charithe/durationcheck v0.0.10 // indirect
40+
github.com/chavacava/garif v0.1.0 // indirect
41+
github.com/ckaznocha/intrange v0.1.1 // indirect
42+
github.com/curioswitch/go-reassign v0.2.0 // indirect
43+
github.com/daixiang0/gci v0.12.3 // indirect
44+
github.com/davecgh/go-spew v1.1.1 // indirect
45+
github.com/denis-tingaikin/go-header v0.5.0 // indirect
46+
github.com/ettle/strcase v0.2.0 // indirect
47+
github.com/fatih/color v1.16.0 // indirect
48+
github.com/fatih/structtag v1.2.0 // indirect
49+
github.com/firefart/nonamedreturns v1.0.4 // indirect
50+
github.com/fsnotify/fsnotify v1.5.4 // indirect
51+
github.com/fzipp/gocyclo v0.6.0 // indirect
52+
github.com/ghostiam/protogetter v0.3.5 // indirect
53+
github.com/go-critic/go-critic v0.11.2 // indirect
54+
github.com/go-toolsmith/astcast v1.1.0 // indirect
55+
github.com/go-toolsmith/astcopy v1.1.0 // indirect
56+
github.com/go-toolsmith/astequal v1.2.0 // indirect
57+
github.com/go-toolsmith/astfmt v1.1.0 // indirect
58+
github.com/go-toolsmith/astp v1.1.0 // indirect
59+
github.com/go-toolsmith/strparse v1.1.0 // indirect
60+
github.com/go-toolsmith/typep v1.1.0 // indirect
61+
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
62+
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
63+
github.com/gobwas/glob v0.2.3 // indirect
64+
github.com/gofrs/flock v0.8.1 // indirect
65+
github.com/golang/protobuf v1.5.3 // indirect
66+
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
67+
github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e // indirect
68+
github.com/golangci/misspell v0.4.1 // indirect
69+
github.com/golangci/plugin-module-register v0.1.1 // indirect
70+
github.com/golangci/revgrep v0.5.2 // indirect
71+
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
72+
github.com/google/go-cmp v0.6.0 // indirect
73+
github.com/gordonklaus/ineffassign v0.1.0 // indirect
74+
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
75+
github.com/gostaticanalysis/comment v1.4.2 // indirect
76+
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
77+
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
78+
github.com/hashicorp/go-version v1.6.0 // indirect
79+
github.com/hashicorp/hcl v1.0.0 // indirect
80+
github.com/hexops/gotextdiff v1.0.3 // indirect
81+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
82+
github.com/jgautheron/goconst v1.7.1 // indirect
83+
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
84+
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
85+
github.com/jjti/go-spancheck v0.5.3 // indirect
86+
github.com/julz/importas v0.1.0 // indirect
87+
github.com/karamaru-alpha/copyloopvar v1.0.10 // indirect
88+
github.com/kisielk/errcheck v1.7.0 // indirect
89+
github.com/kkHAIKE/contextcheck v1.1.5 // indirect
90+
github.com/kulti/thelper v0.6.3 // indirect
91+
github.com/kunwardeep/paralleltest v1.0.10 // indirect
92+
github.com/kyoh86/exportloopref v0.1.11 // indirect
93+
github.com/ldez/gomoddirectives v0.2.4 // indirect
94+
github.com/ldez/tagliatelle v0.5.0 // indirect
95+
github.com/leonklingele/grouper v1.1.1 // indirect
96+
github.com/lufeee/execinquery v1.2.1 // indirect
97+
github.com/macabu/inamedparam v0.1.3 // indirect
98+
github.com/magiconair/properties v1.8.6 // indirect
99+
github.com/maratori/testableexamples v1.0.0 // indirect
100+
github.com/maratori/testpackage v1.1.1 // indirect
101+
github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect
102+
github.com/mattn/go-colorable v0.1.13 // indirect
103+
github.com/mattn/go-isatty v0.0.20 // indirect
104+
github.com/mattn/go-runewidth v0.0.9 // indirect
105+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
106+
github.com/mgechev/revive v1.3.7 // indirect
107+
github.com/mitchellh/go-homedir v1.1.0 // indirect
108+
github.com/mitchellh/mapstructure v1.5.0 // indirect
109+
github.com/moricho/tparallel v0.3.1 // indirect
110+
github.com/nakabonne/nestif v0.3.1 // indirect
111+
github.com/nishanths/exhaustive v0.12.0 // indirect
112+
github.com/nishanths/predeclared v0.2.2 // indirect
113+
github.com/nunnatsa/ginkgolinter v0.16.2 // indirect
114+
github.com/olekukonko/tablewriter v0.0.5 // indirect
115+
github.com/pelletier/go-toml v1.9.5 // indirect
116+
github.com/pelletier/go-toml/v2 v2.2.0 // indirect
117+
github.com/pmezard/go-difflib v1.0.0 // indirect
118+
github.com/polyfloyd/go-errorlint v1.4.8 // indirect
119+
github.com/prometheus/client_golang v1.12.1 // indirect
120+
github.com/prometheus/client_model v0.2.0 // indirect
121+
github.com/prometheus/common v0.32.1 // indirect
122+
github.com/prometheus/procfs v0.7.3 // indirect
123+
github.com/quasilyte/go-ruleguard v0.4.2 // indirect
124+
github.com/quasilyte/gogrep v0.5.0 // indirect
125+
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
126+
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
127+
github.com/ryancurrah/gomodguard v1.3.1 // indirect
128+
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
129+
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
130+
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
131+
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
132+
github.com/sashamelentyev/usestdlibvars v1.25.0 // indirect
133+
github.com/securego/gosec/v2 v2.19.0 // indirect
134+
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
135+
github.com/sirupsen/logrus v1.9.3 // indirect
136+
github.com/sivchari/containedctx v1.0.3 // indirect
137+
github.com/sivchari/tenv v1.7.1 // indirect
138+
github.com/sonatard/noctx v0.0.2 // indirect
139+
github.com/sourcegraph/go-diff v0.7.0 // indirect
140+
github.com/spf13/afero v1.11.0 // indirect
141+
github.com/spf13/cast v1.5.0 // indirect
142+
github.com/spf13/cobra v1.7.0 // indirect
143+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
144+
github.com/spf13/pflag v1.0.5 // indirect
145+
github.com/spf13/viper v1.12.0 // indirect
146+
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
147+
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
148+
github.com/stretchr/objx v0.5.2 // indirect
149+
github.com/stretchr/testify v1.9.0 // indirect
150+
github.com/subosito/gotenv v1.4.1 // indirect
151+
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
152+
github.com/tdakkota/asciicheck v0.2.0 // indirect
153+
github.com/tetafro/godot v1.4.16 // indirect
154+
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect
155+
github.com/timonwong/loggercheck v0.9.4 // indirect
156+
github.com/tomarrell/wrapcheck/v2 v2.8.3 // indirect
157+
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
158+
github.com/ultraware/funlen v0.1.0 // indirect
159+
github.com/ultraware/whitespace v0.1.0 // indirect
160+
github.com/uudashr/gocognit v1.1.2 // indirect
161+
github.com/xen0n/gosmopolitan v1.2.2 // indirect
162+
github.com/yagipy/maintidx v1.0.0 // indirect
163+
github.com/yeya24/promlinter v0.2.0 // indirect
164+
github.com/ykadowak/zerologlint v0.1.5 // indirect
165+
gitlab.com/bosi/decorder v0.4.1 // indirect
166+
go-simpler.org/musttag v0.9.0 // indirect
167+
go-simpler.org/sloglint v0.5.0 // indirect
168+
go.uber.org/atomic v1.7.0 // indirect
169+
go.uber.org/automaxprocs v1.5.3 // indirect
170+
go.uber.org/multierr v1.6.0 // indirect
171+
go.uber.org/zap v1.24.0 // indirect
172+
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
173+
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
174+
golang.org/x/mod v0.16.0 // indirect
175+
golang.org/x/sync v0.6.0 // indirect
176+
golang.org/x/sys v0.18.0 // indirect
177+
golang.org/x/text v0.14.0 // indirect
178+
golang.org/x/tools v0.19.0 // indirect
179+
google.golang.org/protobuf v1.33.0 // indirect
180+
gopkg.in/ini.v1 v1.67.0 // indirect
181+
gopkg.in/yaml.v2 v2.4.0 // indirect
182+
gopkg.in/yaml.v3 v3.0.1 // indirect
183+
honnef.co/go/tools v0.4.7 // indirect
184+
mvdan.cc/gofumpt v0.6.0 // indirect
185+
mvdan.cc/unparam v0.0.0-20240104100049-c549a3470d14 // indirect
186+
)
8187

9188
// https://github.com/golangci/golangci-lint/pull/937
10189
// https://github.com/Khan/golangci-lint/tree/custom-autofix
11-
replace github.com/golangci/golangci-lint => github.com/Khan/golangci-lint v1.21.1-0.20200124164953-d5b1882bad50
12-
13-
// https://github.com/golang/tools/pull/156
14-
// https://github.com/golang/tools/pull/160
15-
replace golang.org/x/tools => github.com/golangci/tools v0.0.0-20190915081525-6aa350649b1c
190+
replace github.com/golangci/golangci-lint => github.com/Khan/golangci-lint v1.57.2

0 commit comments

Comments
 (0)