PyPI - duplicity - Versions diffs - 3.0.8.dev4__tar.gz → 3.1.0.dev0__tar.gz - Mend

duplicity 3.0.8.dev4tar.gz → 3.1.0.dev0tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (145) hide show

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/AUTHORS.md RENAMED Viewed

@@ -32,7 +32,7 @@ Duplicity Authors
 - Stefan Breunig <stefan-duplicity@breunig.xyz>
 - Steve Tynor <steve.tynor@gmail.com>
 - Thomas Harning Jr <harningt@gmail.com>
-- Thomas Laubrock
+- Thomas Laubrock <duplicity-talk@schmu.net>
 - Tomas Vondra (Launchpad id: tomas-v)
 - Xavier Lucas <xavier.lucas@corp.ovh.com>
 - Yigal Asnis

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/CHANGELOG.md RENAMED Viewed

@@ -1,4 +1,27 @@
+(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
+===========================
+ * 3997156c:chg: Update README-RELEASE.md.
+ * 0f5430db:fix: Fix so GNUPGHOME is not changed in production.
+ * 53cc9659:fix: lower boto warning log level, rephrase.
+ * 88bfc75e:chg: Misc cleanups for developers
+ * 4b0bb8d5:chg: Update 'release pip version' in README-RELEASE.md.
 rel.3.0.8.dev4 / 2026-03-31
 ===========================

{duplicity-3.0.8.dev4/duplicity.egg-info → duplicity-3.1.0.dev0}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: duplicity
-Version: 3.0.8.dev4
+Version: 3.1.0.dev0
 Summary: Encrypted backup using rsync algorithm
 Author-email: Kenneth Loafman <kenneth@loafman.com>
 Maintainer: Edgar Soldin, Thomas Laubrock
@@ -18,14 +18,13 @@ Classifier: Operating System :: MacOS
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: C
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: System :: Archiving :: Backup
-Requires-Python: <3.15,>3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: COPYING
 License-File: AUTHORS.md
@@ -45,7 +44,6 @@ Requires-Dist: httplib2
 Requires-Dist: pysocks
 Requires-Dist: jottalib
 Requires-Dist: keyring
-Requires-Dist: lxml<=5.4.0
 Requires-Dist: mediafire
 Requires-Dist: megatools
 Requires-Dist: paramiko
@@ -75,6 +73,7 @@ sudo apt-get install -y \
         openssl \
         par2 \
         python3-dev \
+        python3-lxml \
         python3-pip \
         python3-venv \
         python3 \
@@ -102,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.dev4 → duplicity-3.1.0.dev0}/README.md RENAMED Viewed

@@ -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.dev4 → duplicity-3.1.0.dev0}/duplicity/__init__.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman
@@ -21,7 +21,7 @@
 import gettext
-__version__: str = "3.0.8.dev4"
-__reldate__: str = "March 31, 2026"
+__version__: str = "3.1.0.dev0"
+__reldate__: str = "June 04, 2026"
 gettext.install("duplicity", names=["ngettext"])

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/__main__.py RENAMED Viewed

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # duplicity -- Encrypted bandwidth efficient backup
 #
@@ -62,8 +62,10 @@ def dup_run():
     # check that we can function here
     if os.environ.get("PYTEST_VERSION") is not None:
         pass
-    elif not ((3, 9) <= sys.version_info[:2] <= (3, 14)):
-        print("Sorry, duplicity requires version 3.9 thru 3.14 of Python.", file=sys.stderr)
+    elif os.environ.get("CIBUILDWHEEL") is not None:
+        pass
+    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)
     try:

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backend_pool.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/__init__.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/_cf_cloudfiles.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2009 Eric EJ Johnson
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/_cf_pyrax.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2013 J.P. Krauss
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/_testbackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman
@@ -25,19 +25,16 @@ import inspect
 import json
 import logging
 import os
-from random import random
 import re
 import sys
 import time
+from random import random
 import duplicity.backend
-from duplicity import (
-    log,
-    path,
-    progress,
-)
+from duplicity import log
+from duplicity import path
+from duplicity import progress
 from duplicity.errors import BackendException
-from testing import _runtest_dir
 class BackendErrors:
@@ -66,6 +63,8 @@ class _TestBackend(duplicity.backend.Backend):
     def __init__(self, parsed_url):
         super().__init__(parsed_url)
+        from testing import _runtest_dir
         log._logger.addHandler(logging.FileHandler(f"{_runtest_dir}/testbackend.log"))
         log.Warn("TestBackend is not made for production use!")
         # The URL form "file:MyFile" is not a valid duplicity target.

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/adbackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2016 Stefan Breunig
 # Based on the backend onedrivebackend.py

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/azurebackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2013 Matthieu Huin
 # Copyright 2015 Scott McKenzie

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/b2backend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright (c) 2015 Matthew Bentley
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/boxbackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2020 Jose L. Domingo Lopez
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/cfbackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2013 Kenneth Loafman
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/dpbxbackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2013 jno
 # Copyright 2016 Dmitry Nezhevenko

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/gdocsbackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2011 Carlos Abalde
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/gdrivebackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2015 Yigal Asnis
 # Copyright 2021 Jindrich Makovicka

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/giobackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2009 Michael Terry
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/hsibackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/hubicbackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2013 J.P. Krauss
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/idrivedbackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2021 Menno Smits
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/imapbackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/jottacloudbackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2014 Havard Gulldahl
 # Copyright 2013 jno

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/lftpbackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/localbackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/mediafirebackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2016 Roman Yepishev
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/megabackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2017 Tomas Vondra
 # Copyright 2017 Kenneth Loafman

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/megav2backend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2020 Jose L. Domingo Lopez
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/megav3backend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2020 Jose L. Domingo Lopez
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/multibackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2015 Steve Tynor
 # Copyright 2016 Thomas Harning Jr

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/ncftpbackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/onedrivebackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 # vim:tabstop=4:shiftwidth=4:expandtab
 #
 # Copyright 2014 Google Inc.
