Release 3.9.0

debian/changelog

@@ -1,3 +1,12 @@
+bmaptool (3.9.0) unstable; urgency=low
+
+  * copy: add `--removable-device`, `--keyring` and `--fingerprint` options
+  * Respect query part of the url when operating on the path
+  * support FTP authentication
+  * rework GPG tests
+
+ -- Trevor Woerner <twoerner@gmail.com> Fri, 14 Mar 2025 13:46:05 -0600
+
 bmaptool (3.8.0) unstable; urgency=low
 
   * use 'df -P' for POSIX portable output

docs/man1/bmaptool.1

@@ -1,4 +1,4 @@
-.TH BMAPTOOL "1" "March 2024" "bmaptool 3.8.0" "User Commands"
+.TH BMAPTOOL "1" "March 2025" "bmaptool 3.9.0" "User Commands"
 
 .SH NAME
 

make_a_release.sh

@@ -43,10 +43,10 @@ ask_question() {
 	while true; do
 		printf "%s\n" "$question (yes/no)?"
 		IFS= read answer
-		if [ "$answer" == "yes" ]; then
+		if [ "$answer" = "yes" ]; then
 			printf "%s\n" "Very good!"
 			return
-		elif [ "$answer" == "no" ]; then
+		elif [ "$answer" = "no" ]; then
 			printf "%s\n" "Please, do that!"
 			exit 1
 		else
@@ -63,7 +63,7 @@ format_changelog() {
 	local width="$((80-$pfx_len))"
 
 	while IFS= read -r line; do
-		printf "%s\n" "$line" | fold -c -s -w "$width" | \
+		printf "%s\n" "$line" | fold -s -w "$width" | \
 			sed -e "1 s/^/$pfx1/" | sed -e "1! s/^/$pfx2/" | \
 			sed -e "s/[\t ]\+$//"
 	done < "$logfile"
@@ -78,12 +78,6 @@ new_ver="$1"; shift
 printf "%s" "$new_ver" | egrep -q -x '[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+' ||
         fatal "please, provide new version in X.Y.Z format"
 
-# Make sure that the current branch is 'main'
-current_branch="$(git branch | sed -n -e '/^*/ s/^* //p')"
-if [ "$current_branch" != "main" ]; then
-	fatal "current branch is '$current_branch' but must be 'main'"
-fi
-
 # Make sure the git index is up-to-date
 [ -z "$(git status --porcelain)" ] || fatal "git index is not up-to-date"
 
@@ -92,7 +86,7 @@ ask_question "Did you update the man page"
 ask_question "Did you update tests: test-data and oldcodebase"
 
 # Change the version in the 'bmaptool/CLI.py' file
-sed -i -e "s/^VERSION = \"[0-9]\+\.[0-9]\+\.[0-9]\+\"$/VERSION = \"$new_ver\"/" bmaptool/CLI.py
+sed -i -e "s/^VERSION = \"[0-9]\+\.[0-9]\+\.[0-9]\+\"$/VERSION = \"$new_ver\"/" src/bmaptool/CLI.py
 # Sed the version in the RPM spec file
 sed -i -e "s/^Version: [0-9]\+\.[0-9]\+\.[0-9]\+$/Version: $new_ver/" packaging/bmaptool.spec
 # Remove the "rc_num" macro from the RPM spec file to make sure we do not have
@@ -145,27 +139,11 @@ outdir="."
 tag_name="v$new_ver"
 release_name="bmaptool-$new_ver"
 
-# Create new tag
-printf "%s\n" "Creating tag $tag_name"
-git tag -m "$release_name" "$tag_name"
-
 # Get the name of the release branch corresponding to this version
 release_branch="release-$(printf "%s" "$new_ver" | sed -e 's/\(.*\)\..*/\1.0/')"
 
 cat <<EOF
 To finish the release:
-  1. push the $tag_name tag out
-  2. update the $release_branch with the contents of the 'main' branch
-  3. point the main branch to the updated $release_branch branch
-  4. push the main and $release_branch branches out
-
-The commands would be:
-
-#1
-git push origin $tag_name
-#2
-git branch -f $release_branch main
-#3
-git push origin main:main
-git push origin $release_branch:$release_branch
+  1. Push this change as a PR for review
+  2. Make a release named '$new_ver' in GitHub after the PR merges
 EOF

packaging/bmaptool.changes

@@ -1,3 +1,9 @@
+Fri Mar 14 07:46:05 PM UTC 2025 - Trevor Woerner <twoerner@gmail.com> 3.9.0-1
+- copy: add `--removable-device`, `--keyring` and `--fingerprint` options
+- Respect query part of the url when operating on the path
+- support FTP authentication
+- rework GPG tests
+
 Tue Mar 19 03:44:10 UTC 2024 - Trevor Woerner <twoerner@gmail.com> 3.8.0-1
 - use 'df -P' for POSIX portable output
 - bmaptool has new maintainers

packaging/bmaptool.spec

@@ -4,7 +4,7 @@
 
 Name: bmaptool
 Summary: Tools to generate block map (AKA bmap) and flash images using bmap
-Version: 3.8.0
+Version: 3.9.0
 %if 0%{?opensuse_bs}
 Release: %{rc_str}.<CI_CNT>.<B_CNT>
 %else

src/bmaptool/CLI.py

@@ -45,7 +45,7 @@
 from typing import NamedTuple
 from . import BmapCreate, BmapCopy, BmapHelpers, TransRead
 
-VERSION = "3.8.0"
+VERSION = "3.9.0"
 
 log = logging.getLogger()  # pylint: disable=C0103