duplicity 3.0.5__tar.gz → 3.0.6.dev7__tar.gz

{duplicity-3.0.5 → duplicity-3.0.6.dev7}/CHANGELOG.md

@@ -1,6 +1,19 @@
 # Changelog
 
 
+## rel.3.0.5.1 (2025-06-25)
+
+### Changes
+
+* Fixes for LP builds.  See #877. [Kenneth Loafman]
+
+### Fix
+
+* Revert "Fix build-system.requires and requirements.txt" [Kenneth Loafman]
+
+    This reverts commit 3683aa4dd8c0a5fa4d70eee256a853310ffa9a87.
+
+
 ## rel.3.0.5 (2025-06-19)
 
 ### New

{duplicity-3.0.5/duplicity.egg-info → duplicity-3.0.6.dev7}/PKG-INFO

@@ -1,10 +1,9 @@
 Metadata-Version: 2.4
 Name: duplicity
-Version: 3.0.5
+Version: 3.0.6.dev7
 Summary: Encrypted backup using rsync algorithm
 Author-email: Kenneth Loafman <kenneth@loafman.com>
 Maintainer: Edgar Soldin, Thomas Laubrock
-License: GPL-2.0-or-later
 Project-URL: Homepage, http://duplicity.us
 Project-URL: Download, https://gitlab.com/duplicity/duplicity/-/releases
 Project-URL: Issues, https://gitlab.com/duplicity/duplicity/-/issues
@@ -12,6 +11,7 @@ Project-URL: Contact, https://lists.nongnu.org/mailman/listinfo/duplicity-talk
 Project-URL: Documentation, http://duplicity.us
 Project-URL: Repository, https://gitlab.com/duplicity/duplicity
 Project-URL: Changelog, https://gitlab.com/duplicity/duplicity/-/blob/main/CHANGELOG.md
+Platform: any
 Classifier: Development Status :: 6 - Mature
 Classifier: Environment :: Console
 Classifier: Operating System :: MacOS
@@ -25,11 +25,13 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: System :: Archiving :: Backup
-Requires-Python: <3.14,>=3.8
+Requires-Python: <3.15,>=3.8
 Description-Content-Type: text/markdown
 License-File: COPYING
 License-File: AUTHORS.md
 Requires-Dist: fasteners>=0.19
+Requires-Dist: python-gettext>=5.0
+Requires-Dist: setuptools>=78.1.0
 Requires-Dist: azure-storage-blob
 Requires-Dist: b2sdk
 Requires-Dist: boto3
@@ -53,19 +55,6 @@ Requires-Dist: pyrax
 Requires-Dist: python-swiftclient
 Requires-Dist: requests
 Requires-Dist: requests-oauthlib
-Provides-Extra: dev
-Requires-Dist: setuptools>=68.1.0; extra == "dev"
-Requires-Dist: black==24.8.0; extra == "dev"
-Requires-Dist: coverage; extra == "dev"
-Requires-Dist: pycodestyle; extra == "dev"
-Requires-Dist: pylint; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: gitchangelog; extra == "dev"
-Requires-Dist: myst-parser; extra == "dev"
-Requires-Dist: pystache; extra == "dev"
-Requires-Dist: sphinx; extra == "dev"
-Requires-Dist: sphinx-rtd-theme; extra == "dev"
 Dynamic: license-file
 
 # REQUIREMENTS

{duplicity-3.0.5 → duplicity-3.0.6.dev7}/duplicity/__init__.py

@@ -21,7 +21,7 @@
 
 import gettext
 
-__version__: str = "3.0.5"
-__reldate__: str = "June 19, 2025"
+__version__: str = "3.0.6.dev7"
+__reldate__: str = "August 02, 2025"
 
 gettext.install("duplicity", names=["ngettext"])

{duplicity-3.0.5 → duplicity-3.0.6.dev7}/duplicity/__main__.py

@@ -96,7 +96,7 @@ def dup_run():
         # For backend errors, don't show an ugly stack trace by
         # default. But do with sufficient verbosity.
         log.Info(_("Backend error detail: %s") % util.exception_traceback())
