From 085e8316685f89067906bfbb775f7cee8d8b176f Mon Sep 17 00:00:00 2001 From: Adam Lesperance Date: Fri, 20 Sep 2024 11:10:11 -0500 Subject: [PATCH] The package version must match the major tag version (#1654) * Update package version * Update makefile targets * Update readme packages * Remaining old packages via rg/sd --- Makefile | 24 +++++++++---------- README.md | 6 ++--- cmd/experiments/colors/main.go | 2 +- cmd/mlr/main.go | 2 +- cmd/scan/main.go | 2 +- cmd/sizes/main.go | 4 ++-- docs/src/build.md | 8 +++---- docs/src/build.md.in | 8 +++---- docs/src/miller-as-library.md | 14 +++++------ docs/src/miller-as-library/main1.go | 4 ++-- docs/src/miller-as-library/main2.go | 12 +++++----- docs/src/miller-as-library/main3.go | 10 ++++---- go.mod | 6 ++--- pkg/bifs/arithmetic.go | 4 ++-- pkg/bifs/arithmetic_test.go | 2 +- pkg/bifs/base.go | 6 ++--- pkg/bifs/bits.go | 2 +- pkg/bifs/bits_test.go | 2 +- pkg/bifs/booleans.go | 2 +- pkg/bifs/cmp.go | 4 ++-- pkg/bifs/collections.go | 4 ++-- pkg/bifs/collections_test.go | 2 +- pkg/bifs/datetime.go | 6 ++--- pkg/bifs/hashing.go | 2 +- pkg/bifs/hashing_test.go | 2 +- pkg/bifs/mathlib.go | 4 ++-- pkg/bifs/percentiles.go | 2 +- pkg/bifs/random.go | 4 ++-- pkg/bifs/regex.go | 4 ++-- pkg/bifs/relative_time.go | 2 +- pkg/bifs/stats.go | 4 ++-- pkg/bifs/stats_test.go | 2 +- pkg/bifs/strings.go | 4 ++-- pkg/bifs/system.go | 6 ++--- pkg/bifs/types.go | 6 ++--- pkg/cli/flag_types.go | 4 ++-- pkg/cli/option_parse.go | 6 ++--- pkg/cli/option_types.go | 2 +- pkg/cli/verb_utils.go | 2 +- pkg/climain/mlrcli_mlrrc.go | 2 +- pkg/climain/mlrcli_parse.go | 14 +++++------ pkg/climain/mlrcli_shebang.go | 2 +- pkg/dsl/ast_build.go | 4 ++-- pkg/dsl/ast_types.go | 2 +- pkg/dsl/cst/assignments.go | 6 ++--- pkg/dsl/cst/block_exit.go | 6 ++--- pkg/dsl/cst/blocks.go | 6 ++--- pkg/dsl/cst/builtin_function_manager.go | 6 ++--- pkg/dsl/cst/builtin_functions.go | 10 ++++---- pkg/dsl/cst/collections.go | 10 ++++---- pkg/dsl/cst/cond.go | 10 ++++---- pkg/dsl/cst/dump.go | 10 ++++---- pkg/dsl/cst/emit1.go | 8 +++---- pkg/dsl/cst/emit_emitp.go | 14 +++++------ pkg/dsl/cst/emitf.go | 12 +++++----- pkg/dsl/cst/env.go | 8 +++---- pkg/dsl/cst/evaluable.go | 8 +++---- pkg/dsl/cst/filter.go | 6 ++--- pkg/dsl/cst/for.go | 10 ++++---- pkg/dsl/cst/functions.go | 4 ++-- pkg/dsl/cst/hofs.go | 8 +++---- pkg/dsl/cst/if.go | 10 ++++---- pkg/dsl/cst/keyword_usage.go | 4 ++-- pkg/dsl/cst/leaves.go | 8 +++---- pkg/dsl/cst/lvalues.go | 8 +++---- pkg/dsl/cst/print.go | 10 ++++---- pkg/dsl/cst/root.go | 14 +++++------ pkg/dsl/cst/signature.go | 2 +- pkg/dsl/cst/statements.go | 2 +- pkg/dsl/cst/subroutines.go | 4 ++-- pkg/dsl/cst/tee.go | 12 +++++----- pkg/dsl/cst/types.go | 8 +++---- pkg/dsl/cst/udf.go | 10 ++++---- pkg/dsl/cst/uds.go | 10 ++++---- pkg/dsl/cst/validate.go | 4 ++-- pkg/dsl/cst/warn.go | 4 ++-- pkg/dsl/cst/while.go | 8 +++---- pkg/dsl/token.go | 2 +- pkg/entrypoint/entrypoint.go | 14 +++++------ pkg/input/line_reader.go | 2 +- pkg/input/pseudo_reader_gen.go | 8 +++---- pkg/input/record_reader.go | 2 +- pkg/input/record_reader_benchmark_test.go | 4 ++-- pkg/input/record_reader_csv.go | 10 ++++---- pkg/input/record_reader_csvlite.go | 8 +++---- pkg/input/record_reader_dkvp_nidx.go | 8 +++---- pkg/input/record_reader_dkvp_test.go | 2 +- pkg/input/record_reader_factory.go | 2 +- pkg/input/record_reader_json.go | 8 +++---- pkg/input/record_reader_markdown.go | 2 +- pkg/input/record_reader_pprint.go | 8 +++---- pkg/input/record_reader_tsv.go | 8 +++---- pkg/input/record_reader_xtab.go | 8 +++---- pkg/input/splitters.go | 4 ++-- pkg/lib/halfpipe.go | 2 +- pkg/lib/readfiles.go | 2 +- pkg/mlrval/mlrmap_accessors.go | 2 +- pkg/mlrval/mlrmap_flatten_unflatten.go | 2 +- pkg/mlrval/mlrmap_json.go | 4 ++-- pkg/mlrval/mlrval_accessors.go | 2 +- pkg/mlrval/mlrval_benchmark_test.go | 2 +- pkg/mlrval/mlrval_cmp.go | 2 +- pkg/mlrval/mlrval_collections.go | 2 +- pkg/mlrval/mlrval_get.go | 2 +- pkg/mlrval/mlrval_infer.go | 2 +- pkg/mlrval/mlrval_is.go | 2 +- pkg/mlrval/mlrval_json.go | 4 ++-- pkg/mlrval/mlrval_new.go | 4 ++-- pkg/output/channel_writer.go | 4 ++-- pkg/output/file_output_handlers.go | 6 ++--- pkg/output/record_writer.go | 4 ++-- pkg/output/record_writer_csv.go | 8 +++---- pkg/output/record_writer_csv_colorizer.go | 2 +- pkg/output/record_writer_csvlite.go | 8 +++---- pkg/output/record_writer_dkvp.go | 8 +++---- pkg/output/record_writer_factory.go | 2 +- pkg/output/record_writer_json.go | 6 ++--- pkg/output/record_writer_markdown.go | 8 +++---- pkg/output/record_writer_nidx.go | 6 ++--- pkg/output/record_writer_pprint.go | 8 +++---- pkg/output/record_writer_tsv.go | 10 ++++---- pkg/output/record_writer_xtab.go | 8 +++---- pkg/parsing/errors.go.template | 2 +- pkg/parsing/errors/errors.go | 2 +- pkg/parsing/lexer/acttab.go | 2 +- pkg/parsing/lexer/lexer.go | 2 +- pkg/parsing/mlr.bnf | 2 +- pkg/parsing/parser/parser.go | 4 ++-- pkg/parsing/parser/productionstable.go | 2 +- pkg/runtime/stack.go | 6 ++--- pkg/runtime/state.go | 8 +++---- pkg/scan/find_benchmark_test.go | 2 +- pkg/stream/stream.go | 10 ++++---- pkg/terminals/help/entry.go | 16 ++++++------- pkg/terminals/regtest/invoker.go | 4 ++-- pkg/terminals/regtest/regtester.go | 4 ++-- pkg/terminals/repl/dsl.go | 6 ++--- pkg/terminals/repl/entry.go | 2 +- pkg/terminals/repl/prompt.go | 6 ++--- pkg/terminals/repl/session.go | 16 ++++++------- pkg/terminals/repl/types.go | 10 ++++---- pkg/terminals/repl/verbs.go | 12 +++++----- pkg/terminals/terminals.go | 8 +++---- pkg/transformers/aaa_chain_transformer.go | 4 ++-- pkg/transformers/aaa_record_transformer.go | 4 ++-- pkg/transformers/aaa_transformer_table.go | 4 ++-- pkg/transformers/altkv.go | 6 ++--- pkg/transformers/bar.go | 6 ++--- pkg/transformers/bootstrap.go | 6 ++--- pkg/transformers/case.go | 8 +++---- pkg/transformers/cat.go | 6 ++--- pkg/transformers/check.go | 4 ++-- pkg/transformers/clean_whitespace.go | 8 +++---- pkg/transformers/count.go | 8 +++---- pkg/transformers/count_similar.go | 8 +++---- pkg/transformers/cut.go | 8 +++---- pkg/transformers/decimate.go | 4 ++-- pkg/transformers/fill_down.go | 6 ++--- pkg/transformers/fill_empty.go | 6 ++--- pkg/transformers/flatten.go | 6 ++--- pkg/transformers/format_values.go | 6 ++--- pkg/transformers/fraction.go | 10 ++++---- pkg/transformers/gap.go | 6 ++--- pkg/transformers/grep.go | 4 ++-- pkg/transformers/group_by.go | 6 ++--- pkg/transformers/group_like.go | 6 ++--- pkg/transformers/having_fields.go | 6 ++--- pkg/transformers/head.go | 4 ++-- pkg/transformers/histogram.go | 8 +++---- pkg/transformers/join.go | 12 +++++----- pkg/transformers/json_parse.go | 6 ++--- pkg/transformers/json_stringify.go | 8 +++---- pkg/transformers/label.go | 6 ++--- pkg/transformers/latin1_to_utf8.go | 8 +++---- pkg/transformers/merge_fields.go | 8 +++---- pkg/transformers/most_or_least_frequent.go | 8 +++---- pkg/transformers/nest.go | 8 +++---- pkg/transformers/nothing.go | 4 ++-- pkg/transformers/put_or_filter.go | 14 +++++------ pkg/transformers/regularize.go | 8 +++---- pkg/transformers/remove_empty_columns.go | 6 ++--- pkg/transformers/rename.go | 6 ++--- pkg/transformers/reorder.go | 8 +++---- pkg/transformers/repeat.go | 4 ++-- pkg/transformers/reshape.go | 8 +++---- pkg/transformers/sample.go | 6 ++--- pkg/transformers/sec2gmt.go | 8 +++---- pkg/transformers/sec2gmtdate.go | 8 +++---- pkg/transformers/seqgen.go | 8 +++---- pkg/transformers/shuffle.go | 6 ++--- pkg/transformers/skip_trivial_records.go | 4 ++-- pkg/transformers/sort.go | 8 +++---- pkg/transformers/sort_within_records.go | 4 ++-- pkg/transformers/sparsify.go | 8 +++---- pkg/transformers/split.go | 8 +++---- pkg/transformers/stats1.go | 10 ++++---- pkg/transformers/stats2.go | 10 ++++---- pkg/transformers/step.go | 12 +++++----- pkg/transformers/subs.go | 10 ++++---- pkg/transformers/summary.go | 10 ++++---- pkg/transformers/tac.go | 4 ++-- pkg/transformers/tail.go | 6 ++--- pkg/transformers/tee.go | 6 ++--- pkg/transformers/template.go | 8 +++---- pkg/transformers/top.go | 10 ++++---- pkg/transformers/unflatten.go | 6 ++--- pkg/transformers/uniq.go | 8 +++---- pkg/transformers/unspace.go | 6 ++--- pkg/transformers/unsparsify.go | 8 +++---- pkg/transformers/utf8_to_latin1.go | 8 +++---- pkg/transformers/utils/join_bucket.go | 2 +- pkg/transformers/utils/join_bucket_keeper.go | 10 ++++---- pkg/transformers/utils/percentile_keeper.go | 4 ++-- pkg/transformers/utils/stats1_accumulators.go | 6 ++--- pkg/transformers/utils/stats2_accumulators.go | 4 ++-- pkg/transformers/utils/top_keeper.go | 4 ++-- pkg/transformers/utils/window_keeper.go | 2 +- pkg/types/context.go | 2 +- pkg/types/mlrval_typing.go | 2 +- regression_test.go | 2 +- scripts/compiler-versions-build | 4 ++-- 221 files changed, 668 insertions(+), 668 deletions(-) diff --git a/Makefile b/Makefile index fe27b8dd30..ec2b817cb2 100644 --- a/Makefile +++ b/Makefile @@ -7,12 +7,12 @@ INSTALLDIR=$(PREFIX)/bin # This must remain the first target in this file, which is what 'make' with no # arguments will run. build: - go build github.com/johnkerl/miller/cmd/mlr + go build github.com/johnkerl/miller/v6/cmd/mlr @echo "Build complete. The Miller executable is ./mlr (or .\mlr.exe on Windows)." @echo "You can use 'make check' to run tests". quiet: - @go build github.com/johnkerl/miller/cmd/mlr + @go build github.com/johnkerl/miller/v6/cmd/mlr # For interactive use, 'mlr regtest' offers more options and transparency. check: unit-test regression-test @@ -33,25 +33,25 @@ install: build # ---------------------------------------------------------------- # Unit tests (small number) unit-test ut: build - go test github.com/johnkerl/miller/pkg/... + go test github.com/johnkerl/miller/v6/pkg/... ut-lib:build - go test github.com/johnkerl/miller/pkg/lib... + go test github.com/johnkerl/miller/v6/pkg/lib... ut-scan:build - go test github.com/johnkerl/miller/pkg/scan/... + go test github.com/johnkerl/miller/v6/pkg/scan/... ut-mlv:build - go test github.com/johnkerl/miller/pkg/mlrval/... + go test github.com/johnkerl/miller/v6/pkg/mlrval/... ut-bifs:build - go test github.com/johnkerl/miller/pkg/bifs/... + go test github.com/johnkerl/miller/v6/pkg/bifs/... ut-input:build - go test github.com/johnkerl/miller/pkg/input/... + go test github.com/johnkerl/miller/v6/pkg/input/... bench:build - go test -run=nonesuch -bench=. github.com/johnkerl/miller/pkg/... + go test -run=nonesuch -bench=. github.com/johnkerl/miller/v6/pkg/... bench-mlv:build - go test -run=nonesuch -bench=. github.com/johnkerl/miller/pkg/mlrval/... + go test -run=nonesuch -bench=. github.com/johnkerl/miller/v6/pkg/mlrval/... bench-input:build - go test -run=nonesuch -bench=. github.com/johnkerl/miller/pkg/input/... + go test -run=nonesuch -bench=. github.com/johnkerl/miller/v6/pkg/input/... # ---------------------------------------------------------------- # Regression tests (large number) @@ -114,7 +114,7 @@ it: build check so: install mlr: - go build github.com/johnkerl/miller/cmd/mlr + go build github.com/johnkerl/miller/v6/cmd/mlr # ---------------------------------------------------------------- # Please see comments in ./create-release-tarball as well as diff --git a/README.md b/README.md index be095ed66c..0819f272e8 100644 --- a/README.md +++ b/README.md @@ -110,9 +110,9 @@ See also [building from source](https://miller.readthedocs.io/en/latest/build.ht * To install: `make install`. This installs the executable `/usr/local/bin/mlr` and manual page `/usr/local/share/man/man1/mlr.1` (so you can do `man mlr`). * You can do `./configure --prefix=/some/install/path` before `make install` if you want to install somewhere other than `/usr/local`. * Without `make`: - * To build: `go build github.com/johnkerl/miller/cmd/mlr`. - * To run tests: `go test github.com/johnkerl/miller/pkg/...` and `mlr regtest`. - * To install: `go install github.com/johnkerl/miller/cmd/mlr` will install to _GOPATH_`/bin/mlr`. + * To build: `go build github.com/johnkerl/miller/v6/cmd/mlr`. + * To run tests: `go test github.com/johnkerl/miller/v6/pkg/...` and `mlr regtest`. + * To install: `go install github.com/johnkerl/miller/v6/cmd/mlr` will install to _GOPATH_`/bin/mlr`. * See also the doc page on [building from source](https://miller.readthedocs.io/en/latest/build). * For more developer information please see [README-dev.md](./README-dev.md). diff --git a/cmd/experiments/colors/main.go b/cmd/experiments/colors/main.go index 5f5093eeee..3539d3c1e5 100644 --- a/cmd/experiments/colors/main.go +++ b/cmd/experiments/colors/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/johnkerl/miller/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/colorizer" ) const boldString = "\u001b[1m" diff --git a/cmd/mlr/main.go b/cmd/mlr/main.go index 3e37bdca10..dc2b1f8b42 100644 --- a/cmd/mlr/main.go +++ b/cmd/mlr/main.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/johnkerl/miller/pkg/entrypoint" + "github.com/johnkerl/miller/v6/pkg/entrypoint" "github.com/pkg/profile" // for trace.out ) diff --git a/cmd/scan/main.go b/cmd/scan/main.go index f93e0226e6..d42b081153 100644 --- a/cmd/scan/main.go +++ b/cmd/scan/main.go @@ -8,7 +8,7 @@ import ( "fmt" "os" - "github.com/johnkerl/miller/pkg/scan" + "github.com/johnkerl/miller/v6/pkg/scan" ) func main() { diff --git a/cmd/sizes/main.go b/cmd/sizes/main.go index 5ae6209cca..8e06398fe2 100644 --- a/cmd/sizes/main.go +++ b/cmd/sizes/main.go @@ -3,7 +3,7 @@ // ================================================================ /* -go build github.com/johnkerl/miller/cmd/sizes +go build github.com/johnkerl/miller/v6/cmd/sizes */ package main @@ -11,7 +11,7 @@ package main import ( "fmt" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) func main() { diff --git a/docs/src/build.md b/docs/src/build.md index 0b6787898a..0bceafb0d8 100644 --- a/docs/src/build.md +++ b/docs/src/build.md @@ -31,16 +31,16 @@ Two-clause BSD license [https://github.com/johnkerl/miller/blob/master/LICENSE.t * `cd mlr-i.j.k` * `cd go` * `make` creates the `./mlr` (or `.\mlr.exe` on Windows) executable - * Without `make`: `go build github.com/johnkerl/miller/cmd/mlr` + * Without `make`: `go build github.com/johnkerl/miller/v6/cmd/mlr` * `make check` runs tests - * Without `make`: `go test github.com/johnkerl/miller/pkg/...` and `mlr regtest` + * Without `make`: `go test github.com/johnkerl/miller/v6/pkg/...` and `mlr regtest` * `make install` installs the `mlr` executable and the `mlr` manpage - * Without make: `go install github.com/johnkerl/miller/cmd/mlr` will install to _GOPATH_`/bin/mlr` + * Without make: `go install github.com/johnkerl/miller/v6/cmd/mlr` will install to _GOPATH_`/bin/mlr` ## From git clone * `git clone https://github.com/johnkerl/miller` -* `make`/`go build github.com/johnkerl/miller/cmd/mlr` as above +* `make`/`go build github.com/johnkerl/miller/v6/cmd/mlr` as above ## In case of problems diff --git a/docs/src/build.md.in b/docs/src/build.md.in index 5138c9b8fb..ef3e4aa7d8 100644 --- a/docs/src/build.md.in +++ b/docs/src/build.md.in @@ -15,16 +15,16 @@ Two-clause BSD license [https://github.com/johnkerl/miller/blob/master/LICENSE.t * `cd mlr-i.j.k` * `cd go` * `make` creates the `./mlr` (or `.\mlr.exe` on Windows) executable - * Without `make`: `go build github.com/johnkerl/miller/cmd/mlr` + * Without `make`: `go build github.com/johnkerl/miller/v6/cmd/mlr` * `make check` runs tests - * Without `make`: `go test github.com/johnkerl/miller/pkg/...` and `mlr regtest` + * Without `make`: `go test github.com/johnkerl/miller/v6/pkg/...` and `mlr regtest` * `make install` installs the `mlr` executable and the `mlr` manpage - * Without make: `go install github.com/johnkerl/miller/cmd/mlr` will install to _GOPATH_`/bin/mlr` + * Without make: `go install github.com/johnkerl/miller/v6/cmd/mlr` will install to _GOPATH_`/bin/mlr` ## From git clone * `git clone https://github.com/johnkerl/miller` -* `make`/`go build github.com/johnkerl/miller/cmd/mlr` as above +* `make`/`go build github.com/johnkerl/miller/v6/cmd/mlr` as above ## In case of problems diff --git a/docs/src/miller-as-library.md b/docs/src/miller-as-library.md index c17872ba02..219b1f6537 100644 --- a/docs/src/miller-as-library.md +++ b/docs/src/miller-as-library.md @@ -50,8 +50,8 @@ package main import ( "fmt" - "github.com/johnkerl/miller/pkg/bifs" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/bifs" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) func main() { @@ -86,11 +86,11 @@ import ( "fmt" "os" - "github.com/johnkerl/miller/pkg/bifs" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/input" - "github.com/johnkerl/miller/pkg/output" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/bifs" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/input" + "github.com/johnkerl/miller/v6/pkg/output" + "github.com/johnkerl/miller/v6/pkg/types" ) // Put your record-processing logic here. diff --git a/docs/src/miller-as-library/main1.go b/docs/src/miller-as-library/main1.go index c56f5a0db9..68823b9f24 100644 --- a/docs/src/miller-as-library/main1.go +++ b/docs/src/miller-as-library/main1.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/johnkerl/miller/pkg/bifs" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/bifs" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) func main() { diff --git a/docs/src/miller-as-library/main2.go b/docs/src/miller-as-library/main2.go index c460a174aa..8434f14bdf 100644 --- a/docs/src/miller-as-library/main2.go +++ b/docs/src/miller-as-library/main2.go @@ -7,11 +7,11 @@ import ( "fmt" "os" - "github.com/johnkerl/miller/pkg/bifs" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/input" - "github.com/johnkerl/miller/pkg/output" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/bifs" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/input" + "github.com/johnkerl/miller/v6/pkg/output" + "github.com/johnkerl/miller/v6/pkg/types" ) // Put your record-processing logic here. @@ -49,7 +49,7 @@ func custom_options() *cli.TOptions { func run_custom_processor( fileNames []string, options *cli.TOptions, - record_processor func (irac *types.RecordAndContext) (*types.RecordAndContext, error), + record_processor func(irac *types.RecordAndContext) (*types.RecordAndContext, error), ) error { outputStream := os.Stdout outputIsStdout := true diff --git a/docs/src/miller-as-library/main3.go b/docs/src/miller-as-library/main3.go index 07d4be50e9..23a400453d 100644 --- a/docs/src/miller-as-library/main3.go +++ b/docs/src/miller-as-library/main3.go @@ -7,11 +7,11 @@ import ( "fmt" "os" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/input" - "github.com/johnkerl/miller/pkg/output" - "github.com/johnkerl/miller/pkg/transformers" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/input" + "github.com/johnkerl/miller/v6/pkg/output" + "github.com/johnkerl/miller/v6/pkg/transformers" + "github.com/johnkerl/miller/v6/pkg/types" ) func convert_csv_to_json(fileNames []string) error { diff --git a/go.mod b/go.mod index f9f4db916e..3589037231 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/johnkerl/miller +module github.com/johnkerl/miller/v6 // The repo is 'miller' and the executable is 'mlr', going back many years and // predating the Go port. @@ -7,8 +7,8 @@ module github.com/johnkerl/miller // executable would be 'miller' not 'mlr'. // // So we have cmd/mlr/main.go: -// * go build github.com/johnkerl/miller/cmd/mlr -// * go install github.com/johnkerl/miller/cmd/mlr +// * go build github.com/johnkerl/miller/v6/cmd/mlr +// * go install github.com/johnkerl/miller/v6/cmd/mlr // go get github.com/johnkerl/lumin@v1.0.0 // Local development: diff --git a/pkg/bifs/arithmetic.go b/pkg/bifs/arithmetic.go index f5a2b853e9..1edf7cee4a 100644 --- a/pkg/bifs/arithmetic.go +++ b/pkg/bifs/arithmetic.go @@ -4,8 +4,8 @@ import ( "fmt" "math" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) // ================================================================ diff --git a/pkg/bifs/arithmetic_test.go b/pkg/bifs/arithmetic_test.go index 76efd45eac..393a3a968c 100644 --- a/pkg/bifs/arithmetic_test.go +++ b/pkg/bifs/arithmetic_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) func TestBIF_plus_unary(t *testing.T) { diff --git a/pkg/bifs/base.go b/pkg/bifs/base.go index 28aa0d6bf7..0f299048fc 100644 --- a/pkg/bifs/base.go +++ b/pkg/bifs/base.go @@ -50,9 +50,9 @@ package bifs import ( "fmt" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // Function-pointer type for zary functions. diff --git a/pkg/bifs/bits.go b/pkg/bifs/bits.go index 5ed8cc20e7..c9001c431b 100644 --- a/pkg/bifs/bits.go +++ b/pkg/bifs/bits.go @@ -1,7 +1,7 @@ package bifs import ( - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) // ================================================================ diff --git a/pkg/bifs/bits_test.go b/pkg/bifs/bits_test.go index 96718e00d3..9239d58a4f 100644 --- a/pkg/bifs/bits_test.go +++ b/pkg/bifs/bits_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) func TestBIF_bitcount(t *testing.T) { diff --git a/pkg/bifs/booleans.go b/pkg/bifs/booleans.go index c0b3bc3dba..181e5cbc62 100644 --- a/pkg/bifs/booleans.go +++ b/pkg/bifs/booleans.go @@ -5,7 +5,7 @@ package bifs import ( - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) func BIF_logical_NOT(input1 *mlrval.Mlrval) *mlrval.Mlrval { diff --git a/pkg/bifs/cmp.go b/pkg/bifs/cmp.go index 832feab570..b4603d2a87 100644 --- a/pkg/bifs/cmp.go +++ b/pkg/bifs/cmp.go @@ -5,8 +5,8 @@ package bifs import ( - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pkg/bifs/collections.go b/pkg/bifs/collections.go index 247622740d..cd3f87da2c 100644 --- a/pkg/bifs/collections.go +++ b/pkg/bifs/collections.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) // ================================================================ diff --git a/pkg/bifs/collections_test.go b/pkg/bifs/collections_test.go index 16ffba8c63..595e8c6704 100644 --- a/pkg/bifs/collections_test.go +++ b/pkg/bifs/collections_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) func TestBIF_length(t *testing.T) { diff --git a/pkg/bifs/datetime.go b/pkg/bifs/datetime.go index 9fa11e6b0e..84bd48fd1e 100644 --- a/pkg/bifs/datetime.go +++ b/pkg/bifs/datetime.go @@ -5,11 +5,11 @@ import ( "regexp" "time" - strptime "github.com/johnkerl/miller/pkg/pbnjay-strptime" + strptime "github.com/johnkerl/miller/v6/pkg/pbnjay-strptime" "github.com/lestrrat-go/strftime" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) const ISO8601_TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ" diff --git a/pkg/bifs/hashing.go b/pkg/bifs/hashing.go index e2d09d1e41..829c676016 100644 --- a/pkg/bifs/hashing.go +++ b/pkg/bifs/hashing.go @@ -7,7 +7,7 @@ import ( "crypto/sha512" "fmt" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) func BIF_md5(input1 *mlrval.Mlrval) *mlrval.Mlrval { diff --git a/pkg/bifs/hashing_test.go b/pkg/bifs/hashing_test.go index 6b44028be7..5e3c177f11 100644 --- a/pkg/bifs/hashing_test.go +++ b/pkg/bifs/hashing_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) func TestBIF_md5(t *testing.T) { diff --git a/pkg/bifs/mathlib.go b/pkg/bifs/mathlib.go index b415cb8091..1c5395f690 100644 --- a/pkg/bifs/mathlib.go +++ b/pkg/bifs/mathlib.go @@ -7,8 +7,8 @@ package bifs import ( "math" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) // ---------------------------------------------------------------- diff --git a/pkg/bifs/percentiles.go b/pkg/bifs/percentiles.go index cecb98aec8..ef10838798 100644 --- a/pkg/bifs/percentiles.go +++ b/pkg/bifs/percentiles.go @@ -3,7 +3,7 @@ package bifs import ( "math" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) func GetPercentileLinearlyInterpolated( diff --git a/pkg/bifs/random.go b/pkg/bifs/random.go index c85509da66..007174db95 100644 --- a/pkg/bifs/random.go +++ b/pkg/bifs/random.go @@ -3,8 +3,8 @@ package bifs import ( "math" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) func BIF_urand() *mlrval.Mlrval { diff --git a/pkg/bifs/regex.go b/pkg/bifs/regex.go index 25e0fe5c91..011c21ac29 100644 --- a/pkg/bifs/regex.go +++ b/pkg/bifs/regex.go @@ -3,8 +3,8 @@ package bifs import ( "strings" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) // BIF_ssub implements the ssub function -- no-frills string-replace, no diff --git a/pkg/bifs/relative_time.go b/pkg/bifs/relative_time.go index f36258ffe4..d05ce39003 100644 --- a/pkg/bifs/relative_time.go +++ b/pkg/bifs/relative_time.go @@ -5,7 +5,7 @@ import ( "math" "strings" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) func BIF_dhms2sec(input1 *mlrval.Mlrval) *mlrval.Mlrval { diff --git a/pkg/bifs/stats.go b/pkg/bifs/stats.go index ff3531a314..d7bd3f1068 100644 --- a/pkg/bifs/stats.go +++ b/pkg/bifs/stats.go @@ -4,8 +4,8 @@ import ( "math" "sort" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) // ---------------------------------------------------------------- diff --git a/pkg/bifs/stats_test.go b/pkg/bifs/stats_test.go index 735ceab835..a8e846897f 100644 --- a/pkg/bifs/stats_test.go +++ b/pkg/bifs/stats_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) func stats_test_array(n int) *mlrval.Mlrval { diff --git a/pkg/bifs/strings.go b/pkg/bifs/strings.go index e77de7c684..73aef62bfb 100644 --- a/pkg/bifs/strings.go +++ b/pkg/bifs/strings.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) // ================================================================ diff --git a/pkg/bifs/system.go b/pkg/bifs/system.go index e2044b4b8c..e734f2998d 100644 --- a/pkg/bifs/system.go +++ b/pkg/bifs/system.go @@ -6,9 +6,9 @@ import ( "runtime" "strings" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/platform" - "github.com/johnkerl/miller/pkg/version" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/platform" + "github.com/johnkerl/miller/v6/pkg/version" ) func BIF_version() *mlrval.Mlrval { diff --git a/pkg/bifs/types.go b/pkg/bifs/types.go index 87ee80448d..a4eb1f2300 100644 --- a/pkg/bifs/types.go +++ b/pkg/bifs/types.go @@ -5,9 +5,9 @@ import ( "math" "os" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ================================================================ diff --git a/pkg/cli/flag_types.go b/pkg/cli/flag_types.go index 590487d43c..f1eef47727 100644 --- a/pkg/cli/flag_types.go +++ b/pkg/cli/flag_types.go @@ -42,8 +42,8 @@ import ( "sort" "strings" - "github.com/johnkerl/miller/pkg/colorizer" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/pkg/cli/option_parse.go b/pkg/cli/option_parse.go index a17d4658f5..34db19a774 100644 --- a/pkg/cli/option_parse.go +++ b/pkg/cli/option_parse.go @@ -16,9 +16,9 @@ import ( "github.com/mattn/go-isatty" - "github.com/johnkerl/miller/pkg/colorizer" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) // FinalizeReaderOptions does a few things. diff --git a/pkg/cli/option_types.go b/pkg/cli/option_types.go index 7cbece965b..19227fd73f 100644 --- a/pkg/cli/option_types.go +++ b/pkg/cli/option_types.go @@ -9,7 +9,7 @@ package cli import ( "regexp" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/lib" ) type TCommentHandling int diff --git a/pkg/cli/verb_utils.go b/pkg/cli/verb_utils.go index 421af9af83..d20901998e 100644 --- a/pkg/cli/verb_utils.go +++ b/pkg/cli/verb_utils.go @@ -9,7 +9,7 @@ import ( "os" "strconv" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/lib" ) // For flags with values, e.g. ["-n" "10"], while we're looking at the "-n" this let us see if the "10" slot exists. diff --git a/pkg/climain/mlrcli_mlrrc.go b/pkg/climain/mlrcli_mlrrc.go index d3c5c14019..ce0a857895 100644 --- a/pkg/climain/mlrcli_mlrrc.go +++ b/pkg/climain/mlrcli_mlrrc.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "github.com/johnkerl/miller/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/cli" ) // loadMlrrcOrDie rule: If $MLRRC is set, use it and only it. Otherwise try diff --git a/pkg/climain/mlrcli_parse.go b/pkg/climain/mlrcli_parse.go index 52e772d4b9..3641958247 100644 --- a/pkg/climain/mlrcli_parse.go +++ b/pkg/climain/mlrcli_parse.go @@ -74,13 +74,13 @@ import ( "fmt" "os" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/terminals" - "github.com/johnkerl/miller/pkg/terminals/help" - "github.com/johnkerl/miller/pkg/transformers" - "github.com/johnkerl/miller/pkg/version" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/terminals" + "github.com/johnkerl/miller/v6/pkg/terminals/help" + "github.com/johnkerl/miller/v6/pkg/transformers" + "github.com/johnkerl/miller/v6/pkg/version" ) // ParseCommandLine is the entrypoint for handling the Miller command line: diff --git a/pkg/climain/mlrcli_shebang.go b/pkg/climain/mlrcli_shebang.go index e0e2f91c80..686c9f2d28 100644 --- a/pkg/climain/mlrcli_shebang.go +++ b/pkg/climain/mlrcli_shebang.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/lib" shellquote "github.com/kballard/go-shellquote" ) diff --git a/pkg/dsl/ast_build.go b/pkg/dsl/ast_build.go index f417998f69..bba98e1e3b 100644 --- a/pkg/dsl/ast_build.go +++ b/pkg/dsl/ast_build.go @@ -8,8 +8,8 @@ package dsl import ( "fmt" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/parsing/token" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/parsing/token" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/ast_types.go b/pkg/dsl/ast_types.go index 6856ce8303..80fd7dcc5a 100644 --- a/pkg/dsl/ast_types.go +++ b/pkg/dsl/ast_types.go @@ -5,7 +5,7 @@ package dsl import ( - "github.com/johnkerl/miller/pkg/parsing/token" + "github.com/johnkerl/miller/v6/pkg/parsing/token" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/assignments.go b/pkg/dsl/cst/assignments.go index 129ec850c4..81bcac85f4 100644 --- a/pkg/dsl/cst/assignments.go +++ b/pkg/dsl/cst/assignments.go @@ -5,9 +5,9 @@ package cst import ( - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/runtime" ) // ================================================================ diff --git a/pkg/dsl/cst/block_exit.go b/pkg/dsl/cst/block_exit.go index b52b363cb5..3ba730705a 100644 --- a/pkg/dsl/cst/block_exit.go +++ b/pkg/dsl/cst/block_exit.go @@ -8,9 +8,9 @@ package cst import ( "fmt" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/runtime" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/blocks.go b/pkg/dsl/cst/blocks.go index d51c70d75e..4b47bf574d 100644 --- a/pkg/dsl/cst/blocks.go +++ b/pkg/dsl/cst/blocks.go @@ -6,9 +6,9 @@ package cst import ( - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/runtime" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/builtin_function_manager.go b/pkg/dsl/cst/builtin_function_manager.go index ec4bfa9808..e35ee8b0b4 100644 --- a/pkg/dsl/cst/builtin_function_manager.go +++ b/pkg/dsl/cst/builtin_function_manager.go @@ -19,9 +19,9 @@ import ( "sort" "strings" - "github.com/johnkerl/miller/pkg/bifs" - "github.com/johnkerl/miller/pkg/colorizer" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/bifs" + "github.com/johnkerl/miller/v6/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/lib" ) type TFunctionClass string diff --git a/pkg/dsl/cst/builtin_functions.go b/pkg/dsl/cst/builtin_functions.go index ef5a6fb98e..495cea6b3e 100644 --- a/pkg/dsl/cst/builtin_functions.go +++ b/pkg/dsl/cst/builtin_functions.go @@ -7,11 +7,11 @@ package cst import ( "fmt" - "github.com/johnkerl/miller/pkg/bifs" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/bifs" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/runtime" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/collections.go b/pkg/dsl/cst/collections.go index 1dcee4daf3..85866f7d71 100644 --- a/pkg/dsl/cst/collections.go +++ b/pkg/dsl/cst/collections.go @@ -8,11 +8,11 @@ package cst import ( "fmt" - "github.com/johnkerl/miller/pkg/bifs" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/bifs" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/runtime" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/cond.go b/pkg/dsl/cst/cond.go index f7f0063e35..aca452f432 100644 --- a/pkg/dsl/cst/cond.go +++ b/pkg/dsl/cst/cond.go @@ -8,11 +8,11 @@ package cst import ( "fmt" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/parsing/token" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/parsing/token" + "github.com/johnkerl/miller/v6/pkg/runtime" ) type CondBlockNode struct { diff --git a/pkg/dsl/cst/dump.go b/pkg/dsl/cst/dump.go index 14070527db..ba41ce16a1 100644 --- a/pkg/dsl/cst/dump.go +++ b/pkg/dsl/cst/dump.go @@ -21,11 +21,11 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/output" - "github.com/johnkerl/miller/pkg/runtime" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/output" + "github.com/johnkerl/miller/v6/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/types" ) // ================================================================ diff --git a/pkg/dsl/cst/emit1.go b/pkg/dsl/cst/emit1.go index a4996e312e..5ea14c8f4d 100644 --- a/pkg/dsl/cst/emit1.go +++ b/pkg/dsl/cst/emit1.go @@ -22,10 +22,10 @@ package cst import ( "fmt" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/runtime" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/types" ) type Emit1StatementNode struct { diff --git a/pkg/dsl/cst/emit_emitp.go b/pkg/dsl/cst/emit_emitp.go index 3552f023d2..323c7495ad 100644 --- a/pkg/dsl/cst/emit_emitp.go +++ b/pkg/dsl/cst/emit_emitp.go @@ -41,13 +41,13 @@ package cst import ( "fmt" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/output" - "github.com/johnkerl/miller/pkg/runtime" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/output" + "github.com/johnkerl/miller/v6/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/types" ) // ================================================================ diff --git a/pkg/dsl/cst/emitf.go b/pkg/dsl/cst/emitf.go index 97aebfe980..bb211f64a8 100644 --- a/pkg/dsl/cst/emitf.go +++ b/pkg/dsl/cst/emitf.go @@ -8,12 +8,12 @@ package cst import ( "fmt" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/output" - "github.com/johnkerl/miller/pkg/runtime" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/output" + "github.com/johnkerl/miller/v6/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/types" ) // ================================================================ diff --git a/pkg/dsl/cst/env.go b/pkg/dsl/cst/env.go index c2f038f2da..25e70a511a 100644 --- a/pkg/dsl/cst/env.go +++ b/pkg/dsl/cst/env.go @@ -10,10 +10,10 @@ package cst import ( "os" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/runtime" ) type EnvironmentVariableNode struct { diff --git a/pkg/dsl/cst/evaluable.go b/pkg/dsl/cst/evaluable.go index 9440537bab..ea5673be93 100644 --- a/pkg/dsl/cst/evaluable.go +++ b/pkg/dsl/cst/evaluable.go @@ -10,10 +10,10 @@ import ( "fmt" "os" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/runtime" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/filter.go b/pkg/dsl/cst/filter.go index 4a4d3984e1..dbcbb22526 100644 --- a/pkg/dsl/cst/filter.go +++ b/pkg/dsl/cst/filter.go @@ -19,9 +19,9 @@ package cst import ( - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/runtime" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/for.go b/pkg/dsl/cst/for.go index 22c490c47d..75e7cf2586 100644 --- a/pkg/dsl/cst/for.go +++ b/pkg/dsl/cst/for.go @@ -7,11 +7,11 @@ package cst import ( "fmt" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/parsing/token" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/parsing/token" + "github.com/johnkerl/miller/v6/pkg/runtime" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/functions.go b/pkg/dsl/cst/functions.go index 5aca6d3978..c214cd3497 100644 --- a/pkg/dsl/cst/functions.go +++ b/pkg/dsl/cst/functions.go @@ -9,8 +9,8 @@ package cst import ( - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/hofs.go b/pkg/dsl/cst/hofs.go index a7d94a7c22..67ab64b4a8 100644 --- a/pkg/dsl/cst/hofs.go +++ b/pkg/dsl/cst/hofs.go @@ -14,12 +14,12 @@ import ( "github.com/facette/natsort" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/runtime" ) -// Most function types are in the github.com/johnkerl/miller/pkg/types package. These types, though, +// Most function types are in the github.com/johnkerl/miller/v6/pkg/types package. These types, though, // include functions which need to access CST state in order to call back to // user-defined functions. To avoid a package-cycle dependency, they are // defined here. diff --git a/pkg/dsl/cst/if.go b/pkg/dsl/cst/if.go index b947c7f6e4..a25f60eb82 100644 --- a/pkg/dsl/cst/if.go +++ b/pkg/dsl/cst/if.go @@ -7,11 +7,11 @@ package cst import ( "fmt" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/parsing/token" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/parsing/token" + "github.com/johnkerl/miller/v6/pkg/runtime" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/keyword_usage.go b/pkg/dsl/cst/keyword_usage.go index c5bec8f7a9..0f53419809 100644 --- a/pkg/dsl/cst/keyword_usage.go +++ b/pkg/dsl/cst/keyword_usage.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/johnkerl/miller/pkg/colorizer" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/leaves.go b/pkg/dsl/cst/leaves.go index 0e3621d7de..81612d85f9 100644 --- a/pkg/dsl/cst/leaves.go +++ b/pkg/dsl/cst/leaves.go @@ -8,10 +8,10 @@ import ( "fmt" "math" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/runtime" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/lvalues.go b/pkg/dsl/cst/lvalues.go index 073c5d991b..cb18d78326 100644 --- a/pkg/dsl/cst/lvalues.go +++ b/pkg/dsl/cst/lvalues.go @@ -9,10 +9,10 @@ import ( "fmt" "os" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/runtime" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/print.go b/pkg/dsl/cst/print.go index 8c68593beb..f00c712a82 100644 --- a/pkg/dsl/cst/print.go +++ b/pkg/dsl/cst/print.go @@ -9,11 +9,11 @@ import ( "fmt" "os" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/output" - "github.com/johnkerl/miller/pkg/runtime" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/output" + "github.com/johnkerl/miller/v6/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/root.go b/pkg/dsl/cst/root.go index f48ebc3307..a5b2f4848e 100644 --- a/pkg/dsl/cst/root.go +++ b/pkg/dsl/cst/root.go @@ -11,13 +11,13 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/output" - "github.com/johnkerl/miller/pkg/parsing/lexer" - "github.com/johnkerl/miller/pkg/parsing/parser" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/output" + "github.com/johnkerl/miller/v6/pkg/parsing/lexer" + "github.com/johnkerl/miller/v6/pkg/parsing/parser" + "github.com/johnkerl/miller/v6/pkg/runtime" ) // NewEmptyRoot sets up an empty CST, before ingesting any DSL strings. For diff --git a/pkg/dsl/cst/signature.go b/pkg/dsl/cst/signature.go index 1ee5547635..210ac4a4e2 100644 --- a/pkg/dsl/cst/signature.go +++ b/pkg/dsl/cst/signature.go @@ -6,7 +6,7 @@ package cst import ( - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/statements.go b/pkg/dsl/cst/statements.go index ce42cb8544..251618f19c 100644 --- a/pkg/dsl/cst/statements.go +++ b/pkg/dsl/cst/statements.go @@ -8,7 +8,7 @@ package cst import ( "fmt" - "github.com/johnkerl/miller/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/dsl" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/subroutines.go b/pkg/dsl/cst/subroutines.go index 6c1b76dae1..3f04de745f 100644 --- a/pkg/dsl/cst/subroutines.go +++ b/pkg/dsl/cst/subroutines.go @@ -9,8 +9,8 @@ package cst import ( - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/tee.go b/pkg/dsl/cst/tee.go index df9b8ff0b2..7a9542eea5 100644 --- a/pkg/dsl/cst/tee.go +++ b/pkg/dsl/cst/tee.go @@ -7,12 +7,12 @@ package cst import ( "fmt" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/output" - "github.com/johnkerl/miller/pkg/runtime" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/output" + "github.com/johnkerl/miller/v6/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/types.go b/pkg/dsl/cst/types.go index f490ca02b4..bc1b2768a3 100644 --- a/pkg/dsl/cst/types.go +++ b/pkg/dsl/cst/types.go @@ -7,10 +7,10 @@ package cst import ( "container/list" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/runtime" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/udf.go b/pkg/dsl/cst/udf.go index 042366afce..4add00e88f 100644 --- a/pkg/dsl/cst/udf.go +++ b/pkg/dsl/cst/udf.go @@ -8,11 +8,11 @@ import ( "fmt" "os" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/runtime" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/uds.go b/pkg/dsl/cst/uds.go index 2ed14fa564..c9f888ca2d 100644 --- a/pkg/dsl/cst/uds.go +++ b/pkg/dsl/cst/uds.go @@ -7,11 +7,11 @@ package cst import ( "fmt" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/runtime" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/validate.go b/pkg/dsl/cst/validate.go index 305c1bf7f4..989b3d0e7a 100644 --- a/pkg/dsl/cst/validate.go +++ b/pkg/dsl/cst/validate.go @@ -9,8 +9,8 @@ package cst import ( "fmt" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/warn.go b/pkg/dsl/cst/warn.go index 55850c8b16..75c5d04362 100644 --- a/pkg/dsl/cst/warn.go +++ b/pkg/dsl/cst/warn.go @@ -11,8 +11,8 @@ import ( "fmt" "os" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/pkg/dsl/cst/while.go b/pkg/dsl/cst/while.go index 4e088df6cd..46ea57e321 100644 --- a/pkg/dsl/cst/while.go +++ b/pkg/dsl/cst/while.go @@ -7,10 +7,10 @@ package cst import ( "fmt" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/parsing/token" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/parsing/token" + "github.com/johnkerl/miller/v6/pkg/runtime" ) // ================================================================ diff --git a/pkg/dsl/token.go b/pkg/dsl/token.go index ff79d26e0f..6808941d23 100644 --- a/pkg/dsl/token.go +++ b/pkg/dsl/token.go @@ -3,7 +3,7 @@ package dsl import ( "fmt" - "github.com/johnkerl/miller/pkg/parsing/token" + "github.com/johnkerl/miller/v6/pkg/parsing/token" ) // TokenToLocationInfo is used to track runtime errors back to source-code locations in DSL diff --git a/pkg/entrypoint/entrypoint.go b/pkg/entrypoint/entrypoint.go index 962fc59fc6..7426c726d1 100644 --- a/pkg/entrypoint/entrypoint.go +++ b/pkg/entrypoint/entrypoint.go @@ -10,13 +10,13 @@ import ( "os" "path" - "github.com/johnkerl/miller/pkg/auxents" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/climain" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/platform" - "github.com/johnkerl/miller/pkg/stream" - "github.com/johnkerl/miller/pkg/transformers" + "github.com/johnkerl/miller/v6/pkg/auxents" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/climain" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/platform" + "github.com/johnkerl/miller/v6/pkg/stream" + "github.com/johnkerl/miller/v6/pkg/transformers" ) type MainReturn struct { diff --git a/pkg/input/line_reader.go b/pkg/input/line_reader.go index 6779b65db5..663178c5df 100644 --- a/pkg/input/line_reader.go +++ b/pkg/input/line_reader.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/lib" ) type ILineReader interface { diff --git a/pkg/input/pseudo_reader_gen.go b/pkg/input/pseudo_reader_gen.go index 6479cb4d72..fa949e01ae 100644 --- a/pkg/input/pseudo_reader_gen.go +++ b/pkg/input/pseudo_reader_gen.go @@ -4,10 +4,10 @@ import ( "container/list" "fmt" - "github.com/johnkerl/miller/pkg/bifs" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/bifs" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) type PseudoReaderGen struct { diff --git a/pkg/input/record_reader.go b/pkg/input/record_reader.go index 62a411f222..3ad932f2f3 100644 --- a/pkg/input/record_reader.go +++ b/pkg/input/record_reader.go @@ -6,7 +6,7 @@ package input import ( "container/list" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/types" ) // Since Go is concurrent, the context struct (AWK-like variables such as diff --git a/pkg/input/record_reader_benchmark_test.go b/pkg/input/record_reader_benchmark_test.go index 9d23529831..7b79c32ad0 100644 --- a/pkg/input/record_reader_benchmark_test.go +++ b/pkg/input/record_reader_benchmark_test.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/johnkerl/miller/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/cli" ) -// go test -run=nonesuch -bench=. github.com/johnkerl/miller/pkg/input/... +// go test -run=nonesuch -bench=. github.com/johnkerl/miller/v6/pkg/input/... func BenchmarkDKVPParse(b *testing.B) { readerOptions := &cli.TReaderOptions{ diff --git a/pkg/input/record_reader_csv.go b/pkg/input/record_reader_csv.go index 68949b25ab..976f6ed1dd 100644 --- a/pkg/input/record_reader_csv.go +++ b/pkg/input/record_reader_csv.go @@ -8,12 +8,12 @@ import ( "strconv" "strings" - csv "github.com/johnkerl/miller/pkg/go-csv" + csv "github.com/johnkerl/miller/v6/pkg/go-csv" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/input/record_reader_csvlite.go b/pkg/input/record_reader_csvlite.go index 5109770df9..dd590da828 100644 --- a/pkg/input/record_reader_csvlite.go +++ b/pkg/input/record_reader_csvlite.go @@ -25,10 +25,10 @@ import ( "strconv" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // recordBatchGetterCSV points to either an explicit-CSV-header or diff --git a/pkg/input/record_reader_dkvp_nidx.go b/pkg/input/record_reader_dkvp_nidx.go index a5509a23d4..efc0ae385c 100644 --- a/pkg/input/record_reader_dkvp_nidx.go +++ b/pkg/input/record_reader_dkvp_nidx.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // splitter_DKVP_NIDX is a function type for the one bit of code differing diff --git a/pkg/input/record_reader_dkvp_test.go b/pkg/input/record_reader_dkvp_test.go index 77e0e557f5..b73b971035 100644 --- a/pkg/input/record_reader_dkvp_test.go +++ b/pkg/input/record_reader_dkvp_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/johnkerl/miller/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/cli" ) func TestRecordFromDKVPLine(t *testing.T) { diff --git a/pkg/input/record_reader_factory.go b/pkg/input/record_reader_factory.go index 26d2f81ede..c4fd13934c 100644 --- a/pkg/input/record_reader_factory.go +++ b/pkg/input/record_reader_factory.go @@ -3,7 +3,7 @@ package input import ( "fmt" - "github.com/johnkerl/miller/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/cli" ) func Create(readerOptions *cli.TReaderOptions, recordsPerBatch int64) (IRecordReader, error) { diff --git a/pkg/input/record_reader_json.go b/pkg/input/record_reader_json.go index aaa49a1786..094dca9963 100644 --- a/pkg/input/record_reader_json.go +++ b/pkg/input/record_reader_json.go @@ -8,10 +8,10 @@ import ( "encoding/json" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) type RecordReaderJSON struct { diff --git a/pkg/input/record_reader_markdown.go b/pkg/input/record_reader_markdown.go index 22cc3a078f..1766967fc7 100644 --- a/pkg/input/record_reader_markdown.go +++ b/pkg/input/record_reader_markdown.go @@ -3,7 +3,7 @@ package input import ( "regexp" - "github.com/johnkerl/miller/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/cli" ) func NewRecordReaderMarkdown( diff --git a/pkg/input/record_reader_pprint.go b/pkg/input/record_reader_pprint.go index 5cb4bfbad2..d3ed2c228e 100644 --- a/pkg/input/record_reader_pprint.go +++ b/pkg/input/record_reader_pprint.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) func NewRecordReaderPPRINT( diff --git a/pkg/input/record_reader_tsv.go b/pkg/input/record_reader_tsv.go index 02a3c4f6ee..4db48f669f 100644 --- a/pkg/input/record_reader_tsv.go +++ b/pkg/input/record_reader_tsv.go @@ -7,10 +7,10 @@ import ( "strconv" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // recordBatchGetterTSV points to either an explicit-TSV-header or diff --git a/pkg/input/record_reader_xtab.go b/pkg/input/record_reader_xtab.go index 31294012c2..b108f771db 100644 --- a/pkg/input/record_reader_xtab.go +++ b/pkg/input/record_reader_xtab.go @@ -8,10 +8,10 @@ import ( "regexp" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) type iXTABPairSplitter interface { diff --git a/pkg/input/splitters.go b/pkg/input/splitters.go index aa3e43b596..5e24e0b73a 100644 --- a/pkg/input/splitters.go +++ b/pkg/input/splitters.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" ) // IPairSplitter splits a string into left and right, e.g. for IPS. diff --git a/pkg/lib/halfpipe.go b/pkg/lib/halfpipe.go index 276b2893b1..040896a002 100644 --- a/pkg/lib/halfpipe.go +++ b/pkg/lib/halfpipe.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/johnkerl/miller/pkg/platform" + "github.com/johnkerl/miller/v6/pkg/platform" ) // OpenOutboundHalfPipe returns a handle to a process. Writing to that handle diff --git a/pkg/lib/readfiles.go b/pkg/lib/readfiles.go index 305f8a2b52..6eaaa0d171 100644 --- a/pkg/lib/readfiles.go +++ b/pkg/lib/readfiles.go @@ -9,7 +9,7 @@ import ( "os" "strings" - csv "github.com/johnkerl/miller/pkg/go-csv" + csv "github.com/johnkerl/miller/v6/pkg/go-csv" ) // LoadStringsFromFileOrDir calls LoadStringFromFile if path exists and is a diff --git a/pkg/mlrval/mlrmap_accessors.go b/pkg/mlrval/mlrmap_accessors.go index 0ba61fda50..caea8e2ab0 100644 --- a/pkg/mlrval/mlrmap_accessors.go +++ b/pkg/mlrval/mlrmap_accessors.go @@ -5,7 +5,7 @@ import ( "fmt" "strconv" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/lib" ) // IsEmpty determines if a map is empty. diff --git a/pkg/mlrval/mlrmap_flatten_unflatten.go b/pkg/mlrval/mlrmap_flatten_unflatten.go index 8e48ba515d..579522f223 100644 --- a/pkg/mlrval/mlrmap_flatten_unflatten.go +++ b/pkg/mlrval/mlrmap_flatten_unflatten.go @@ -25,7 +25,7 @@ package mlrval import ( "strings" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/pkg/mlrval/mlrmap_json.go b/pkg/mlrval/mlrmap_json.go index a985098eb3..2db38dd9dc 100644 --- a/pkg/mlrval/mlrmap_json.go +++ b/pkg/mlrval/mlrmap_json.go @@ -7,8 +7,8 @@ package mlrval import ( "bytes" - "github.com/johnkerl/miller/pkg/colorizer" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/pkg/mlrval/mlrval_accessors.go b/pkg/mlrval/mlrval_accessors.go index f788cc35b2..e6d8a44e31 100644 --- a/pkg/mlrval/mlrval_accessors.go +++ b/pkg/mlrval/mlrval_accessors.go @@ -3,7 +3,7 @@ package mlrval import ( "strconv" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/lib" ) func (mv *Mlrval) GetArrayLength() (int, bool) { diff --git a/pkg/mlrval/mlrval_benchmark_test.go b/pkg/mlrval/mlrval_benchmark_test.go index 8d7c576b2c..9cb79f349a 100644 --- a/pkg/mlrval/mlrval_benchmark_test.go +++ b/pkg/mlrval/mlrval_benchmark_test.go @@ -4,7 +4,7 @@ import ( "testing" ) -// go test -run=nonesuch -bench=. github.com/johnkerl/miller/pkg/mlrval/... +// go test -run=nonesuch -bench=. github.com/johnkerl/miller/v6/pkg/mlrval/... func BenchmarkFromDeferredType(b *testing.B) { for i := 0; i < b.N; i++ { diff --git a/pkg/mlrval/mlrval_cmp.go b/pkg/mlrval/mlrval_cmp.go index cebd3af25f..f631420a2c 100644 --- a/pkg/mlrval/mlrval_cmp.go +++ b/pkg/mlrval/mlrval_cmp.go @@ -14,7 +14,7 @@ package mlrval import ( - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/lib" ) type CmpFuncBool func(input1, input2 *Mlrval) bool diff --git a/pkg/mlrval/mlrval_collections.go b/pkg/mlrval/mlrval_collections.go index 5f4e305a6e..46e2d3718c 100644 --- a/pkg/mlrval/mlrval_collections.go +++ b/pkg/mlrval/mlrval_collections.go @@ -74,7 +74,7 @@ import ( "os" "strconv" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/lib" ) // ================================================================ diff --git a/pkg/mlrval/mlrval_get.go b/pkg/mlrval/mlrval_get.go index 2eb6bfb66c..9c681229d8 100644 --- a/pkg/mlrval/mlrval_get.go +++ b/pkg/mlrval/mlrval_get.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/lib" ) // It's essential that we use mv.Type() not mv.mvtype, or use an Is...() diff --git a/pkg/mlrval/mlrval_infer.go b/pkg/mlrval/mlrval_infer.go index 5be0abef2f..2c9a200647 100644 --- a/pkg/mlrval/mlrval_infer.go +++ b/pkg/mlrval/mlrval_infer.go @@ -3,7 +3,7 @@ package mlrval import ( "strconv" - "github.com/johnkerl/miller/pkg/scan" + "github.com/johnkerl/miller/v6/pkg/scan" ) // TODO: comment no infer-bool from data files. Always false in this path. diff --git a/pkg/mlrval/mlrval_is.go b/pkg/mlrval/mlrval_is.go index 5b3fcd9e8c..7f438871f5 100644 --- a/pkg/mlrval/mlrval_is.go +++ b/pkg/mlrval/mlrval_is.go @@ -1,7 +1,7 @@ package mlrval import ( - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/lib" ) // It's essential that we use mv.Type() not mv.mvtype since types are diff --git a/pkg/mlrval/mlrval_json.go b/pkg/mlrval/mlrval_json.go index 5dfd996244..fd7d6711ea 100644 --- a/pkg/mlrval/mlrval_json.go +++ b/pkg/mlrval/mlrval_json.go @@ -14,8 +14,8 @@ import ( "fmt" "io" - "github.com/johnkerl/miller/pkg/colorizer" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/lib" ) const JSON_INDENT_STRING string = " " diff --git a/pkg/mlrval/mlrval_new.go b/pkg/mlrval/mlrval_new.go index c4109af262..bcad5590b8 100644 --- a/pkg/mlrval/mlrval_new.go +++ b/pkg/mlrval/mlrval_new.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/lib" ) // TODO: comment for JSON-scanner context. @@ -318,7 +318,7 @@ func (mv *Mlrval) SetFromPrevalidatedBoolString(input string, boolval bool) *Mlr // The user-defined function is of type 'interface{}' here to avoid what would // otherwise be a package-dependency cycle between this package and -// github.com/johnkerl/miller/pkg/dsl/cst. +// github.com/johnkerl/miller/v6/pkg/dsl/cst. // // Nominally the name argument is the user-specified name if `func f(a, b) { // ... }`, or some autogenerated UUID like `fl0052` if `func (a, b) { ... }`. diff --git a/pkg/output/channel_writer.go b/pkg/output/channel_writer.go index 3eb8b1338e..86be3324a9 100644 --- a/pkg/output/channel_writer.go +++ b/pkg/output/channel_writer.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/types" ) func ChannelWriter( diff --git a/pkg/output/file_output_handlers.go b/pkg/output/file_output_handlers.go index d21cfb812b..a5b3824ee5 100644 --- a/pkg/output/file_output_handlers.go +++ b/pkg/output/file_output_handlers.go @@ -20,9 +20,9 @@ import ( "io" "os" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/types" ) // ================================================================ diff --git a/pkg/output/record_writer.go b/pkg/output/record_writer.go index ceb7522d24..e3c2246676 100644 --- a/pkg/output/record_writer.go +++ b/pkg/output/record_writer.go @@ -3,8 +3,8 @@ package output import ( "bufio" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // IRecordWriter is the abstract interface for all record-writers. They are diff --git a/pkg/output/record_writer_csv.go b/pkg/output/record_writer_csv.go index efedd64bfb..ffd76f2ec3 100644 --- a/pkg/output/record_writer_csv.go +++ b/pkg/output/record_writer_csv.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - csv "github.com/johnkerl/miller/pkg/go-csv" + csv "github.com/johnkerl/miller/v6/pkg/go-csv" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) type RecordWriterCSV struct { diff --git a/pkg/output/record_writer_csv_colorizer.go b/pkg/output/record_writer_csv_colorizer.go index 9cb103b6a1..a9efd0b30f 100644 --- a/pkg/output/record_writer_csv_colorizer.go +++ b/pkg/output/record_writer_csv_colorizer.go @@ -47,7 +47,7 @@ import ( "strings" "unicode/utf8" - "github.com/johnkerl/miller/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/colorizer" ) var errInvalidDelim = errors.New("csv: invalid field or comment delimiter") diff --git a/pkg/output/record_writer_csvlite.go b/pkg/output/record_writer_csvlite.go index 280abf38d8..ac36a82709 100644 --- a/pkg/output/record_writer_csvlite.go +++ b/pkg/output/record_writer_csvlite.go @@ -4,10 +4,10 @@ import ( "bufio" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/colorizer" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) type RecordWriterCSVLite struct { diff --git a/pkg/output/record_writer_dkvp.go b/pkg/output/record_writer_dkvp.go index 79ea8de053..692fa94804 100644 --- a/pkg/output/record_writer_dkvp.go +++ b/pkg/output/record_writer_dkvp.go @@ -3,10 +3,10 @@ package output import ( "bufio" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/colorizer" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) type RecordWriterDKVP struct { diff --git a/pkg/output/record_writer_factory.go b/pkg/output/record_writer_factory.go index ae7941490e..84ff64cfed 100644 --- a/pkg/output/record_writer_factory.go +++ b/pkg/output/record_writer_factory.go @@ -3,7 +3,7 @@ package output import ( "fmt" - "github.com/johnkerl/miller/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/cli" ) func Create(writerOptions *cli.TWriterOptions) (IRecordWriter, error) { diff --git a/pkg/output/record_writer_json.go b/pkg/output/record_writer_json.go index 1a1e7ed58f..d0be014619 100644 --- a/pkg/output/record_writer_json.go +++ b/pkg/output/record_writer_json.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/output/record_writer_markdown.go b/pkg/output/record_writer_markdown.go index 94137822d3..64bc8bb97d 100644 --- a/pkg/output/record_writer_markdown.go +++ b/pkg/output/record_writer_markdown.go @@ -4,10 +4,10 @@ import ( "bufio" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/colorizer" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) type RecordWriterMarkdown struct { diff --git a/pkg/output/record_writer_nidx.go b/pkg/output/record_writer_nidx.go index ac599e3a72..45d01c45b1 100644 --- a/pkg/output/record_writer_nidx.go +++ b/pkg/output/record_writer_nidx.go @@ -3,9 +3,9 @@ package output import ( "bufio" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) type RecordWriterNIDX struct { diff --git a/pkg/output/record_writer_pprint.go b/pkg/output/record_writer_pprint.go index 6b2f92f1f7..acb3366e2d 100644 --- a/pkg/output/record_writer_pprint.go +++ b/pkg/output/record_writer_pprint.go @@ -7,10 +7,10 @@ import ( "strings" "unicode/utf8" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/colorizer" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) type RecordWriterPPRINT struct { diff --git a/pkg/output/record_writer_tsv.go b/pkg/output/record_writer_tsv.go index 0e845be79b..17f1ce5630 100644 --- a/pkg/output/record_writer_tsv.go +++ b/pkg/output/record_writer_tsv.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/colorizer" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) type RecordWriterTSV struct { diff --git a/pkg/output/record_writer_xtab.go b/pkg/output/record_writer_xtab.go index bfacdde95e..5d1b52fa01 100644 --- a/pkg/output/record_writer_xtab.go +++ b/pkg/output/record_writer_xtab.go @@ -5,10 +5,10 @@ import ( "fmt" "unicode/utf8" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/colorizer" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/parsing/errors.go.template b/pkg/parsing/errors.go.template index 5c39ede1d4..11d8a45392 100644 --- a/pkg/parsing/errors.go.template +++ b/pkg/parsing/errors.go.template @@ -13,7 +13,7 @@ import ( "fmt" "strings" - "github.com/johnkerl/miller/pkg/parsing/token" + "github.com/johnkerl/miller/v6/pkg/parsing/token" ) type ErrorSymbol interface { diff --git a/pkg/parsing/errors/errors.go b/pkg/parsing/errors/errors.go index 5c39ede1d4..11d8a45392 100644 --- a/pkg/parsing/errors/errors.go +++ b/pkg/parsing/errors/errors.go @@ -13,7 +13,7 @@ import ( "fmt" "strings" - "github.com/johnkerl/miller/pkg/parsing/token" + "github.com/johnkerl/miller/v6/pkg/parsing/token" ) type ErrorSymbol interface { diff --git a/pkg/parsing/lexer/acttab.go b/pkg/parsing/lexer/acttab.go index 18917879fb..b8150ad23e 100644 --- a/pkg/parsing/lexer/acttab.go +++ b/pkg/parsing/lexer/acttab.go @@ -5,7 +5,7 @@ package lexer import ( "fmt" - "github.com/johnkerl/miller/pkg/parsing/token" + "github.com/johnkerl/miller/v6/pkg/parsing/token" ) type ActionTable [NumStates]ActionRow diff --git a/pkg/parsing/lexer/lexer.go b/pkg/parsing/lexer/lexer.go index d106a08a30..74ac942b1e 100644 --- a/pkg/parsing/lexer/lexer.go +++ b/pkg/parsing/lexer/lexer.go @@ -6,7 +6,7 @@ import ( "os" "unicode/utf8" - "github.com/johnkerl/miller/pkg/parsing/token" + "github.com/johnkerl/miller/v6/pkg/parsing/token" ) const ( diff --git a/pkg/parsing/mlr.bnf b/pkg/parsing/mlr.bnf index 39d6c0c3b7..5903cf4190 100644 --- a/pkg/parsing/mlr.bnf +++ b/pkg/parsing/mlr.bnf @@ -347,7 +347,7 @@ panic : '%' '%' '%' 'p' 'a' 'n' 'i' 'c' '%' '%' '%' ; // ================================================================ // Import the AST/ASTNode types and functions -<< import "github.com/johnkerl/miller/pkg/dsl" >> +<< import "github.com/johnkerl/miller/v6/pkg/dsl" >> // ================================================================ // TOP-LEVEL PRODUCTION RULE FOR THE MILLER DSL diff --git a/pkg/parsing/parser/parser.go b/pkg/parsing/parser/parser.go index 444e9f4952..b984087af6 100644 --- a/pkg/parsing/parser/parser.go +++ b/pkg/parsing/parser/parser.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - parseError "github.com/johnkerl/miller/pkg/parsing/errors" - "github.com/johnkerl/miller/pkg/parsing/token" + parseError "github.com/johnkerl/miller/v6/pkg/parsing/errors" + "github.com/johnkerl/miller/v6/pkg/parsing/token" ) const ( diff --git a/pkg/parsing/parser/productionstable.go b/pkg/parsing/parser/productionstable.go index f4b61fd50c..93ea03996b 100644 --- a/pkg/parsing/parser/productionstable.go +++ b/pkg/parsing/parser/productionstable.go @@ -2,7 +2,7 @@ package parser -import "github.com/johnkerl/miller/pkg/dsl" +import "github.com/johnkerl/miller/v6/pkg/dsl" type ( ProdTab [numProductions]ProdTabEntry diff --git a/pkg/runtime/stack.go b/pkg/runtime/stack.go index b32cd06dd3..263e5cee1e 100644 --- a/pkg/runtime/stack.go +++ b/pkg/runtime/stack.go @@ -29,9 +29,9 @@ import ( "container/list" "fmt" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ================================================================ diff --git a/pkg/runtime/state.go b/pkg/runtime/state.go index cfd9e11a7d..6b8b5d29c3 100644 --- a/pkg/runtime/state.go +++ b/pkg/runtime/state.go @@ -9,10 +9,10 @@ package runtime import ( "container/list" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) type State struct { diff --git a/pkg/scan/find_benchmark_test.go b/pkg/scan/find_benchmark_test.go index e905bb7357..ee3d2b7441 100644 --- a/pkg/scan/find_benchmark_test.go +++ b/pkg/scan/find_benchmark_test.go @@ -4,7 +4,7 @@ import ( "testing" ) -// go test -run=nonesuch -bench=. github.com/johnkerl/miller/pkg/scan/... +// go test -run=nonesuch -bench=. github.com/johnkerl/miller/v6/pkg/scan/... func BenchmarkFromNormalCases(b *testing.B) { diff --git a/pkg/stream/stream.go b/pkg/stream/stream.go index 9f2cbe805c..84f096fafa 100644 --- a/pkg/stream/stream.go +++ b/pkg/stream/stream.go @@ -6,11 +6,11 @@ import ( "errors" "io" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/input" - "github.com/johnkerl/miller/pkg/output" - "github.com/johnkerl/miller/pkg/transformers" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/input" + "github.com/johnkerl/miller/v6/pkg/output" + "github.com/johnkerl/miller/v6/pkg/transformers" + "github.com/johnkerl/miller/v6/pkg/types" ) // Since Go is concurrent, the context struct (AWK-like variables such as diff --git a/pkg/terminals/help/entry.go b/pkg/terminals/help/entry.go index 4666adfa9b..47d3f6e9db 100644 --- a/pkg/terminals/help/entry.go +++ b/pkg/terminals/help/entry.go @@ -10,14 +10,14 @@ import ( "github.com/mattn/go-isatty" - "github.com/johnkerl/miller/pkg/auxents" - "github.com/johnkerl/miller/pkg/bifs" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/dsl/cst" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/runtime" - "github.com/johnkerl/miller/pkg/transformers" + "github.com/johnkerl/miller/v6/pkg/auxents" + "github.com/johnkerl/miller/v6/pkg/bifs" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/dsl/cst" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/transformers" ) // ================================================================ diff --git a/pkg/terminals/regtest/invoker.go b/pkg/terminals/regtest/invoker.go index febbbbfa38..7f58d7d9eb 100644 --- a/pkg/terminals/regtest/invoker.go +++ b/pkg/terminals/regtest/invoker.go @@ -6,8 +6,8 @@ import ( "os/exec" "strings" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/platform" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/platform" ) // RunMillerCommand runs a string like 'mlr cat foo.dat', with specified mlr diff --git a/pkg/terminals/regtest/regtester.go b/pkg/terminals/regtest/regtester.go index 8b5231c8eb..1df98f874d 100644 --- a/pkg/terminals/regtest/regtester.go +++ b/pkg/terminals/regtest/regtester.go @@ -63,8 +63,8 @@ import ( "runtime" "strings" - "github.com/johnkerl/miller/pkg/colorizer" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/lib" ) const CmdName = "cmd" diff --git a/pkg/terminals/repl/dsl.go b/pkg/terminals/repl/dsl.go index 8f3a2a0469..78f3b98bbd 100644 --- a/pkg/terminals/repl/dsl.go +++ b/pkg/terminals/repl/dsl.go @@ -23,9 +23,9 @@ import ( "fmt" "strings" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/dsl/cst" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/dsl/cst" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) // ---------------------------------------------------------------- diff --git a/pkg/terminals/repl/entry.go b/pkg/terminals/repl/entry.go index 23a86941b9..95d01f385d 100644 --- a/pkg/terminals/repl/entry.go +++ b/pkg/terminals/repl/entry.go @@ -27,7 +27,7 @@ import ( "path" "strings" - "github.com/johnkerl/miller/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/cli" ) // ================================================================ diff --git a/pkg/terminals/repl/prompt.go b/pkg/terminals/repl/prompt.go index bfcb46d2c5..be2de0e10b 100644 --- a/pkg/terminals/repl/prompt.go +++ b/pkg/terminals/repl/prompt.go @@ -11,9 +11,9 @@ import ( "golang.org/x/term" - "github.com/johnkerl/miller/pkg/colorizer" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/version" + "github.com/johnkerl/miller/v6/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/version" ) const ENV_PRIMARY_PROMPT = "MLR_REPL_PS1" diff --git a/pkg/terminals/repl/session.go b/pkg/terminals/repl/session.go index 03ef0f6b40..33fcac1497 100644 --- a/pkg/terminals/repl/session.go +++ b/pkg/terminals/repl/session.go @@ -25,14 +25,14 @@ import ( "strings" "syscall" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/dsl/cst" - "github.com/johnkerl/miller/pkg/input" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/output" - "github.com/johnkerl/miller/pkg/runtime" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/dsl/cst" + "github.com/johnkerl/miller/v6/pkg/input" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/output" + "github.com/johnkerl/miller/v6/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/terminals/repl/types.go b/pkg/terminals/repl/types.go index b0da1b9d36..76f8507f01 100644 --- a/pkg/terminals/repl/types.go +++ b/pkg/terminals/repl/types.go @@ -9,11 +9,11 @@ import ( "container/list" "os" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/dsl/cst" - "github.com/johnkerl/miller/pkg/input" - "github.com/johnkerl/miller/pkg/output" - "github.com/johnkerl/miller/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/dsl/cst" + "github.com/johnkerl/miller/v6/pkg/input" + "github.com/johnkerl/miller/v6/pkg/output" + "github.com/johnkerl/miller/v6/pkg/runtime" ) // ================================================================ diff --git a/pkg/terminals/repl/verbs.go b/pkg/terminals/repl/verbs.go index ac5440ffd1..bbb1a36b23 100644 --- a/pkg/terminals/repl/verbs.go +++ b/pkg/terminals/repl/verbs.go @@ -10,12 +10,12 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/colorizer" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/dsl/cst" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/dsl/cst" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/terminals/terminals.go b/pkg/terminals/terminals.go index 78ec0dd3f1..9e11e1e711 100644 --- a/pkg/terminals/terminals.go +++ b/pkg/terminals/terminals.go @@ -10,10 +10,10 @@ import ( "os" "runtime" - "github.com/johnkerl/miller/pkg/terminals/help" - "github.com/johnkerl/miller/pkg/terminals/regtest" - "github.com/johnkerl/miller/pkg/terminals/repl" - "github.com/johnkerl/miller/pkg/version" + "github.com/johnkerl/miller/v6/pkg/terminals/help" + "github.com/johnkerl/miller/v6/pkg/terminals/regtest" + "github.com/johnkerl/miller/v6/pkg/terminals/repl" + "github.com/johnkerl/miller/v6/pkg/version" ) // tTerminalMain is a function-pointer type for the entrypoint handler for a given terminal, diff --git a/pkg/transformers/aaa_chain_transformer.go b/pkg/transformers/aaa_chain_transformer.go index e367ab8834..6b67b03b75 100644 --- a/pkg/transformers/aaa_chain_transformer.go +++ b/pkg/transformers/aaa_chain_transformer.go @@ -3,8 +3,8 @@ package transformers import ( "container/list" "fmt" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/types" "os" ) diff --git a/pkg/transformers/aaa_record_transformer.go b/pkg/transformers/aaa_record_transformer.go index 1be4fc9176..516a11a310 100644 --- a/pkg/transformers/aaa_record_transformer.go +++ b/pkg/transformers/aaa_record_transformer.go @@ -4,8 +4,8 @@ import ( "container/list" "os" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/types" ) // IRecordTransformer is the interface satisfied by all transformers, i.e., diff --git a/pkg/transformers/aaa_transformer_table.go b/pkg/transformers/aaa_transformer_table.go index 34a5b6ea85..1f201fa294 100644 --- a/pkg/transformers/aaa_transformer_table.go +++ b/pkg/transformers/aaa_transformer_table.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/colorizer" - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/colorizer" + "github.com/johnkerl/miller/v6/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/altkv.go b/pkg/transformers/altkv.go index a97c3127e4..cb1d5c8d2a 100644 --- a/pkg/transformers/altkv.go +++ b/pkg/transformers/altkv.go @@ -7,9 +7,9 @@ import ( "strconv" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/bar.go b/pkg/transformers/bar.go index 0aaafd8f17..09713c2729 100644 --- a/pkg/transformers/bar.go +++ b/pkg/transformers/bar.go @@ -7,9 +7,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) const barDefaultFillString = "*" diff --git a/pkg/transformers/bootstrap.go b/pkg/transformers/bootstrap.go index 9450a425e8..47a200499d 100644 --- a/pkg/transformers/bootstrap.go +++ b/pkg/transformers/bootstrap.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/case.go b/pkg/transformers/case.go index 4d02617c4d..e630c8e15a 100644 --- a/pkg/transformers/case.go +++ b/pkg/transformers/case.go @@ -9,10 +9,10 @@ import ( "golang.org/x/text/cases" "golang.org/x/text/language" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/cat.go b/pkg/transformers/cat.go index c065aa5366..74df80eca5 100644 --- a/pkg/transformers/cat.go +++ b/pkg/transformers/cat.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/check.go b/pkg/transformers/check.go index 9f36001901..ed68d0afa0 100644 --- a/pkg/transformers/check.go +++ b/pkg/transformers/check.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/clean_whitespace.go b/pkg/transformers/clean_whitespace.go index 3ffdd3862e..bdb032f66a 100644 --- a/pkg/transformers/clean_whitespace.go +++ b/pkg/transformers/clean_whitespace.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/bifs" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/bifs" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/count.go b/pkg/transformers/count.go index 623855ac9c..107dbec6d6 100644 --- a/pkg/transformers/count.go +++ b/pkg/transformers/count.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/count_similar.go b/pkg/transformers/count_similar.go index 2fafe2d706..b8c0a18199 100644 --- a/pkg/transformers/count_similar.go +++ b/pkg/transformers/count_similar.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/cut.go b/pkg/transformers/cut.go index f3039f65aa..f8933d586a 100644 --- a/pkg/transformers/cut.go +++ b/pkg/transformers/cut.go @@ -7,10 +7,10 @@ import ( "regexp" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/decimate.go b/pkg/transformers/decimate.go index 8535c1d4bc..112d9395ee 100644 --- a/pkg/transformers/decimate.go +++ b/pkg/transformers/decimate.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/fill_down.go b/pkg/transformers/fill_down.go index b9ab079dc2..55acbb3c3c 100644 --- a/pkg/transformers/fill_down.go +++ b/pkg/transformers/fill_down.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/fill_empty.go b/pkg/transformers/fill_empty.go index e893ef3345..833ed5b12c 100644 --- a/pkg/transformers/fill_empty.go +++ b/pkg/transformers/fill_empty.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/flatten.go b/pkg/transformers/flatten.go index a2f4d1a979..86c4c0fd16 100644 --- a/pkg/transformers/flatten.go +++ b/pkg/transformers/flatten.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/format_values.go b/pkg/transformers/format_values.go index d91041c27e..edaf0389f5 100644 --- a/pkg/transformers/format_values.go +++ b/pkg/transformers/format_values.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/fraction.go b/pkg/transformers/fraction.go index 2216342fb4..432d600cf0 100644 --- a/pkg/transformers/fraction.go +++ b/pkg/transformers/fraction.go @@ -7,11 +7,11 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/bifs" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/bifs" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/gap.go b/pkg/transformers/gap.go index 345780f4e6..9bec0b2abe 100644 --- a/pkg/transformers/gap.go +++ b/pkg/transformers/gap.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/grep.go b/pkg/transformers/grep.go index 46d01244c9..38942d6506 100644 --- a/pkg/transformers/grep.go +++ b/pkg/transformers/grep.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/group_by.go b/pkg/transformers/group_by.go index f210969ada..bf5441cb5c 100644 --- a/pkg/transformers/group_by.go +++ b/pkg/transformers/group_by.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/group_like.go b/pkg/transformers/group_like.go index a7ede9a59a..73a7dc3479 100644 --- a/pkg/transformers/group_like.go +++ b/pkg/transformers/group_like.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/having_fields.go b/pkg/transformers/having_fields.go index b17e6cecca..467c0a7d38 100644 --- a/pkg/transformers/having_fields.go +++ b/pkg/transformers/having_fields.go @@ -7,9 +7,9 @@ import ( "regexp" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/types" ) type tHavingFieldsCriterion int diff --git a/pkg/transformers/head.go b/pkg/transformers/head.go index 4626ddeade..6f7ff5a192 100644 --- a/pkg/transformers/head.go +++ b/pkg/transformers/head.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/histogram.go b/pkg/transformers/histogram.go index a7d6241fbf..32f5811074 100644 --- a/pkg/transformers/histogram.go +++ b/pkg/transformers/histogram.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/join.go b/pkg/transformers/join.go index deeea16233..3d987bc072 100644 --- a/pkg/transformers/join.go +++ b/pkg/transformers/join.go @@ -6,12 +6,12 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/input" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/transformers/utils" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/input" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/transformers/utils" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/json_parse.go b/pkg/transformers/json_parse.go index 1a00ccf080..0690b410ee 100644 --- a/pkg/transformers/json_parse.go +++ b/pkg/transformers/json_parse.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/json_stringify.go b/pkg/transformers/json_stringify.go index ca515f0a0d..c6b5642a87 100644 --- a/pkg/transformers/json_stringify.go +++ b/pkg/transformers/json_stringify.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/label.go b/pkg/transformers/label.go index b14be1b6d9..0339080935 100644 --- a/pkg/transformers/label.go +++ b/pkg/transformers/label.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/latin1_to_utf8.go b/pkg/transformers/latin1_to_utf8.go index b3dca48b55..0dd509f392 100644 --- a/pkg/transformers/latin1_to_utf8.go +++ b/pkg/transformers/latin1_to_utf8.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/merge_fields.go b/pkg/transformers/merge_fields.go index 7ee2d9fade..56fe0bd0df 100644 --- a/pkg/transformers/merge_fields.go +++ b/pkg/transformers/merge_fields.go @@ -7,10 +7,10 @@ import ( "regexp" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/transformers/utils" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/transformers/utils" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/most_or_least_frequent.go b/pkg/transformers/most_or_least_frequent.go index 1381e81d95..a47ba80dcf 100644 --- a/pkg/transformers/most_or_least_frequent.go +++ b/pkg/transformers/most_or_least_frequent.go @@ -7,10 +7,10 @@ import ( "sort" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/nest.go b/pkg/transformers/nest.go index bced869df8..31d58bf3ea 100644 --- a/pkg/transformers/nest.go +++ b/pkg/transformers/nest.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/nothing.go b/pkg/transformers/nothing.go index 9c5b72f1a0..b64688352a 100644 --- a/pkg/transformers/nothing.go +++ b/pkg/transformers/nothing.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/put_or_filter.go b/pkg/transformers/put_or_filter.go index 36fed42e5e..1f19e85d04 100644 --- a/pkg/transformers/put_or_filter.go +++ b/pkg/transformers/put_or_filter.go @@ -6,13 +6,13 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/dsl" - "github.com/johnkerl/miller/pkg/dsl/cst" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/runtime" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/dsl" + "github.com/johnkerl/miller/v6/pkg/dsl/cst" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/runtime" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/regularize.go b/pkg/transformers/regularize.go index c75d261f0f..d39ffbad89 100644 --- a/pkg/transformers/regularize.go +++ b/pkg/transformers/regularize.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/remove_empty_columns.go b/pkg/transformers/remove_empty_columns.go index ce9b5a5dcd..3b6b74263c 100644 --- a/pkg/transformers/remove_empty_columns.go +++ b/pkg/transformers/remove_empty_columns.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/rename.go b/pkg/transformers/rename.go index 7880b6ead0..d7adef13f3 100644 --- a/pkg/transformers/rename.go +++ b/pkg/transformers/rename.go @@ -7,9 +7,9 @@ import ( "regexp" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/reorder.go b/pkg/transformers/reorder.go index 141b55c19a..44e915a80c 100644 --- a/pkg/transformers/reorder.go +++ b/pkg/transformers/reorder.go @@ -7,10 +7,10 @@ import ( "regexp" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/repeat.go b/pkg/transformers/repeat.go index eab1725f4e..a9761415ae 100644 --- a/pkg/transformers/repeat.go +++ b/pkg/transformers/repeat.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/types" ) type tRepeatCountSource int diff --git a/pkg/transformers/reshape.go b/pkg/transformers/reshape.go index 4c0cffc076..1cc96f64f2 100644 --- a/pkg/transformers/reshape.go +++ b/pkg/transformers/reshape.go @@ -34,10 +34,10 @@ import ( "regexp" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/sample.go b/pkg/transformers/sample.go index b1eef576b2..b8e798c656 100644 --- a/pkg/transformers/sample.go +++ b/pkg/transformers/sample.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/sec2gmt.go b/pkg/transformers/sec2gmt.go index 0dfbbe5df7..33cbad3879 100644 --- a/pkg/transformers/sec2gmt.go +++ b/pkg/transformers/sec2gmt.go @@ -5,10 +5,10 @@ import ( "fmt" "os" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/sec2gmtdate.go b/pkg/transformers/sec2gmtdate.go index d09defffa1..ee440f6070 100644 --- a/pkg/transformers/sec2gmtdate.go +++ b/pkg/transformers/sec2gmtdate.go @@ -5,10 +5,10 @@ import ( "fmt" "os" - "github.com/johnkerl/miller/pkg/bifs" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/bifs" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/seqgen.go b/pkg/transformers/seqgen.go index 2d1c3b1889..5700a4ea5a 100644 --- a/pkg/transformers/seqgen.go +++ b/pkg/transformers/seqgen.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/bifs" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/bifs" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/shuffle.go b/pkg/transformers/shuffle.go index 7aad23641b..77659e5a84 100644 --- a/pkg/transformers/shuffle.go +++ b/pkg/transformers/shuffle.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/skip_trivial_records.go b/pkg/transformers/skip_trivial_records.go index 91c8bd2421..4a0245edbc 100644 --- a/pkg/transformers/skip_trivial_records.go +++ b/pkg/transformers/skip_trivial_records.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/sort.go b/pkg/transformers/sort.go index d28009ae46..945c6e5814 100644 --- a/pkg/transformers/sort.go +++ b/pkg/transformers/sort.go @@ -48,10 +48,10 @@ import ( "sort" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/sort_within_records.go b/pkg/transformers/sort_within_records.go index 398ca53722..50ce51bc2c 100644 --- a/pkg/transformers/sort_within_records.go +++ b/pkg/transformers/sort_within_records.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/sparsify.go b/pkg/transformers/sparsify.go index b6ae40c516..6d6212a33e 100644 --- a/pkg/transformers/sparsify.go +++ b/pkg/transformers/sparsify.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/split.go b/pkg/transformers/split.go index 7834931e92..7295fa1748 100644 --- a/pkg/transformers/split.go +++ b/pkg/transformers/split.go @@ -7,10 +7,10 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/output" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/output" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/stats1.go b/pkg/transformers/stats1.go index b581296911..2f06540e12 100644 --- a/pkg/transformers/stats1.go +++ b/pkg/transformers/stats1.go @@ -8,11 +8,11 @@ import ( "regexp" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/transformers/utils" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/transformers/utils" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/stats2.go b/pkg/transformers/stats2.go index a30141021a..47dc60387a 100644 --- a/pkg/transformers/stats2.go +++ b/pkg/transformers/stats2.go @@ -6,11 +6,11 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/transformers/utils" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/transformers/utils" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/step.go b/pkg/transformers/step.go index 56539cb90a..7ecafaf701 100644 --- a/pkg/transformers/step.go +++ b/pkg/transformers/step.go @@ -73,12 +73,12 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/bifs" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/transformers/utils" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/bifs" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/transformers/utils" + "github.com/johnkerl/miller/v6/pkg/types" ) // For EWMA diff --git a/pkg/transformers/subs.go b/pkg/transformers/subs.go index 578def1c01..10468a2801 100644 --- a/pkg/transformers/subs.go +++ b/pkg/transformers/subs.go @@ -7,11 +7,11 @@ import ( "regexp" "strings" - "github.com/johnkerl/miller/pkg/bifs" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/bifs" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/summary.go b/pkg/transformers/summary.go index ea5f123bc5..6f386ab626 100644 --- a/pkg/transformers/summary.go +++ b/pkg/transformers/summary.go @@ -6,11 +6,11 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/transformers/utils" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/transformers/utils" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/tac.go b/pkg/transformers/tac.go index 83ccd68769..ba25195cb4 100644 --- a/pkg/transformers/tac.go +++ b/pkg/transformers/tac.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/tail.go b/pkg/transformers/tail.go index dcba44b674..345d09d536 100644 --- a/pkg/transformers/tail.go +++ b/pkg/transformers/tail.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/tee.go b/pkg/transformers/tee.go index 9e944df17b..bff0065ea7 100644 --- a/pkg/transformers/tee.go +++ b/pkg/transformers/tee.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/output" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/output" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/template.go b/pkg/transformers/template.go index 392f96377c..a30bf7dae5 100644 --- a/pkg/transformers/template.go +++ b/pkg/transformers/template.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/top.go b/pkg/transformers/top.go index 70119731b2..9bc62fe694 100644 --- a/pkg/transformers/top.go +++ b/pkg/transformers/top.go @@ -6,11 +6,11 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/transformers/utils" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/transformers/utils" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/unflatten.go b/pkg/transformers/unflatten.go index d1e02a52ca..dcf8014af7 100644 --- a/pkg/transformers/unflatten.go +++ b/pkg/transformers/unflatten.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/uniq.go b/pkg/transformers/uniq.go index 5893b689a0..ecd89a1c69 100644 --- a/pkg/transformers/uniq.go +++ b/pkg/transformers/uniq.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/unspace.go b/pkg/transformers/unspace.go index eb62530255..274f28fbd0 100644 --- a/pkg/transformers/unspace.go +++ b/pkg/transformers/unspace.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/unsparsify.go b/pkg/transformers/unsparsify.go index 467b83dac6..30ac1c3ee0 100644 --- a/pkg/transformers/unsparsify.go +++ b/pkg/transformers/unsparsify.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/utf8_to_latin1.go b/pkg/transformers/utf8_to_latin1.go index fb658562a9..bc744c8fa7 100644 --- a/pkg/transformers/utf8_to_latin1.go +++ b/pkg/transformers/utf8_to_latin1.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/utils/join_bucket.go b/pkg/transformers/utils/join_bucket.go index 4e26e25380..f4390906fa 100644 --- a/pkg/transformers/utils/join_bucket.go +++ b/pkg/transformers/utils/join_bucket.go @@ -7,7 +7,7 @@ package utils import ( "container/list" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/utils/join_bucket_keeper.go b/pkg/transformers/utils/join_bucket_keeper.go index df218cc3d5..237f2648b9 100644 --- a/pkg/transformers/utils/join_bucket_keeper.go +++ b/pkg/transformers/utils/join_bucket_keeper.go @@ -113,11 +113,11 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/cli" - "github.com/johnkerl/miller/pkg/input" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/cli" + "github.com/johnkerl/miller/v6/pkg/input" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/utils/percentile_keeper.go b/pkg/transformers/utils/percentile_keeper.go index 0aebdc7099..30701a7c3e 100644 --- a/pkg/transformers/utils/percentile_keeper.go +++ b/pkg/transformers/utils/percentile_keeper.go @@ -8,8 +8,8 @@ import ( "fmt" "sort" - "github.com/johnkerl/miller/pkg/bifs" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/bifs" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) type PercentileKeeper struct { diff --git a/pkg/transformers/utils/stats1_accumulators.go b/pkg/transformers/utils/stats1_accumulators.go index 3e8aadd942..1e5267a8a1 100644 --- a/pkg/transformers/utils/stats1_accumulators.go +++ b/pkg/transformers/utils/stats1_accumulators.go @@ -9,9 +9,9 @@ import ( "os" "strings" - "github.com/johnkerl/miller/pkg/bifs" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/bifs" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/utils/stats2_accumulators.go b/pkg/transformers/utils/stats2_accumulators.go index 84fcdc030b..e825af0aa4 100644 --- a/pkg/transformers/utils/stats2_accumulators.go +++ b/pkg/transformers/utils/stats2_accumulators.go @@ -9,8 +9,8 @@ import ( "math" "os" - "github.com/johnkerl/miller/pkg/lib" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/utils/top_keeper.go b/pkg/transformers/utils/top_keeper.go index 3a3ce9e4ec..4e59783d0b 100644 --- a/pkg/transformers/utils/top_keeper.go +++ b/pkg/transformers/utils/top_keeper.go @@ -5,8 +5,8 @@ package utils import ( - "github.com/johnkerl/miller/pkg/mlrval" - "github.com/johnkerl/miller/pkg/types" + "github.com/johnkerl/miller/v6/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/types" ) // ---------------------------------------------------------------- diff --git a/pkg/transformers/utils/window_keeper.go b/pkg/transformers/utils/window_keeper.go index 2de8750207..c19b33a2a7 100644 --- a/pkg/transformers/utils/window_keeper.go +++ b/pkg/transformers/utils/window_keeper.go @@ -1,7 +1,7 @@ package utils import ( - "github.com/johnkerl/miller/pkg/lib" + "github.com/johnkerl/miller/v6/pkg/lib" ) // WindowKeeper is a sliding-window container, nominally for use by mlr step, diff --git a/pkg/types/context.go b/pkg/types/context.go index a3da4f71a3..6f82bc527c 100644 --- a/pkg/types/context.go +++ b/pkg/types/context.go @@ -5,7 +5,7 @@ import ( "container/list" "strconv" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) // Since Go is concurrent, the context struct (AWK-like variables such as diff --git a/pkg/types/mlrval_typing.go b/pkg/types/mlrval_typing.go index e3c68b5f87..8adc5b010c 100644 --- a/pkg/types/mlrval_typing.go +++ b/pkg/types/mlrval_typing.go @@ -8,7 +8,7 @@ package types import ( "fmt" - "github.com/johnkerl/miller/pkg/mlrval" + "github.com/johnkerl/miller/v6/pkg/mlrval" ) // ---------------------------------------------------------------- diff --git a/regression_test.go b/regression_test.go index 5657d17bc9..0ccaa3a15b 100644 --- a/regression_test.go +++ b/regression_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/johnkerl/miller/pkg/terminals/regtest" + "github.com/johnkerl/miller/v6/pkg/terminals/regtest" ) // TestRegression is a familiar entry point for regression testing. Miller diff --git a/scripts/compiler-versions-build b/scripts/compiler-versions-build index 49e2c2ad22..e575959e7b 100755 --- a/scripts/compiler-versions-build +++ b/scripts/compiler-versions-build @@ -1,7 +1,7 @@ #!/bin/sh for go in go1.15.15 go1.16.12 go1.17.5 go1.18beta1; do - $go clean github.com/johnkerl/miller/cmd/mlr - $go build github.com/johnkerl/miller/cmd/mlr + $go clean github.com/johnkerl/miller/v6/cmd/mlr + $go build github.com/johnkerl/miller/v6/cmd/mlr mv mlr mlr-$go done