Browse Source

vagrant: fix run_tests for py310

Thomas Waldmann 3 years ago
parent
commit
6c0a09d12c
1 changed files with 6 additions and 5 deletions
  1. 6 5
      Vagrantfile

+ 6 - 5
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