-        log.FatalError(f"{e.__class__.__name__}: {util.uexc(e)}", log.ErrorCode.user_error, e.__class__.__name__)
+        log.FatalError(f"{e.__class__.__name__}: {util.uexc(e)}", log.ErrorCode.backend_error, e.__class__.__name__)
 
     except Exception as e:
         util.release_lockfile()

{duplicity-3.0.5 → duplicity-3.0.6.dev7}/duplicity/backend.py

@@ -57,7 +57,6 @@ from duplicity.util import exception_traceback
 
 _backends = {}
 _backend_prefixes = {}
-_last_exception = None
 
 # These URL schemes have a backend with a notion of an RFC "network location".
 # The 'file' and 's3+http' schemes should not be in this list.
@@ -369,72 +368,53 @@ def retry(operation, fatal=True):
     # have to return a decorator function (which itself returns a function!)
     def outer_retry(fn):
         def inner_retry(self, *args):
-            global _last_exception
-            errors_fatal, errors_default = config.are_errors_fatal.get(operation, (True, None))
             for n in range(1, config.num_retries + 1):
                 try:
                     return fn(self, *args)
                 except FatalBackendException as e:
-                    _last_exception = e
-                    if not errors_fatal:
-                        # backend wants to report and ignore errors
-                        return errors_default
-                    else:
-                        # die on fatal errors
-                        raise e
+                    raise
                 except Exception as e:
-                    _last_exception = e
-                    if not errors_fatal:
-                        # backend wants to report and ignore errors
-                        return errors_default
-                    else:
-                        # retry on anything else
-                        log.Debug(_("Backtrace of previous error: %s") % exception_traceback())
-                        at_end = n == config.num_retries
-                        code = _get_code_from_exception(self.backend, operation, e)
-                        if code == log.ErrorCode.backend_not_found:
-                            # If we tried to do something, but the file just isn't there,
-                            # no need to retry.
-                            at_end = True
-                        if at_end and fatal:
-
-                            def make_filename(f):
-                                if isinstance(f, path.ROPath):
-                                    return util.escape(f.uc_name)
-                                else:
-                                    return util.escape(f)
-
-                            extra = " ".join(
-                                [operation] + [make_filename(x) for x in args if (x and isinstance(x, str))]
-                            )
-                            if multiprocessing.parent_process():
-                                # running as a child process we need to raise an exception to signal an issue
-                                log.Error(
-                                    _("Giving up after %s attempts. %s: %s. (for trace back: set log level DEBUG)")
-                                    % (n, e.__class__.__name__, util.uexc(e)),
-                                    code=code,
-                                    extra=extra,
-                                )
-                                e.code = code
-                                raise
+                    # retry on anything else
+                    log.Debug(_("Backtrace of previous error: %s") % exception_traceback())
+                    at_end = n == config.num_retries
+                    code = _get_code_from_exception(self.backend, operation, e)
+                    if code == log.ErrorCode.backend_not_found:
+                        # If we tried to do something, but the file just isn't there,
+                        # no need to retry.
+                        at_end = True
+                    if at_end and fatal:
+
+                        def make_filename(f):
+                            if isinstance(f, path.ROPath):
+                                return util.escape(f.uc_name)
                             else:
-                                log.FatalError(
-                                    _("Giving up after %s attempts. %s: %s") % (n, e.__class__.__name__, util.uexc(e)),
-                                    code=code,
-                                    extra=extra,
-                                )
+                                return util.escape(f)
+
+                        extra = " ".join([operation] + [make_filename(x) for x in args if (x and isinstance(x, str))])
+                        log.Error(
+                            _("Giving up after %s attempts. %s: %s. (for trace back: set log level DEBUG)")
+                            % (n, e.__class__.__name__, util.uexc(e)),
+                            code=code,
+                            extra=extra,
+                        )
+                        e.code = code
+                        # Ensure it's a BackendException, so that __main__ top-level handler exits with
+                        # code backend_error.
+                        if not isinstance(e, BackendException):
+                            e = BackendException(str(e), code=e.code)
+                        raise e
+                    else:
+                        log.Warn(
+                            _("Attempt of %s Nr. %s failed. %s: %s")
+                            % (fn.__name__, n, e.__class__.__name__, util.uexc(e))
+                        )
+                    if not at_end:
+                        if isinstance(e, TemporaryLoadException):
+                            time.sleep(3 * config.backend_retry_delay)  # wait longer before trying again
                         else:
-                            log.Warn(
-                                _("Attempt of %s Nr. %s failed. %s: %s")
-                                % (fn.__name__, n, e.__class__.__name__, util.uexc(e))
-                            )
-                        if not at_end:
-                            if isinstance(e, TemporaryLoadException):
-                                time.sleep(3 * config.backend_retry_delay)  # wait longer before trying again
-                            else:
-                                time.sleep(config.backend_retry_delay)  # wait a bit before trying again
-                            if hasattr(self.backend, "_retry_cleanup"):
-                                self.backend._retry_cleanup()
+                            time.sleep(config.backend_retry_delay)  # wait a bit before trying again
+                        if hasattr(self.backend, "_retry_cleanup"):
+                            self.backend._retry_cleanup()
 
         return inner_retry
 

{duplicity-3.0.5 → duplicity-3.0.6.dev7}/duplicity/backends/multibackend.py

@@ -288,14 +288,17 @@ class MultiBackend(duplicity.backend.Backend):
                     )
                     raise BackendException("failed to write")
 
-                # If we've looped around, and none of them passed, fail
-                if (self.__write_cursor == first) and not passed:
-                    log.Log(
-                        _("MultiBackend: failed to write %s. Tried all backing stores and none succeeded")
-                        % source_path,
-                        log.ERROR,
-                    )
-                    raise BackendException("failed to write")
+                if self.__write_cursor == first:
+                    if passed:
+                        break
+                    else:
+                        # If we've looped around, and none of them passed, fail
+                        log.Log(
+                            _("MultiBackend: failed to write %s. Tried all backing stores and none succeeded")
+                            % source_path,
+                            log.ERROR,
+                        )
+                        raise BackendException("failed to write")
 
     def _get(self, remote_filename, local_path):
         # since the backend operations will be retried, we can't
@@ -325,17 +328,18 @@ class MultiBackend(duplicity.backend.Backend):
     def _list(self):
         lists = []
         for s in self.__stores:
-            config.are_errors_fatal["list"] = (False, [])
-            l = s.list()
+            try:
+                l = s.list()
+            except BackendException as e:
+                l = []
+                last_exception = e
+            else:
+                last_exception = None
             log.Notice(_("MultiBackend: %s: %d files") % (s.backend.parsed_url.strip_auth(), len(l)))
-            if len(l) == 0 and duplicity.backend._last_exception:
+            if len(l) == 0 and last_exception:
                 log.Warn(
-                    _(
-                        f"Exception during list of {s.backend.parsed_url.strip_auth()}: "
-                        f"{util.uexc(duplicity.backend._last_exception)}"
-                    )
+                    _(f"Exception during list of {s.backend.parsed_url.strip_auth()}: " f"{util.uexc(last_exception)}")
                 )
-                duplicity.backend._last_exception = None
             lists.append(l)
         # combine the lists into a single flat list w/o duplicates via set:
         result = list({item for sublist in lists for item in sublist})

{duplicity-3.0.5 → duplicity-3.0.6.dev7}/duplicity/backends/s3_boto3_backend.py

@@ -31,6 +31,8 @@ from duplicity.errors import (
     BackendException,
 )
 
+global boto3, botocore, ClientError, S3UploadFailedError, TransferConfig
+
 
 # Note: current gaps with the old boto backend include:
 #       - Glacier restore to S3 not implemented. Should this
