mirror of
https://github.com/borgbackup/borg.git
synced 2025-01-31 11:42:05 +00:00
vagrant: use pythons working on freebsd
pyenv could not install py38, thus using the fbsd system py38. removed py38 from pyenv completely.
This commit is contained in:
parent
96dff54655
commit
cfd6f035ff
1 changed files with 5 additions and 6 deletions
11
Vagrantfile
vendored
11
Vagrantfile
vendored
|
@ -42,9 +42,9 @@ def packages_freebsd
|
||||||
pkg install -y fusefs-libs3 || true
|
pkg install -y fusefs-libs3 || true
|
||||||
pkg install -y git bash # fakeroot causes lots of troubles on freebsd
|
pkg install -y git bash # fakeroot causes lots of troubles on freebsd
|
||||||
# for building python (for the tests we use pyenv built pythons):
|
# for building python (for the tests we use pyenv built pythons):
|
||||||
pkg install -y python39 py39-sqlite3
|
pkg install -y python38 py38-sqlite3
|
||||||
# make sure there is a python3 command
|
# make sure there is a python3 command
|
||||||
ln -sf /usr/local/bin/python3.9 /usr/local/bin/python3
|
ln -sf /usr/local/bin/python3.8 /usr/local/bin/python3
|
||||||
python3 -m ensurepip
|
python3 -m ensurepip
|
||||||
pip3 install virtualenv
|
pip3 install virtualenv
|
||||||
# make bash default / work:
|
# make bash default / work:
|
||||||
|
@ -160,9 +160,8 @@ def install_pythons(boxname)
|
||||||
return <<-EOF
|
return <<-EOF
|
||||||
. ~/.bash_profile
|
. ~/.bash_profile
|
||||||
pyenv install 3.11.1 # tests, version supporting openssl 1.1
|
pyenv install 3.11.1 # tests, version supporting openssl 1.1
|
||||||
pyenv install 3.10.1 # tests, version supporting openssl 1.1
|
pyenv install 3.10.2 # tests, version supporting openssl 1.1
|
||||||
pyenv install 3.9.16 # tests, version supporting openssl 1.1, binary build
|
pyenv install 3.9.16 # tests, version supporting openssl 1.1, binary build
|
||||||
pyenv install 3.8.0 # tests, version supporting openssl 1.1
|
|
||||||
pyenv rehash
|
pyenv rehash
|
||||||
EOF
|
EOF
|
||||||
end
|
end
|
||||||
|
@ -228,8 +227,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.8.0 3.9.16 3.10.1 3.11.1
|
pyenv global 3.9.16 3.10.2 3.11.1
|
||||||
pyenv local 3.8.0 3.9.16 3.10.1 3.11.1
|
pyenv local 3.9.16 3.10.2 3.11.1
|
||||||
fi
|
fi
|
||||||
# otherwise: just use the system python
|
# otherwise: just use the system python
|
||||||
# avoid that git complains about dubious ownership if we use fakeroot:
|
# avoid that git complains about dubious ownership if we use fakeroot:
|
||||||
|
|
Loading…
Reference in a new issue