mirror of https://github.com/borgbackup/borg.git
Merge pull request #7104 from ThomasWaldmann/py311-master
vagrant / github CI: use python 3.11.0 / 3.10.8
This commit is contained in:
commit
1d387522e4
|
@ -61,7 +61,7 @@ jobs:
|
||||||
python-version: '3.10'
|
python-version: '3.10'
|
||||||
toxenv: py310-fuse3
|
toxenv: py310-fuse3
|
||||||
- os: ubuntu-20.04
|
- os: ubuntu-20.04
|
||||||
python-version: '3.11-dev'
|
python-version: '3.11'
|
||||||
toxenv: py311-fuse3
|
toxenv: py311-fuse3
|
||||||
- os: macos-12
|
- os: macos-12
|
||||||
python-version: '3.9'
|
python-version: '3.9'
|
||||||
|
|
|
@ -160,8 +160,8 @@ end
|
||||||
def install_pythons(boxname)
|
def install_pythons(boxname)
|
||||||
return <<-EOF
|
return <<-EOF
|
||||||
. ~/.bash_profile
|
. ~/.bash_profile
|
||||||
pyenv install 3.11.0rc2 # tests
|
pyenv install 3.11.0 # tests
|
||||||
pyenv install 3.10.7 # tests, binary build
|
pyenv install 3.10.8 # tests, binary build
|
||||||
pyenv install 3.9.1 # tests
|
pyenv install 3.9.1 # tests
|
||||||
pyenv rehash
|
pyenv rehash
|
||||||
EOF
|
EOF
|
||||||
|
@ -180,8 +180,8 @@ def build_pyenv_venv(boxname)
|
||||||
. ~/.bash_profile
|
. ~/.bash_profile
|
||||||
cd /vagrant/borg
|
cd /vagrant/borg
|
||||||
# use the latest 3.10 release
|
# use the latest 3.10 release
|
||||||
pyenv global 3.10.7
|
pyenv global 3.10.8
|
||||||
pyenv virtualenv 3.10.7 borg-env
|
pyenv virtualenv 3.10.8 borg-env
|
||||||
ln -s ~/.pyenv/versions/borg-env .
|
ln -s ~/.pyenv/versions/borg-env .
|
||||||
EOF
|
EOF
|
||||||
end
|
end
|
||||||
|
@ -228,8 +228,8 @@ def run_tests(boxname, skip_env)
|
||||||
. ../borg-env/bin/activate
|
. ../borg-env/bin/activate
|
||||||
if which pyenv 2> /dev/null; then
|
if which pyenv 2> /dev/null; then
|
||||||
# for testing, use the earliest point releases of the supported python versions:
|
# for testing, use the earliest point releases of the supported python versions:
|
||||||
pyenv global 3.9.1 3.10.7 3.11.0rc2
|
pyenv global 3.9.1 3.10.8 3.11.0
|
||||||
pyenv local 3.9.1 3.10.7 3.11.0rc2
|
pyenv local 3.9.1 3.10.8 3.11.0
|
||||||
fi
|
fi
|
||||||
# otherwise: just use the system python
|
# otherwise: just use the system python
|
||||||
# some OSes can only run specific test envs, e.g. because they miss FUSE support:
|
# some OSes can only run specific test envs, e.g. because they miss FUSE support:
|
||||||
|
|
Loading…
Reference in New Issue