@@ -66,6 +68,25 @@ class S3Boto3Backend(duplicity.backend.Backend):
     """
 
     def __init__(self, parsed_url):
+        global boto3, botocore, ClientError, S3UploadFailedError, TransferConfig
+        import boto3
+        import botocore
+        from boto3.s3.transfer import S3UploadFailedError, TransferConfig
+        from botocore.exceptions import ClientError
+
+        if not (boto3.__version__ < "1.36.0" and botocore.__version__ < "1.36.0"):
+            # TODO: remove this workaround when issue #870 is fixed.
+            # https://github.com/boto/boto3/issues/2913
+            log.Warn(
+                "WARNING: Using boto3 >= 1,36.0 may result in errors, so we qre applying\n"
+                "the workaround for https://gitlab.com/duplicity/duplicity/-/issues/870\n"
+                "    export AWS_REQUEST_CHECKSUM_CALCULATION=when_required\n"
+                "    export AWS_RESPONSE_CHECKSUM_VALIDATION=when_required\n"
+                "NOTE: This workaround is temporary and will be removed when issue is fixed.\n."
+            )
+            os.environ["AWS_REQUEST_CHECKSUM_CALCULATION"] = "when_required"
+            os.environ["AWS_RESPONSE_CHECKSUM_VALIDATION"] = "when_required"
+
         duplicity.backend.Backend.__init__(self, parsed_url)
 
         # This folds the null prefix and all null parts, which means that:
@@ -89,10 +110,6 @@ class S3Boto3Backend(duplicity.backend.Backend):
         self.tracker = UploadProgressTracker()
 
     def reset_connection(self):
-        import boto3
-        import botocore
-        from botocore.exceptions import ClientError
-
         self.bucket = None
         self.s3 = boto3.resource(
             "s3",
@@ -116,8 +133,6 @@ class S3Boto3Backend(duplicity.backend.Backend):
         self.bucket = self.s3.Bucket(self.bucket_name)  # only set if bucket is thought to exist.
 
     def _put(self, local_source_path, remote_filename):
-        from boto3.s3.transfer import TransferConfig
-
         if not self.s3:
             self.reset_connection()
 
@@ -178,16 +193,24 @@ class S3Boto3Backend(duplicity.backend.Backend):
         key = self.key_prefix + remote_filename
 
         log.Info(f"Uploading {self.straight_url}/{remote_filename} to {storage_class} Storage")
-        self.s3.Object(self.bucket.name, key).upload_file(
-            local_source_path.uc_name,
-            Callback=tracker.progress_cb,
-            Config=transfer_config,
-            ExtraArgs=extra_args,
-        )
+        try:
+            self.s3.Object(self.bucket.name, key).upload_file(
+                local_source_path.uc_name,
+                Callback=tracker.progress_cb,
+                Config=transfer_config,
+                ExtraArgs=extra_args,
+            )
+        except S3UploadFailedError as e:
+            if boto3.__version__ > "1.36.0" or botocore.__version__ > "1.36.0":
+                log.FatalError(
+                    f"Failed to upload file {remote_filename}, got S3UploadFailedError\n"
+                    f"See https://gitlab.com/duplicity/duplicity/-/issues/870 for details.\n"
+                    f"Quick fix is: [sudo] pip3 install boto3<1.36.0 botocore<1.36.0"
+                )
+            else:
+                raise e
 
     def _get(self, remote_filename, local_path):
-        from botocore.exceptions import ClientError
-
         if not self.s3:
             self.reset_connection()
 
@@ -198,8 +221,9 @@ class S3Boto3Backend(duplicity.backend.Backend):
         except ClientError as ios:
             if ios.response["Error"]["Code"] == "InvalidObjectState":
                 log.FatalError(
-                    f"File {remote_filename} seems to be in a long term storage, "
-                    f"please use AWS Console/API to initiate restore.\nAPI-Error: {ios}"
+                    f"File {remote_filename} seems to be in a long term storage,"
+                    f"Please use AWS Console/API to initiate restore.\n"
+                    f"API-Error: {ios}"
                 )
             else:
                 raise ios
@@ -230,8 +254,6 @@ class S3Boto3Backend(duplicity.backend.Backend):
         if not self.s3:
             self.reset_connection()
 
-        import botocore
-
         remote_filename = os.fsdecode(remote_filename)
         key = self.key_prefix + remote_filename
         content_length = -1

{duplicity-3.0.5 → duplicity-3.0.6.dev7}/duplicity/backends/ssh_pexpect_backend.py

@@ -79,7 +79,7 @@ class SSHPExpectBackend(duplicity.backend.Backend):
         # make sure remote_dir is always valid
         if parsed_url.path:
             # remove leading '/'
-            self.remote_dir = parsed_url.path.lstrip("/")
+            self.remote_dir = re.sub(r"^/", r"", parsed_url.path, 1)
         else:
             self.remote_dir = "."
         self.remote_prefix = f"{self.remote_dir}/"

{duplicity-3.0.5 → duplicity-3.0.6.dev7}/duplicity/backends/swiftbackend.py

@@ -25,6 +25,8 @@ from duplicity import config
 from duplicity import log
 from duplicity.errors import BackendException
 
+global Connection, ClientException, SwiftService, SwiftUploadObject
+
 
 class SwiftBackend(duplicity.backend.Backend):
     """