@@ -92,7 +92,7 @@ class OneDriveBackend(duplicity.backend.Backend):
     def _list(self):
         accum = []
         # Strip last slash, because graph can give a 404 in some cases with it
-        next_url = self.API_URI + self.directory_onedrive_path.rstrip("/") + ":/children"
+        next_url = f"{self.API_URI}{self.directory_onedrive_path.rstrip('/')}:/children"
         while True:
             response = self.http_client.get(next_url, timeout=config.timeout)
             if response.status_code == 404:
@@ -114,7 +114,7 @@ class OneDriveBackend(duplicity.backend.Backend):
         remote_filename = remote_filename.decode("UTF-8")
         with local_path.open("wb") as f:
             response = self.http_client.get(
-                self.API_URI + self.directory_onedrive_path + remote_filename + ":/content",
+                f"{self.API_URI}{self.directory_onedrive_path}{remote_filename}:/content",
                 stream=True,
                 timeout=config.timeout,
             )
@@ -132,7 +132,7 @@ class OneDriveBackend(duplicity.backend.Backend):
         remote_filename = remote_filename.decode("UTF-8")
         source_size = os.path.getsize(source_path.name)
         start = time.time()
-        response = self.http_client.get(self.API_URI + self.drive_root + "?$select=quota", timeout=config.timeout)
+        response = self.http_client.get(f"{self.API_URI}{self.drive_root}?$select=quota", timeout=config.timeout)
         response.raise_for_status()
         if "quota" in response.json():
             available = response.json()["quota"].get("remaining", None)
@@ -149,7 +149,7 @@ class OneDriveBackend(duplicity.backend.Backend):
         with source_path.open() as source_file:
             start = time.time()
-            url = self.API_URI + self.directory_onedrive_path + remote_filename + ":/createUploadSession"
+            url = f"{self.API_URI}{self.directory_onedrive_path}{remote_filename}:/createUploadSession"
             response = self.http_client.post(url, timeout=config.timeout)
             response.raise_for_status()
@@ -309,7 +309,7 @@ class DefaultOAuth2Session(OneDriveOAuth2Session):
         # refreshed successfully, which will happen under the covers). In case
         # this request fails, the provided token was too old (i.e. expired),
         # and we need to get a new token.
-        user_info_response = self.session.get(api_uri + "me", timeout=config.timeout)
+        user_info_response = self.session.get(f"{api_uri}me", timeout=config.timeout)
         if user_info_response.status_code != 200:
             token = None
@@ -335,7 +335,7 @@ class DefaultOAuth2Session(OneDriveOAuth2Session):
                 timeout=config.timeout,
             )
-            user_info_response = self.session.get(api_uri + "me", timeout=config.timeout)
+            user_info_response = self.session.get(f"{api_uri}me", timeout=config.timeout)
             user_info_response.raise_for_status()
             try:

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/par2backend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2013 Germar Reitze
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/pcabackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2013 Matthieu Huin
 # Copyright 2017 Xavier Lucas

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/pydrivebackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2015 Yigal Asnis
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/pyrax_identity/__init__.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/pyrax_identity/hubic.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright (c) 2014 Gu1
 # Licensed under the MIT license

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/rclonebackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2019 Francesco Magno
 # Copyright 2019 Kenneth Loafman

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/rsyncbackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/s3_boto3_backend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman
@@ -106,10 +106,10 @@ class S3Boto3Backend(duplicity.backend.Backend):
             if config.s3_endpoint_url and not re.match(
                 pattern="(?i).*\\.amazonaws\\.com(/+)?$", string=config.s3_endpoint_url
             ):
-                log.Warn(
-                    "WARNING: Using boto3 >= 1,36.0 with non-amazon s3 services"
-                    " may result in checksum errors."
-                    " a workaround is to set the following env vars\n\n"
+                log.Notice(
+                    "WARNING: If boto3 >= 1,36.0 with non-amazon s3 services"
+                    " results in checksum errors preventing uploads you may try"
+                    " the following workaround. set the following env vars\n\n"
                     "    export AWS_REQUEST_CHECKSUM_CALCULATION=when_required\n"
                     "    export AWS_RESPONSE_CHECKSUM_VALIDATION=when_required\n\n"
                     "see https://gitlab.com/duplicity/duplicity/-/issues/870 for details."

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/slatebackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2021 Syeam Bin Abdullah
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/ssh_paramiko_backend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/ssh_pexpect_backend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/swiftbackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2013 Matthieu Huin
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/sxbackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2014 Andrea Grandi
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/tahoebackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2008 Francois Deppierraz
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/webdavbackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/backends/xorrisobackend.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escotodo
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/cached_ops.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2012 Google Inc.
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/cli_data.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2022 Kenneth Loafman
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/cli_main.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2022 Kenneth Loafman
 #
@@ -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.dev4 → duplicity-3.1.0.dev0}/duplicity/cli_util.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2022 Kenneth Loafman
 #

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/config.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev4 → duplicity-3.1.0.dev0}/duplicity/diffdir.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

duplicity 3.0.8.dev4__tar.gz → 3.1.0.dev0__tar.gz

duplicity 3.0.8.dev4tar.gz → 3.1.0.dev0tar.gz