duplicity 3.0.8.dev6__tar.gz → 3.1.0.dev0__tar.gz

{duplicity-3.0.8.dev6 → duplicity-3.1.0.dev0}/CHANGELOG.md

@@ -1,9 +1,18 @@
 
-(Unreleased) / 2026-05-12
+(Unreleased) / 2026-06-04
 =========================
 
 
 
+rel.3.1.0.dev0 / 2026-06-04
+===========================
+
+ * 5c4cdc2f:new: Now do pip builds for macOS and Linux
+ * 0140a374:new: Add include/exclude restore filtering using archive-relative paths
+ * 46a4796b:chg: Update snapcraft.yaml for license, type, and typo fixes.
+ * 143373b8:chg: Use `--build-on` for snapcraft remote-build.
+ * 182d6e33:chg: Use `python3 -m build` for sdist in release-prep.
+
 rel.3.0.8.dev5 / 2026-05-12
 ===========================
 

{duplicity-3.0.8.dev6/duplicity.egg-info → duplicity-3.1.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: duplicity
-Version: 3.0.8.dev6
+Version: 3.1.0.dev0
 Summary: Encrypted backup using rsync algorithm
 Author-email: Kenneth Loafman <kenneth@loafman.com>
 Maintainer: Edgar Soldin, Thomas Laubrock
@@ -44,7 +44,6 @@ Requires-Dist: httplib2
 Requires-Dist: pysocks
 Requires-Dist: jottalib
 Requires-Dist: keyring
-Requires-Dist: lxml
 Requires-Dist: mediafire
 Requires-Dist: megatools
 Requires-Dist: paramiko
@@ -74,6 +73,7 @@ sudo apt-get install -y \
         openssl \
         par2 \
         python3-dev \
+        python3-lxml \
         python3-pip \
         python3-venv \
         python3 \
@@ -101,7 +101,7 @@ packaging tools like this:
 ```shell
 sudo python3 -m pip install --upgrade pip pipx
 ````
-**NOTE: _Failure to upgrade will probably result in a failed install._  <--IMPORTANT!**  
+**NOTE: _Failure to upgrade will probably result in a failed install._  ←IMPORTANT!**  
 
 To make sure the pipx dirs are on your path do:
 ```shell

{duplicity-3.0.8.dev6 → duplicity-3.1.0.dev0}/README.md

@@ -15,6 +15,7 @@ sudo apt-get install -y \
         openssl \
         par2 \
         python3-dev \
+        python3-lxml \
         python3-pip \
         python3-venv \
         python3 \
@@ -42,7 +43,7 @@ packaging tools like this:
 ```shell
 sudo python3 -m pip install --upgrade pip pipx
 ````
-**NOTE: _Failure to upgrade will probably result in a failed install._  <--IMPORTANT!**  
+**NOTE: _Failure to upgrade will probably result in a failed install._  ←IMPORTANT!**  
 
 To make sure the pipx dirs are on your path do:
 ```shell

{duplicity-3.0.8.dev6 → duplicity-3.1.0.dev0}/duplicity/__init__.py

@@ -21,7 +21,7 @@
 
 import gettext
 
-__version__: str = "3.0.8.dev6"
-__reldate__: str = "May 12, 2026"
+__version__: str = "3.1.0.dev0"
+__reldate__: str = "June 04, 2026"
 
 gettext.install("duplicity", names=["ngettext"])

{duplicity-3.0.8.dev6 → duplicity-3.1.0.dev0}/duplicity/cli_main.py

@@ -320,6 +320,24 @@ def process_command_line(cmdline_list):
     # count is only used by the remove-* commands
     config.keep_chains = config.count
 
+    # restore selection uses archive-relative paths and is applied while restoring
+    if config.action == "restore" and config.select_opts:
+        if config.restore_path:
+            command_line_error(
+                "--path-to-restore cannot be combined with restore file selection options. "
+                "Use --path-to-restore for one archive path, or --include/--exclude for pattern-based restore."
+            )
+        unsupported_restore_selection = {
+            "--exclude-if-present",
+            "--exclude-other-filesystems",
+            "--files-from",
+        }
+        unsupported = sorted({opt for opt, _arg in config.select_opts if opt in unsupported_restore_selection})
+        if unsupported:
+            command_line_error(
+                "The following file selection options are not supported for restore: " + ", ".join(unsupported)
+            )
+
     # selection only applies to certain commands
     if config.action in ["full", "inc", "verify"]:
         set_selection()

{duplicity-3.0.8.dev6 → duplicity-3.1.0.dev0}/duplicity/dup_main.py

@@ -57,6 +57,7 @@ from duplicity import (
     patchdir,
     path,
     progress,
+    selection,
     tempdir,
     util,
 )
@@ -908,6 +909,9 @@ def restore_get_patched_rop_iter(col_stats):
         f"available chains: {col_stats.all_backup_chains}"
     )
     backup_setlist = backup_chain.get_sets_at_time(time)
