From 863bd8a4f4cdd1bddc48c1b38ea79062c9d1da80 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Tue, 16 May 2023 23:28:36 +0200 Subject: [PATCH 1/3] vagrant: upgrade pythons e.g. on freebsd13, <3.9.10 has sysconfigdata issues --- Vagrantfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 8eb50b144..6947b7b3f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -242,8 +242,8 @@ def install_pythons(boxname) . ~/.bash_profile echo "PYTHON_CONFIGURE_OPTS: ${PYTHON_CONFIGURE_OPTS}" pyenv install 3.11.2 # tests, binary build - pyenv install 3.10.1 # tests - pyenv install 3.9.1 # tests + pyenv install 3.10.2 # tests + pyenv install 3.9.10 # tests pyenv rehash EOF end @@ -309,8 +309,8 @@ def run_tests(boxname, skip_env) . ../borg-env/bin/activate if which pyenv 2> /dev/null; then # for testing, use the earliest point releases of the supported python versions: - pyenv global 3.9.1 3.10.1 3.11.2 - pyenv local 3.9.1 3.10.1 3.11.2 + pyenv global 3.9.10 3.10.2 3.11.2 + pyenv local 3.9.10 3.10.2 3.11.2 fi # otherwise: just use the system python # some OSes can only run specific test envs, e.g. because they miss FUSE support: From 0744b7a241bf14a0ce02064844ff1d6b17b2cfc0 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 17 May 2023 00:19:42 +0200 Subject: [PATCH 2/3] fix test_extract_continue for hfs timestamp granularity --- src/borg/testsuite/archiver/extract_cmd.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/borg/testsuite/archiver/extract_cmd.py b/src/borg/testsuite/archiver/extract_cmd.py index e6bcaf2f8..b6ebe9610 100644 --- a/src/borg/testsuite/archiver/extract_cmd.py +++ b/src/borg/testsuite/archiver/extract_cmd.py @@ -1,6 +1,7 @@ import errno import os import shutil +import time import unittest from unittest.mock import patch @@ -643,6 +644,7 @@ class ArchiverTestCase(ArchiverTestCaseBase): # make a hardlink, so it does not free the inode when unlinking input/file3 os.link("input/file3", "hardlink-to-keep-inode-f3") os.remove("input/file3") + time.sleep(1) # needed due to timestamp granularity of apple hfs+ with changedir("output"): # now try to continue extracting, using the same archive, same output dir: self.cmd(f"--repo={self.repository_location}", "extract", "arch", "--continue") From 7bb644e9972731ab7bde2fa48131089e2131eaed Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 17 May 2023 01:01:05 +0200 Subject: [PATCH 3/3] tox: package = editable-legacy, fixes #7580 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 504963d4a..c32fd5711 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ requires = wheel setuptools_scm [testenv] -package = editable # without this it does not find setup_docs when running under fakeroot +package = editable-legacy # without this it does not find setup_docs when running under fakeroot setenv = fuse2: BORG_FUSE_IMPL=llfuse fuse3: BORG_FUSE_IMPL=pyfuse3