@@ -34,6 +36,7 @@ class SwiftBackend(duplicity.backend.Backend):
     def __init__(self, parsed_url):
         duplicity.backend.Backend.__init__(self, parsed_url)
 
+        global Connection, ClientException, SwiftService, SwiftUploadObject
         try:
             from swiftclient.service import SwiftUploadObject
             from swiftclient.service import SwiftService

{duplicity-3.0.5 → duplicity-3.0.6.dev7}/duplicity/dup_main.py

@@ -376,7 +376,8 @@ def write_multivol(backup_type, tarblock_iter, man_outfp, sig_outfp, backend):
         transfer_success = False
         manifest_written = False
 
-    def collect_put_results(bytes_written: int, backend_pooler, command2vol_map: Dict[int, CommandMetaData]):
+    def collect_put_results(backend_pooler, command2vol_map: Dict[int, CommandMetaData]):
+        bytes_written = 0
         for result in backend_pooler.results_since_last_call():
             track_id = result.track_id
             size = result.result
@@ -392,6 +393,7 @@ def write_multivol(backup_type, tarblock_iter, man_outfp, sig_outfp, backend):
                 f"Transfer of {command2vol_map[track_id].path_obj.get_filename()} with id {track_id} and size "
                 f"{size} took {result.get_runtime()}"
             )
+        return bytes_written
 
     def write_manifest_in_sequence(mf, mf_file, command2vol_map: Dict[int, CommandMetaData]):
         """
@@ -499,7 +501,7 @@ def write_multivol(backup_type, tarblock_iter, man_outfp, sig_outfp, backend):
                 progress.report_transfer(0, tdp.getsize())
                 track_id = backend_pooler.command_throttled(backend.put_validated.__name__, args=(tdp, dest_filename))
                 command2vol_map[track_id] = CommandMetaData(vol_num, tdp, vi)
-                collect_put_results(bytes_written, backend_pooler, command2vol_map)
+                bytes_written += collect_put_results(backend_pooler, command2vol_map)
                 write_manifest_in_sequence(mf, man_outfp, command2vol_map)
             except (Exception, SystemExit) as e:
                 # ensure pool processes terminate clean
@@ -529,7 +531,7 @@ def write_multivol(backup_type, tarblock_iter, man_outfp, sig_outfp, backend):
             # wait for background commands, collect some stats and shutdown clean.
             log.Debug("Collecting remaining results from backend pool.")
             while True and backend_pooler:
-                collect_put_results(bytes_written, backend_pooler, command2vol_map)
+                bytes_written += collect_put_results(backend_pooler, command2vol_map)
                 write_manifest_in_sequence(mf, man_outfp, command2vol_map)
                 if backend_pooler.get_queue_length() == 0:
                     break

{duplicity-3.0.5 → duplicity-3.0.6.dev7/duplicity.egg-info}/PKG-INFO

@@ -1,10 +1,9 @@
 Metadata-Version: 2.4
 Name: duplicity
-Version: 3.0.5
+Version: 3.0.6.dev7
 Summary: Encrypted backup using rsync algorithm
 Author-email: Kenneth Loafman <kenneth@loafman.com>
 Maintainer: Edgar Soldin, Thomas Laubrock
-License: GPL-2.0-or-later
 Project-URL: Homepage, http://duplicity.us
 Project-URL: Download, https://gitlab.com/duplicity/duplicity/-/releases
 Project-URL: Issues, https://gitlab.com/duplicity/duplicity/-/issues
@@ -12,6 +11,7 @@ Project-URL: Contact, https://lists.nongnu.org/mailman/listinfo/duplicity-talk
 Project-URL: Documentation, http://duplicity.us
 Project-URL: Repository, https://gitlab.com/duplicity/duplicity
 Project-URL: Changelog, https://gitlab.com/duplicity/duplicity/-/blob/main/CHANGELOG.md
+Platform: any
 Classifier: Development Status :: 6 - Mature
 Classifier: Environment :: Console
 Classifier: Operating System :: MacOS
@@ -25,11 +25,13 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: System :: Archiving :: Backup
-Requires-Python: <3.14,>=3.8
+Requires-Python: <3.15,>=3.8
 Description-Content-Type: text/markdown
 License-File: COPYING
 License-File: AUTHORS.md
 Requires-Dist: fasteners>=0.19
+Requires-Dist: python-gettext>=5.0
+Requires-Dist: setuptools>=78.1.0
 Requires-Dist: azure-storage-blob
 Requires-Dist: b2sdk
 Requires-Dist: boto3
@@ -53,19 +55,6 @@ Requires-Dist: pyrax
 Requires-Dist: python-swiftclient
 Requires-Dist: requests
 Requires-Dist: requests-oauthlib
-Provides-Extra: dev
-Requires-Dist: setuptools>=68.1.0; extra == "dev"
-Requires-Dist: black==24.8.0; extra == "dev"
-Requires-Dist: coverage; extra == "dev"
-Requires-Dist: pycodestyle; extra == "dev"
-Requires-Dist: pylint; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: gitchangelog; extra == "dev"
-Requires-Dist: myst-parser; extra == "dev"
-Requires-Dist: pystache; extra == "dev"
-Requires-Dist: sphinx; extra == "dev"
-Requires-Dist: sphinx-rtd-theme; extra == "dev"
 Dynamic: license-file
 
 # REQUIREMENTS

{duplicity-3.0.5 → duplicity-3.0.6.dev7}/duplicity.egg-info/requires.txt

@@ -1,4 +1,6 @@
 fasteners>=0.19
+python-gettext>=5.0
+setuptools>=78.1.0
 azure-storage-blob
 b2sdk
 boto3
@@ -22,17 +24,3 @@ pyrax
 python-swiftclient
 requests
 requests-oauthlib
-
-[dev]
-setuptools>=68.1.0
-black==24.8.0
-coverage
-pycodestyle
-pylint
-pytest
-pytest-cov
-gitchangelog
-myst-parser
-pystache
-sphinx
-sphinx-rtd-theme

{duplicity-3.0.5 → duplicity-3.0.6.dev7}/man/duplicity.1

@@ -1,4 +1,4 @@
-.TH DUPLICITY 1 "June 19, 2025" "Version 3.0.5" "User Manuals" \"  -*- nroff -*-
+.TH DUPLICITY 1 "August 02, 2025" "Version 3.0.6.dev7" "User Manuals" \"  -*- nroff -*-
 .\" disable justification (adjust text to left margin only)
 .\" command line examples stay readable through that
 .ad l
@@ -22,7 +22,7 @@ source_url target_directory
 
 .B duplicity collection-status
 .I [options] [--file-changed <relpath>] [--show-changes-in-set <index>]
-[--jsonstat]] target_url
+[--jsonstat] target_url
 
 .B duplicity list-current-files
 .I [options] [--time time]

{duplicity-3.0.5 → duplicity-3.0.6.dev7}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "duplicity"
-version = "3.0.5"
-dynamic = ["dependencies", "optional-dependencies"]
+version = "3.0.6.dev7"
+dynamic = ["dependencies"]
 description = "Encrypted backup using rsync algorithm"
 authors = [
     { name = "Kenneth Loafman", email = "kenneth@loafman.com" },
@@ -11,9 +11,9 @@ maintainers = [
     { name = "Thomas Laubrock" },
 ]
 readme = { file = "README.md", content-type = "text/markdown" }
-requires-python = ">= 3.8, < 3.14"
-# TODO: switch to PEP 639 string after dropping 3.8 support
-license = { text = "GPL-2.0-or-later" }
+requires-python = ">= 3.8, < 3.15"
+# not all LP builders will take license=
+#license = "GPL-2.0-or-later"
 classifiers = [
     "Development Status :: 6 - Mature",
     "Environment :: Console",
@@ -32,7 +32,14 @@ classifiers = [
 
 
 [build-system]
-requires = ["setuptools>=68.1.0"]
+requires = [
+    "build>=1.1",
+    "pip>=24.0",
+    "pipx>=1.5",
+    "packaging>=20.0",
+    "setuptools>=78.1.0",
+    "wheel>=0.42.0",
+]
 build-backend = "setuptools.build_meta"
 
 
@@ -50,13 +57,37 @@ Repository = "https://gitlab.com/duplicity/duplicity"
 Changelog = "https://gitlab.com/duplicity/duplicity/-/blob/main/CHANGELOG.md"
 
 
+[tool.setuptools]
+platforms = [
+    "any"
+]
+
+
 [tool.setuptools.dynamic]
-dependencies = { file = "requirements.txt" }
-optional-dependencies.dev = { file = "requirements.dev" }
+dependencies = {file = ["requirements.txt"]}
 
 
 [tool.setuptools.packages.find]
-include = ["duplicity*"]
+where = [
+    ".",
+]
+include = [
+    "duplicity",
+    "duplicity.backends",
+    "duplicity.backends.pyrax_identity",
+]
+exclude = [
+    ".*",
+    "Makefile",
+    "crowdin.yml",
+    "debian*",
+    "docs*",
+    "readthedocs.yaml",
+    "snap*",
+    "testing*",
+    "tools*",
+    "venv*",
+]
 
 
 [tool.black]
@@ -97,17 +128,43 @@ testpaths = [
 
 
 [tool.cibuildwheel]
+
+[tool.cibuildwheel.config-settings]
+build-option = "--use-pep517"
+
+[tool.cibuildwheel.linux]
 archs = [
     "x86_64",
+    "aarch64",
 ]
 build = [
-    "cp{38,39,310,311,312,313}-manylinux_x86_64",
+    "cp{39,310,311,312,313}-manylinux_aarch64",
+    "cp{39,310,311,312,313}-manylinux_x86_64",
 ]
 before-build = [
     # WARNING: wheel builds are Centos based, not Debian.
-    "yum install -y gcc gcc-c++ make git intltool lftp librsync-devel",
-    "yum install -y libffi-devel openssl-devel openssl par2cmdline rdiff-backup tzdata",
-    "python -m pip install -r requirements.txt",
+    "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",
+    "python ./setup.py build_ext",
+]
+
+[tool.cibuildwheel.macos.environment]
+MACOSX_DEPLOYMENT_TARGET="15.0"
+
+[tool.cibuildwheel.macos]
+archs = [
+    "x86_64",
+    "arm64",
+]
+build = [
+    "cp{39,310,311,312,313}-macosx_arm64",
+    "cp{39,310,311,312,313}-macosx_x86_64",
+]
+before-build = [
+    "python -m pip install -q -r requirements.txt",
     "python ./setup.py build_ext",
 ]
 

{duplicity-3.0.5 → duplicity-3.0.6.dev7}/requirements.dev

@@ -1,6 +1,5 @@
-setuptools>=68.1.0
 
-##### testing libraries #####
+ ##### testing libraries #####
 
 black==24.8.0
 coverage

{duplicity-3.0.5 → duplicity-3.0.6.dev7}/requirements.txt

@@ -2,6 +2,8 @@
 ##### basic requirements #####
 
 fasteners>=0.19
+python-gettext>=5.0
+setuptools>=78.1.0
 
 ##### backend libraries #####
 

{duplicity-3.0.5 → duplicity-3.0.6.dev7}/setup.py

@@ -42,7 +42,7 @@ if not ((3, 8) <= sys.version_info[:2]):
     print("Sorry, duplicity requires version 3.8 thru 3.13 of Python.", file=sys.stderr)
     sys.exit(1)
 
-Version: str = "3.0.5"
+Version: str = "3.0.6.dev7"
 reldate: str = time.strftime("%B %d, %Y", time.gmtime(int(os.environ.get("SOURCE_DATE_EPOCH", time.time()))))
 
 # READTHEDOCS uses setup.py sdist but can't handle extensions
@@ -279,6 +279,15 @@ class SetVersionCommand(Command):
 
 
 setup(
+    packages=[
+        "duplicity",
+        "duplicity.backends",
+        "duplicity.backends.pyrax_identity",
+    ],
+    package_dir={
+        "duplicity": "duplicity",
+        "duplicity.backends": "duplicity/backends",
+    },
     ext_modules=ext_modules,
     data_files=get_data_files(),
     include_package_data=True,