+    restore_selection = None
+    if config.action == "restore" and config.select_opts:
+        restore_selection = selection.get_restore_selection(config.select_opts, config.select_files)
     num_vols = 0
     for s in backup_setlist:
         num_vols += len(s)
@@ -957,7 +961,10 @@ def restore_get_patched_rop_iter(col_stats):
 
     fileobj_iters = list(map(get_fileobj_iter, backup_setlist))
     tarfiles = list(map(patchdir.TarFile_FromFileobjs, fileobj_iters))
-    return patchdir.tarfiles2rop_iter(tarfiles, index)
+    rop_iter = patchdir.tarfiles2rop_iter(tarfiles, index)
+    if restore_selection:
+        rop_iter = selection.filter_restore_path_iter(rop_iter, restore_selection)
+    return rop_iter
 
 
 def restore_get_enc_fileobj(backend, filename, volume_info):

{duplicity-3.0.8.dev6 → duplicity-3.1.0.dev0}/duplicity/selection.py

@@ -702,3 +702,162 @@ class Select(object):
                 return None
 
         return test_fn
+
+
+class _ArchivePath(object):
+    """Adapter exposing an archive ROPath with an archive-relative name."""
+
+    def __init__(self, ropath):
+        self.ropath = ropath
+        self.index = ropath.index
+        if self.index:
+            self.uc_name = os.fsdecode(b"/".join(self.index))
+        else:
+            self.uc_name = ""
+
+    def __getattr__(self, attr):
+        return getattr(self.ropath, attr)
+
+
+class ArchiveSelect(Select):
+    """Apply selection rules to archive-relative restore paths.
+
+    Restore paths are matched in the namespace printed by list-current-files
+    and accepted by --path-to-restore, not in the original source filesystem
+    namespace used by backup selection.
+    """
+
+    def __init__(self):
+        super().__init__(Path(b"."))
+
+    @staticmethod
+    def _normalize_archive_pattern(pattern):
+        while pattern.startswith("./"):
+            pattern = pattern[2:]
+        if pattern.startswith("/"):
+            raise FilePrefixError(pattern)
+        if any(part in (".", "..") for part in pattern.split("/") if part):
+            raise FilePrefixError(pattern)
+        return pattern
+
+    def parse_catch_error(self, exc):
+        """Deal with restore archive-relative selection errors."""
+        if isinstance(exc, FilePrefixError):
+            log.FatalError(
+                dedent(_("""\
+                Fatal Error: Restore file selection pattern
+                    %s
+                is invalid. Restore file selection patterns must be relative to the
+                archive root, using paths as printed by list-current-files, and must
+                not be absolute or contain '.' or '..' path elements.""")) % (exc,),
+                log.ErrorCode.file_prefix_error,
+            )
+        else:
+            super().parse_catch_error(exc)
+
+    def glob_get_sf(self, glob_str, include, ignore_case=False):
+        """Return archive-relative selection function based on glob_str."""
+        glob_str = self._normalize_archive_pattern(glob_str)
+        if glob_str == "**":
+            sel_func = lambda path: include
+        else:
+            sel_func = select_fn_from_glob(glob_str, include, ignore_case)
+
+        sel_func.exclude = not include
+        sel_func.name = (
+            f"archive shell glob {include and 'include' or 'exclude'} " f"{ignore_case and 'no-' or ''}case: {glob_str}"
+        )
+        return sel_func
+
+    def literal_get_sf(self, lit_str, include, ignore_case=False):
+        """Return archive-relative selection function based on literal string."""
+        lit_str = self._normalize_archive_pattern(lit_str)
+        sel_func = self.select_fn_from_literal(lit_str, include, ignore_case)
+        sel_func.exclude = not include
+        sel_func.name = (
+            f"archive literal string {include and 'include' or 'exclude'} "
+            f"{ignore_case and 'no-' or ''}case: {lit_str}"
+        )
+        return sel_func
+
+    def exclude_older_get_sf(self, date):
+        """Return archive-relative selection function based on archived mtime."""
+
+        def sel_func(path):
+            if not path.isreg():
+                return None
+            if path.getmtime() < date:
+                return 0
+            return None
+
+        sel_func.exclude = True
+        sel_func.name = f"Select older than {date}"
+        return sel_func
+
+
+def get_restore_selection(argtuples, filelists):
+    """Return an archive-relative selector for restore filtering."""
+    sel = ArchiveSelect()
+    sel.ParseArgs(argtuples, filelists)
+    return sel
+
+
+def filter_restore_path_iter(path_iter, sel):
+    """Yield selected restore ROPaths, including deferred parent directories."""
+    deferred_dirs = []
+    excluded_dirs = []
+    yielded_dirs = set()
+
+    def is_ancestor(parent_index, child_index):
+        return parent_index == child_index[: len(parent_index)]
+
+    def prune_deferred_dirs(index):
+        while deferred_dirs and not is_ancestor(deferred_dirs[-1].index, index):
+            deferred_dirs.pop()
+
+    def prune_excluded_dirs(index):
+        while excluded_dirs and not is_ancestor(excluded_dirs[-1], index):
+            excluded_dirs.pop()
+
+    def is_excluded_by_parent(index):
+        return excluded_dirs and is_ancestor(excluded_dirs[-1], index)
+
+    def yield_deferred_dirs():
+        for deferred_dir in deferred_dirs:
+            if deferred_dir.index not in yielded_dirs:
+                yielded_dirs.add(deferred_dir.index)
+                yield deferred_dir
+        del deferred_dirs[:]
+
+    def close_unselected(ropath):
+        fileobj = getattr(ropath, "fileobj", None)
+        if fileobj:
+            try:
+                fileobj.close()
+            except Exception:
+                pass
+
+    for ropath in path_iter:
+        prune_deferred_dirs(ropath.index)
+        prune_excluded_dirs(ropath.index)
+        if is_excluded_by_parent(ropath.index):
+            close_unselected(ropath)
+            continue
+
+        if ropath.index == ():
+            if ropath.index not in yielded_dirs:
+                deferred_dirs.append(ropath)
+            continue
+
+        result = sel.Select(_ArchivePath(ropath))
+        if result == 1:
+            yield from yield_deferred_dirs()
+            if ropath.isdir():
+                yielded_dirs.add(ropath.index)
+            yield ropath
+        elif result == 2 and ropath.isdir() and ropath.index not in yielded_dirs:
+            deferred_dirs.append(ropath)
+        else:
+            if result == 0 and ropath.isdir():
+                excluded_dirs.append(ropath.index)
+            close_unselected(ropath)

