Release pyrediff 18

- Support `--version` option to `pyrediff`.
- Fix `pyrediff -e` with Python 3.3 and newer to ensure `\` is
  escaped correctly if the next character is unescaped.
  I.e., `don\'t` is now correctly escaped as `don\\'t`.
- Update Python references to Python 3.
- Update github workflows to v4 and to use the main branch.

Author: lukem

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-## [unreleased] - unreleased
+## [18] - 2024-03-12
 
 ### Added
 - Support `--version` option to `pyrediff`.

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for pyrediff 17.
+# Generated by GNU Autoconf 2.72 for pyrediff 18.
 #
 # Report bugs to <[email protected]>.
 #
@@ -608,8 +608,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='pyrediff'
 PACKAGE_TARNAME='pyrediff'
-PACKAGE_VERSION='17'
-PACKAGE_STRING='pyrediff 17'
+PACKAGE_VERSION='18'
+PACKAGE_STRING='pyrediff 18'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -1258,7 +1258,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-'configure' configures pyrediff 17 to adapt to many kinds of systems.
+'configure' configures pyrediff 18 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1325,7 +1325,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pyrediff 17:";;
+     short | recursive ) echo "Configuration of pyrediff 18:";;
    esac
   cat <<\_ACEOF
 
@@ -1418,7 +1418,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pyrediff configure 17
+pyrediff configure 18
 generated by GNU Autoconf 2.72
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1460,7 +1460,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pyrediff $as_me 17, which was
+It was created by pyrediff $as_me 18, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -2424,7 +2424,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='pyrediff'
- VERSION='17'
+ VERSION='18'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -3615,7 +3615,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pyrediff $as_me 17, which was
+This file was extended by pyrediff $as_me 18, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3674,7 +3674,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-pyrediff config.status 17
+pyrediff config.status 18
 configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.69])
-AC_INIT([pyrediff], [17], [[email protected]])
+AC_INIT([pyrediff], [18], [[email protected]])
 
 AC_COPYRIGHT([[
 Copyright 2013-2024, Luke Mewburn <[email protected]>.

src/ax_at_check_pattern.m4

@@ -40,7 +40,7 @@
 #   notice and this notice are preserved.  This file is offered as-is,
 #   without any warranty.
 
-#serial 17
+#serial 18
 
 m4_define([_AX_AT_CHECK_PATTERN_AWK],
 [[BEGIN { exitval=0 }

src/ax_at_check_pyrediff.m4

@@ -40,7 +40,7 @@
 #   notice and this notice are preserved.  This file is offered as-is,
 #   without any warranty.
 
-#serial 17
+#serial 18
 
 m4_define([_AX_AT_CHECK_PYREDIFF],
 [[from __future__ import print_function
@@ -50,7 +50,7 @@ import re
 import subprocess
 import sys
 
-__version__ = "17"
+__version__ = "18"
 
 # pylint: disable=missing-class-docstring
 # pylint: disable=missing-function-docstring

src/pyrediff

@@ -27,7 +27,7 @@ import re
 import subprocess
 import sys
 
-__version__ = "17"
+__version__ = "18"
 
 # pylint: disable=missing-class-docstring
 # pylint: disable=missing-function-docstring

tests/package.m4

@@ -1,6 +1,6 @@
 # Signature of the current package.
 m4_define([AT_PACKAGE_NAME],      [pyrediff])
 m4_define([AT_PACKAGE_TARNAME],   [pyrediff])
-m4_define([AT_PACKAGE_VERSION],   [17])
-m4_define([AT_PACKAGE_STRING],    [pyrediff 17])
+m4_define([AT_PACKAGE_VERSION],   [18])
+m4_define([AT_PACKAGE_STRING],    [pyrediff 18])
 m4_define([AT_PACKAGE_BUGREPORT], [[email protected]])

tests/testsuite

@@ -491,7 +491,7 @@ import re
 import subprocess
 import sys
 
-__version__ = "17"
+__version__ = "18"
 
 # pylint: disable=missing-class-docstring
 # pylint: disable=missing-function-docstring
@@ -1236,7 +1236,7 @@ fi
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-pyrediff 17 test suite: pyrediff test groups:
+pyrediff 18 test suite: pyrediff test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
@@ -1277,7 +1277,7 @@ _ATEOF
   exit $at_write_fail
 fi
 if $at_version_p; then
-  printf "%s\n" "$as_me (pyrediff 17)" &&
+  printf "%s\n" "$as_me (pyrediff 18)" &&
   cat <<\_ATEOF || at_write_fail=1
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1464,11 +1464,11 @@ exec 5>>"$at_suite_log"
 
 # Banners and logs.
 printf "%s\n" "## --------------------------------- ##
-## pyrediff 17 test suite: pyrediff. ##
+## pyrediff 18 test suite: pyrediff. ##
 ## --------------------------------- ##"
 {
   printf "%s\n" "## --------------------------------- ##
-## pyrediff 17 test suite: pyrediff. ##
+## pyrediff 18 test suite: pyrediff. ##
 ## --------------------------------- ##"
   echo
 
@@ -2285,7 +2285,7 @@ _ASBOX
   printf "%s\n" "Please send $at_msg and all information you think might help:
 
    To: <[email protected]>
-   Subject: [pyrediff 17] $as_me: $at_msg1$at_msg2
+   Subject: [pyrediff 18] $as_me: $at_msg1$at_msg2
 
 You may investigate any problem if you feel able to do so, in which
 case the test suite provides a good starting point.  Its output may
@@ -3108,7 +3108,7 @@ import re
 import subprocess
 import sys
 
-__version__ = "17"
+__version__ = "18"
 
 # pylint: disable=missing-class-docstring
 # pylint: disable=missing-function-docstring