From 0912e1b3e12182662c4fcab9027abacfad0189b6 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 10 Mar 2024 16:26:06 +0100 Subject: [PATCH 1/4] vagrant: add libxxhash-dev for debianoid systems --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index b022d9645..767af8746 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -15,7 +15,7 @@ def packages_debianoid(user) apt-get -y -qq update apt-get -y -qq dist-upgrade # for building borgbackup and dependencies: - apt install -y libssl-dev libacl1-dev liblz4-dev libzstd-dev pkg-config + apt install -y libssl-dev libacl1-dev liblz4-dev libzstd-dev libxxhash-dev pkg-config apt install -y libfuse-dev fuse || true apt install -y libfuse3-dev fuse3 || true apt install -y locales || true From 41520c2937294a4d0b10f82467d43688444e2b62 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 10 Mar 2024 18:37:23 +0100 Subject: [PATCH 2/4] vagrant: add xxhash for macOS --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 767af8746..518cf722d 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -113,7 +113,7 @@ def packages_darwin sudo softwareupdate --install --all which brew || CI=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" brew update > /dev/null - brew install pkg-config readline openssl@3.0 zstd lz4 xz + brew install pkg-config readline openssl@3.0 zstd lz4 xz xxhash brew install --cask macfuse # brew upgrade # upgrade everything (takes rather long) echo 'export LDFLAGS=-L/usr/local/opt/openssl@3.0/lib' >> ~vagrant/.bash_profile From 86aeb1c2530f43b888e937e2d00ed9c2100140f5 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 10 Mar 2024 16:43:21 +0100 Subject: [PATCH 3/4] vagrant: use pyinstaller 6.5.0 --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 518cf722d..629396bd1 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -204,7 +204,7 @@ def install_pyinstaller() . ~/.bash_profile cd /vagrant/borg . borg-env/bin/activate - pip install 'pyinstaller==6.3.0' + pip install 'pyinstaller==6.5.0' EOF end From ac1b28241d0fca2c8d3847acd3c3c1b05c39e742 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 10 Mar 2024 16:44:47 +0100 Subject: [PATCH 4/4] vagrant: use python 3.11.8 --- Vagrantfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 629396bd1..cd0f44375 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -160,7 +160,7 @@ def install_pythons(boxname) return <<-EOF . ~/.bash_profile pyenv install 3.12.0 # tests - pyenv install 3.11.7 # tests, binary build + pyenv install 3.11.8 # tests, binary build pyenv install 3.10.2 # tests pyenv install 3.9.4 # tests pyenv rehash @@ -180,8 +180,8 @@ def build_pyenv_venv(boxname) . ~/.bash_profile cd /vagrant/borg # use the latest 3.11 release - pyenv global 3.11.7 - pyenv virtualenv 3.11.7 borg-env + pyenv global 3.11.8 + pyenv virtualenv 3.11.8 borg-env ln -s ~/.pyenv/versions/borg-env . EOF end @@ -227,8 +227,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.4 3.10.2 3.11.7 3.12.0 - pyenv local 3.9.4 3.10.2 3.11.7 3.12.0 + pyenv global 3.9.4 3.10.2 3.11.8 3.12.0 + pyenv local 3.9.4 3.10.2 3.11.8 3.12.0 fi # otherwise: just use the system python # avoid that git complains about dubious ownership if we use fakeroot: