6.1.0 release (#975)

johnkerl · Mar 7, 2022 · d3ef6a9 · d3ef6a9
1 parent df77204
commit d3ef6a9
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 21 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -74,7 +74,7 @@ archives:
       darwin: macos
     name_template: '{{ .ProjectName }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
     files:
-      - LICENSE
+      - LICENSE.txt
       - README.md
 
 nfpms:

diff --git a/docs/src/build.md b/docs/src/build.md
@@ -67,8 +67,8 @@ In this example I am using version 6.1.0 to 6.2.0; of course that will change fo
 
 * Update version found in `mlr --version` and `man mlr`:
 
-    * Edit `internal/pkpg/version/version.go` from `6.1.0-dev` to `6.2.0`.
-    * Edit version in `docs/mkdocs.yml` from `6.1.0` to `6.2.0`.
+    * Edit `internal/pkg/version/version.go` from `6.1.0-dev` to `6.2.0`.
+    * Edit `miller.spec`: `Version`, and `changelog` entry
     * Run `make dev` in the Miller repo base directory
     * The ordering in this makefile rule is important: the first build creates `mlr`; the second runs `mlr` to create `manpage.txt`; the third includes `manpage.txt` into one of its outputs.
     * Commit and push.

diff --git a/docs/src/build.md.in b/docs/src/build.md.in
@@ -51,8 +51,8 @@ In this example I am using version 6.1.0 to 6.2.0; of course that will change fo
 
 * Update version found in `mlr --version` and `man mlr`:
 
-    * Edit `internal/pkpg/version/version.go` from `6.1.0-dev` to `6.2.0`.
-    * Edit version in `docs/mkdocs.yml` from `6.1.0` to `6.2.0`.
+    * Edit `internal/pkg/version/version.go` from `6.1.0-dev` to `6.2.0`.
+    * Edit `miller.spec`: `Version`, and `changelog` entry
     * Run `make dev` in the Miller repo base directory
     * The ordering in this makefile rule is important: the first build creates `mlr`; the second runs `mlr` to create `manpage.txt`; the third includes `manpage.txt` into one of its outputs.
     * Commit and push.

diff --git a/docs/src/manpage.md b/docs/src/manpage.md
@@ -50,7 +50,7 @@ DESCRIPTION
        insertion-ordered hash map.  This encompasses a variety of data
        formats, including but not limited to the familiar CSV, TSV, and JSON.
        (Miller can handle positionally-indexed data as a special case.) This
-       manpage documents mlr 6.0.0-dev.
+       manpage documents mlr 6.1.0.
 
 EXAMPLES
        mlr --icsv --opprint cat example.csv
@@ -3190,5 +3190,5 @@ SEE ALSO
 
 
 
-                                  2022-02-24                         MILLER(1)
+                                  2022-03-07                         MILLER(1)
 </pre>
diff --git a/docs/src/manpage.txt b/docs/src/manpage.txt
@@ -29,7 +29,7 @@ DESCRIPTION
        insertion-ordered hash map.  This encompasses a variety of data
        formats, including but not limited to the familiar CSV, TSV, and JSON.
        (Miller can handle positionally-indexed data as a special case.) This
-       manpage documents mlr 6.0.0-dev.
+       manpage documents mlr 6.1.0.
 
 EXAMPLES
        mlr --icsv --opprint cat example.csv
@@ -3169,4 +3169,4 @@ SEE ALSO
 
 
 
-                                  2022-02-24                         MILLER(1)
+                                  2022-03-07                         MILLER(1)
diff --git a/docs/src/reference-dsl-builtin-functions.md b/docs/src/reference-dsl-builtin-functions.md
@@ -1106,8 +1106,8 @@ truncate  (class=string #args=2) Truncates string first argument to max length o
 <pre class="pre-non-highlight-non-pair">
 unformat  (class=string #args=2) Using first argument as format string, unpacks second argument into an array of matches, with type-inference. On non-match, returns error -- use is_error() to check.
 Examples:
-unformat("{}:{}:{}",  "1:2:3") gives [1, 2, 3]".
-unformat("{}h{}m{}s", "3h47m22s") gives [3, 47, 22]".
+unformat("{}:{}:{}",  "1:2:3") gives [1, 2, 3].
+unformat("{}h{}m{}s", "3h47m22s") gives [3, 47, 22].
 is_error(unformat("{}h{}m{}s", "3:47:22")) gives true.
 </pre>
 
@@ -1116,8 +1116,8 @@ is_error(unformat("{}h{}m{}s", "3:47:22")) gives true.
 <pre class="pre-non-highlight-non-pair">
 unformatx  (class=string #args=2) Same as unformat, but without type-inference.
 Examples:
-unformatx("{}:{}:{}",  "1:2:3") gives ["1", "2", "3"]".
-unformatx("{}h{}m{}s", "3h47m22s") gives ["3", "47", "22"]".
+unformatx("{}:{}:{}",  "1:2:3") gives ["1", "2", "3"].
+unformatx("{}h{}m{}s", "3h47m22s") gives ["3", "47", "22"].
 is_error(unformatx("{}h{}m{}s", "3:47:22")) gives true.
 </pre>
 
@@ -1126,7 +1126,7 @@ is_error(unformatx("{}h{}m{}s", "3:47:22")) gives true.
 
 ### \.
 <pre class="pre-non-highlight-non-pair">
-.  (class=string #args=2) String concatenation.
+.  (class=string #args=2) String concatenation. Non-strings are coerced, so you can do '"ax".98' etc.
 </pre>
 
 ## System functions

diff --git a/internal/pkg/version/version.go b/internal/pkg/version/version.go
@@ -4,4 +4,4 @@ package version
 // Nominally things like "6.0.0" for a release, then "6.0.0-dev" in between.
 // This makes it clear that a given build is on the main dev branch, not a
 // particular snapshot tag.
-var STRING string = "6.0.0-dev"
+var STRING string = "6.1.0"
diff --git a/man/manpage.txt b/man/manpage.txt
@@ -29,7 +29,7 @@ DESCRIPTION
        insertion-ordered hash map.  This encompasses a variety of data
        formats, including but not limited to the familiar CSV, TSV, and JSON.
        (Miller can handle positionally-indexed data as a special case.) This
-       manpage documents mlr 6.0.0-dev.
+       manpage documents mlr 6.1.0.
 
 EXAMPLES
        mlr --icsv --opprint cat example.csv
@@ -3169,4 +3169,4 @@ SEE ALSO
 
 
 
-                                  2022-02-24                         MILLER(1)
+                                  2022-03-07                         MILLER(1)
diff --git a/man/mlr.1 b/man/mlr.1
@@ -2,12 +2,12 @@
 .\"     Title: mlr
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: ./mkman.rb
-.\"      Date: 2022-02-24
+.\"      Date: 2022-03-07
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "MILLER" "1" "2022-02-24" "\ \&" "\ \&"
+.TH "MILLER" "1" "2022-03-07" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Portability definitions
 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -47,7 +47,7 @@ on integer-indexed fields: if the natural data structure for the latter is the
 array, then Miller's natural data structure is the insertion-ordered hash map.
 This encompasses a variety of data formats, including but not limited to the
 familiar CSV, TSV, and JSON.  (Miller can handle positionally-indexed data as
-a special case.) This manpage documents mlr 6.0.0-dev.
+a special case.) This manpage documents mlr 6.1.0.
 .SH "EXAMPLES"
 .sp
 

diff --git a/miller.spec b/miller.spec
@@ -1,6 +1,6 @@
 Summary: Name-indexed data processing tool
 Name: miller
-Version: 6.0.0
+Version: 6.1.0
 Release: 1%{?dist}
 License: BSD
 Source: https://github.com/johnkerl/miller/releases/download/%{version}/miller-%{version}.tar.gz
@@ -36,6 +36,9 @@ make install
 %{_mandir}/man1/mlr.1*
 
 %changelog
+* Mon Mar 7 2022 John Kerl <[email protected]> - 6.1.0-1
+- 6.1.0 release
+
 * Sun Jan 9 2022 John Kerl <[email protected]> - 6.0.0-1
 - 6.0.0 release