diff --git a/NEWS b/NEWS index dcffc323..e689e71c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +2.0.9.dev0 + * #1149: Add support for Python 3.14. + 2.0.8 * #1114: Document systemd configuration changes for the ZFS filesystem hook. * #1116: Add dumping of database containers via their container names, handy for backing up diff --git a/borgmatic/hooks/data_source/dump.py b/borgmatic/hooks/data_source/dump.py index 1cad79c8..a585548b 100644 --- a/borgmatic/hooks/data_source/dump.py +++ b/borgmatic/hooks/data_source/dump.py @@ -119,10 +119,11 @@ def convert_glob_patterns_to_borg_pattern(patterns): Convert a sequence of shell glob patterns like "/etc/*", "/tmp/*" to the corresponding Borg regular expression archive pattern as a single string like "re:etc/.*|tmp/.*". ''' - # Remove the "\Z" generated by fnmatch.translate() because we don't want the pattern to match - # only at the end of a path, as directory format dumps require extracting files with paths + # Remove the "\z" or "\Z" generated by fnmatch.translate() because we don't want the pattern to + # match only at the end of a path, as directory format dumps require extracting files with paths # longer than the pattern. E.g., a pattern of "borgmatic/*/foo_databases/test" should also match # paths like "borgmatic/*/foo_databases/test/toc.dat" return 're:' + '|'.join( - fnmatch.translate(pattern.lstrip('/')).replace('\\Z', '') for pattern in patterns + fnmatch.translate(pattern.lstrip('/')).replace('\\z', '').replace('\\Z', '') + for pattern in patterns ) diff --git a/pyproject.toml b/pyproject.toml index a0070267..4f7e344f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "borgmatic" -version = "2.0.8" +version = "2.0.9.dev0" authors = [ { name="Dan Helfman", email="witten@torsion.org" }, ] diff --git a/tox.ini b/tox.ini index 5226e0d8..da1a8b01 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -env_list = py39,py310,py311,py312,py313 +env_list = py39,py310,py311,py312,py313,py314 skip_missing_interpreters = true package = editable min_version = 4.0