{duplicity-3.0.8.dev6 → duplicity-3.1.0.dev0/duplicity.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: duplicity
-Version: 3.0.8.dev6
+Version: 3.1.0.dev0
 Summary: Encrypted backup using rsync algorithm
 Author-email: Kenneth Loafman <kenneth@loafman.com>
 Maintainer: Edgar Soldin, Thomas Laubrock
@@ -44,7 +44,6 @@ Requires-Dist: httplib2
 Requires-Dist: pysocks
 Requires-Dist: jottalib
 Requires-Dist: keyring
-Requires-Dist: lxml
 Requires-Dist: mediafire
 Requires-Dist: megatools
 Requires-Dist: paramiko
@@ -74,6 +73,7 @@ sudo apt-get install -y \
         openssl \
         par2 \
         python3-dev \
+        python3-lxml \
         python3-pip \
         python3-venv \
         python3 \
@@ -101,7 +101,7 @@ packaging tools like this:
 ```shell
 sudo python3 -m pip install --upgrade pip pipx
 ````
-**NOTE: _Failure to upgrade will probably result in a failed install._  <--IMPORTANT!**  
+**NOTE: _Failure to upgrade will probably result in a failed install._  ←IMPORTANT!**  
 
 To make sure the pipx dirs are on your path do:
 ```shell

{duplicity-3.0.8.dev6 → duplicity-3.1.0.dev0}/duplicity.egg-info/requires.txt

@@ -14,7 +14,6 @@ httplib2
 pysocks
 jottalib
 keyring
-lxml
 mediafire
 megatools
 paramiko

{duplicity-3.0.8.dev6 → duplicity-3.1.0.dev0}/man/duplicity.1

@@ -1,4 +1,4 @@
-.TH DUPLICITY 1 "May 12, 2026" "Version 3.0.8.dev6" "User Manuals" \"  -*- nroff -*-
+.TH DUPLICITY 1 "June 04, 2026" "Version 3.1.0.dev0" "User Manuals" \"  -*- nroff -*-
 .\" disable justification (adjust text to left margin only)
 .\" command line examples stay readable through that
 .ad l
@@ -29,7 +29,7 @@ source_url target_directory
 target_url
 
 .B duplicity [restore]
-.I [options] [--path-to-restore <relpath>] [--time time]
+.I [options] [--path-to-restore <relpath> | file selection options] [--time time]
 source_url target_directory
 
 .B duplicity remove-older-than <time>
@@ -215,10 +215,21 @@ the other hand if the archive has been deleted or corrupted, this
 action will not detect it.
 
 .TP
-.BI "restore, rb " "[--path-to-restore <relpath>] [--time <time>] <url> <target_folder>"
+.BI "restore, rb " "[--path-to-restore <relpath> | file selection options] [--time <time>] <url> <target_folder>"
 You can restore the full monty or selected folders/files from a specific time.
 Use the relative path as it is printed by
 .BR list-current-files .
+.br
+For pattern-based restore filtering, file selection options such as
+.BR --include ,
+.BR --exclude ,
+.BR --include-regexp ,
+and
+.BR --exclude-regexp
+also match paths relative to the archive root, as printed by
+.BR list-current-files .
+These file selection options cannot be combined with
+.BR --path-to-restore .
 Usually not needed as duplicity enters restore mode when it detects that the URL
 comes before the local folder.
 
@@ -1658,6 +1669,25 @@ system, unless
 .B "--files-from"
 has been specified in which case the passed list of individual files
 is used instead.
+During restore, supported file selection options filter archive-relative
+paths, matching the names printed by
+.BR list-current-files ,
+and are mutually exclusive with
+.BR --path-to-restore .
+Restore file selection patterns must be relative to the archive root,
+may optionally start with
+.BR ./ ,
+and must not be absolute or contain
+.B .
+or
+.B ..
+path elements.
+Options requiring live source filesystem semantics, such as
+.BR --exclude-if-present ,
+.BR --exclude-other-filesystems ,
+and
+.BR --files-from ,
+are not supported during restore.
 
 The file selection system comprises a number of file
 selection conditions, which are set using one of the following command

{duplicity-3.0.8.dev6 → duplicity-3.1.0.dev0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "duplicity"
-version = "3.0.8.dev6"
+version = "3.1.0.dev0"
 dynamic = ["dependencies"]
 description = "Encrypted backup using rsync algorithm"
 authors = [
@@ -128,14 +128,16 @@ testpaths = [
 
 
 [tool.cibuildwheel]
-
-before-all = [
-    # WARNING: wheel builds are RedHat based, not Debian.
-    "yum update -y",
-    "yum install -y gcc gcc-c++ make git intltool librsync-devel",
-    "yum install -y libffi-devel openssl-devel openssl tzdata",
-    "yum install -y libxml2-devel libxslt-devel",
-    "python -m pip install -q -r requirements.txt",
+before-build = [
+    # Clean up stale build folders and old egg-info before compiling each wheel
+    # to build_ext with proper python version.  Build any extensions needed.
+    # make sure we build_ext with the current python
+    "rm -rf build/ *.egg-info",
+    "rm -rf .setuptools-cmake-build _skbuild",
+    # install all the python requirements but not lxml
+    "python -m pip install -q --upgrade pip",
+    "grep -v lxml requirements.txt > requirements.whl",
+    "python -m pip install -q -r requirements.whl",
     "python ./setup.py build_ext",
 ]
 
@@ -143,15 +145,46 @@ before-all = [
 build-option = "--use-pep517"
 
 [tool.cibuildwheel.linux]
+before-all = [
+    # WARNING: wheel builds are RedHat-based, not Debian.
+    "yum update -y",
+    "yum install -y gcc gcc-c++ make git intltool librsync-devel",
+    "yum install -y libffi-devel openssl-devel openssl tzdata",
+    "yum install -y libxml2-devel libxslt-devel python3-lxml",
+]
 archs = [
-    "x86_64",
     "aarch64",
+#    "armv7l",  # is 32-bit
+#    "ppc64le",  # lxml build fails
+#    "riscv64",  # no librsync-devel
+#    "s390x",  # lxml build fails
+    "x86_64",
 ]
 build = [
     "cp{310,311,312,313,314}-manylinux_aarch64",
+#    "cp{310,311,312,313,314}-manylinux_armv7l",  # is 32-bit
+#    "cp{310,311,312,313,314}-manylinux_ppc64le",  # lxml build fails
+#    "cp{310,311,312,313,314}-manylinux_riscv64",  # no librsync-devel
+#    "cp{310,311,312,313,314}-manylinux_s390x",  # lxml build fails
     "cp{310,311,312,313,314}-manylinux_x86_64",
 ]
 
+[tool.cibuildwheel.macos]
+environment = "LIBRSYNC_DIR=$HOMEBREW_PREFIX MACOSX_DEPLOYMENT_TARGET=26.0"
+before-all = [
+    # install packages using homebrew
+    "echo $LIBRSYNC_DIR",
+    "brew install cmake intltool librsync",
+]
+archs = [
+    "arm64",
+    "x86_64",
+]
+build = [
+    "cp{310,311,312,313,314}-macosx_arm64",
+    "cp{310,311,312,313,314}-macosx_x86_64",
+]
+
 
 [tool.pylint]
 jobs = 0

{duplicity-3.0.8.dev6 → duplicity-3.1.0.dev0}/requirements.txt

@@ -20,7 +20,6 @@ httplib2
 pysocks  # optional httplib2 dep, needed for proxy support
 jottalib
 keyring
-lxml
 mediafire
 megatools
 paramiko

{duplicity-3.0.8.dev6 → duplicity-3.1.0.dev0}/setup.py

@@ -38,7 +38,7 @@ elif not ((3, 10) <= sys.version_info[:2] <= (3, 14)):
     print("Sorry, duplicity requires Python version 3.10 thru 3.14.", file=sys.stderr)
     sys.exit(1)
 
-Version: str = "3.0.8.dev6"
+Version: str = "3.1.0.dev0"
 
 # READTHEDOCS uses setup.py sdist but can't handle extensions
 ext_modules = list()