From 48afc4c519a879a4dbd9c0b67a7e4a2d7c997b0e Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 29 Jan 2024 20:41:08 +0100 Subject: [PATCH] requirements are defined in pyproject.toml --- docs/installation.rst | 2 +- src/borg/archiver/__init__.py | 2 +- src/borg/helpers/msgpack.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index 150b7ddf..e31bfc0b 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -179,7 +179,7 @@ following dependencies first: - Either pyfuse3_ (preferably, newer) or llfuse_ (older). See also the BORG_FUSE_IMPL env variable. - - See setup.py about the version requirements. + - See pyproject.toml about the version requirements. If you have troubles finding the right package names, have a look at the distribution specific sections below or the Vagrantfile in the git repository, diff --git a/src/borg/archiver/__init__.py b/src/borg/archiver/__init__.py index 1b0213e7..8e360d31 100644 --- a/src/borg/archiver/__init__.py +++ b/src/borg/archiver/__init__.py @@ -501,7 +501,7 @@ class Archiver( self.prerun_checks(logger, is_serve) if not is_supported_msgpack(): logger.error("You do not have a supported version of the msgpack python package installed. Terminating.") - logger.error("This should never happen as specific, supported versions are required by our setup.py.") + logger.error("This should never happen as specific, supported versions are required by our pyproject.toml.") logger.error("Do not contact borgbackup support about this.") return set_ec(EXIT_ERROR) if is_slow_msgpack(): diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py index a2c1691f..4601f089 100644 --- a/src/borg/helpers/msgpack.py +++ b/src/borg/helpers/msgpack.py @@ -204,7 +204,7 @@ def is_slow_msgpack(): def is_supported_msgpack(): - # DO NOT CHANGE OR REMOVE! See also requirements and comments in setup.cfg. + # DO NOT CHANGE OR REMOVE! See also requirements and comments in pyproject.toml. import msgpack if msgpack.version in []: # < add bad releases here to deny list