Merge pull request #8975 from ThomasWaldmann/updates-1.2

Updates 1.2-maint
This commit is contained in:
TW 2025-08-04 15:50:41 +02:00 committed by GitHub
commit a295a78d1c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

10
Vagrantfile vendored
View file

@ -161,7 +161,7 @@ def install_pythons(boxname)
pyenv install 3.12.0 # tests, version supporting openssl 1.1
pyenv install 3.11.1 # tests, version supporting openssl 1.1
pyenv install 3.10.2 # tests, version supporting openssl 1.1
pyenv install 3.9.22 # tests, version supporting openssl 1.1, binary build
pyenv install 3.9.23 # tests, version supporting openssl 1.1, binary build
pyenv rehash
EOF
end
@ -179,8 +179,8 @@ def build_pyenv_venv(boxname)
. ~/.bash_profile
cd /vagrant/borg
# use the latest 3.9 release
pyenv global 3.9.22
pyenv virtualenv 3.9.22 borg-env
pyenv global 3.9.23
pyenv virtualenv 3.9.23 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.22 3.10.2 3.11.1 3.12.0
pyenv local 3.9.22 3.10.2 3.11.1 3.12.0
pyenv global 3.9.23 3.10.2 3.11.1 3.12.0
pyenv local 3.9.23 3.10.2 3.11.1 3.12.0
fi
# otherwise: just use the system python
# avoid that git complains about dubious ownership if we use fakeroot: