From 6c0a09d12c763c5ba425c8f87cc00f1a818fe2f4 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 12 Jul 2021 16:49:47 +0200 Subject: [PATCH] vagrant: fix run_tests for py310 --- Vagrantfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index e1888ab9b..07071402f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -299,17 +299,18 @@ def run_tests(boxname) cd /vagrant/borg/borg . ../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.5.3 3.6.2 3.7.11 3.8.0 3.9.0 3.10-dev - pyenv local 3.5.3 3.6.2 3.7.11 3.8.0 3.9.0 3.10-dev + # for testing, use the earliest point releases of the supported python versions. + # on some dists, 3.10-dev does not compile, so if pyenv fails due to this, try without 3.10. + pyenv global 3.5.3 3.6.2 3.7.11 3.8.0 3.9.0 3.10-dev || pyenv global 3.5.3 3.6.2 3.7.11 3.8.0 3.9.0 + pyenv local 3.5.3 3.6.2 3.7.11 3.8.0 3.9.0 3.10-dev || pyenv local 3.5.3 3.6.2 3.7.11 3.8.0 3.9.0 fi # otherwise: just use the system python if which fakeroot 2> /dev/null; then echo "Running tox WITH fakeroot -u" - fakeroot -u tox --skip-missing-interpreters -e py35,py36,py37,py38,py39 + fakeroot -u tox --skip-missing-interpreters -e py35,py36,py37,py38,py39,py310 else echo "Running tox WITHOUT fakeroot -u" - tox --skip-missing-interpreters -e py35,py36,py37,py38,py39 + tox --skip-missing-interpreters -e py35,py36,py37,py38,py39,py310 fi EOF end