From c41d1b1fe225cab82b125fd0a9575bab2a74552a Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 1 Nov 2025 20:32:59 +0100 Subject: [PATCH] drop python 3.9, more work was needed --- Vagrantfile | 6 ++++-- src/borg/archiver/diff_cmd.py | 2 +- src/borg/archiver/help_cmd.py | 4 ++-- src/borg/archiver/list_cmd.py | 2 +- src/borg/archiver/repo_list_cmd.py | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 66f1c5737..ae8564936 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -131,9 +131,11 @@ def packages_openindiana return <<-EOF pkg install gcc-13 git pkg install pkg-config libxxhash - ln -sf /usr/bin/python3.9 /usr/bin/python3 + pkg install python-313 + ln -sf /usr/bin/python3.13 /usr/bin/python3 + ln -sf /usr/bin/python3.13-config /usr/bin/python3-config python3 -m ensurepip - ln -sf /usr/bin/pip3.9 /usr/bin/pip3 + ln -sf /usr/bin/pip3.13 /usr/bin/pip3 pip3 install virtualenv # let borg's pkg-config find openssl: pfexec pkg set-mediator -V 3 openssl diff --git a/src/borg/archiver/diff_cmd.py b/src/borg/archiver/diff_cmd.py index eb0a10d28..5e1dd0999 100644 --- a/src/borg/archiver/diff_cmd.py +++ b/src/borg/archiver/diff_cmd.py @@ -120,7 +120,7 @@ class DiffMixIn: +++++++++++++++++++++++++++ The ``--format`` option uses Python's `format string syntax - `_. + `_. Examples: :: diff --git a/src/borg/archiver/help_cmd.py b/src/borg/archiver/help_cmd.py index 2114c1916..b07089433 100644 --- a/src/borg/archiver/help_cmd.py +++ b/src/borg/archiver/help_cmd.py @@ -350,11 +350,11 @@ class HelpMixIn: {now} The current local date and time, by default in ISO-8601 format. - You can also supply your own `format string `_, e.g. {now:%Y-%m-%d_%H:%M:%S} + You can also supply your own `format string `_, e.g. {now:%Y-%m-%d_%H:%M:%S} {utcnow} The current UTC date and time, by default in ISO-8601 format. - You can also supply your own `format string `_, e.g. {utcnow:%Y-%m-%d_%H:%M:%S} + You can also supply your own `format string `_, e.g. {utcnow:%Y-%m-%d_%H:%M:%S} {user} The user name (or UID, if no name is available) of the user running borg. diff --git a/src/borg/archiver/list_cmd.py b/src/borg/archiver/list_cmd.py index 0d1c800ea..e3c13679f 100644 --- a/src/borg/archiver/list_cmd.py +++ b/src/borg/archiver/list_cmd.py @@ -72,7 +72,7 @@ class ListMixIn: +++++++++++++++++++++++++++ The ``--format`` option uses Python's `format string syntax - `_. + `_. Examples: :: diff --git a/src/borg/archiver/repo_list_cmd.py b/src/borg/archiver/repo_list_cmd.py index c6c8480ee..28dced107 100644 --- a/src/borg/archiver/repo_list_cmd.py +++ b/src/borg/archiver/repo_list_cmd.py @@ -53,7 +53,7 @@ class RepoListMixIn: +++++++++++++++++++++++++++ The ``--format`` option uses Python's `format string syntax - `_. + `_. Examples: ::