|
@@ -42,9 +42,11 @@ def packages_freebsd
|
|
|
pkg install -y fusefs-libs3 || true
|
|
|
pkg install -y git bash # fakeroot causes lots of troubles on freebsd
|
|
|
# for building python (for the tests we use pyenv built pythons):
|
|
|
- pkg install -y python38 py38-sqlite3 py38-virtualenv py38-pip
|
|
|
+ pkg install -y python39 py39-sqlite3
|
|
|
# make sure there is a python3 command
|
|
|
- ln -sf /usr/local/bin/python3.8 /usr/local/bin/python3
|
|
|
+ ln -sf /usr/local/bin/python3.9 /usr/local/bin/python3
|
|
|
+ python3 -m ensurepip
|
|
|
+ pip3 install virtualenv
|
|
|
# make bash default / work:
|
|
|
chsh -s bash vagrant
|
|
|
mount -t fdescfs fdesc /dev/fd
|
|
@@ -91,8 +93,6 @@ def packages_netbsd
|
|
|
pkg_add pkg-config
|
|
|
# pkg_add fuse # llfuse supports netbsd, but is still buggy.
|
|
|
# https://bitbucket.org/nikratio/python-llfuse/issues/70/perfuse_open-setsockopt-no-buffer-space
|
|
|
- pkg_add python38 py38-sqlite3 py38-pip py38-virtualenv py38-expat
|
|
|
- ln -s /usr/pkg/lib/python3.8/_sysconfigdata_netbsd9.py /usr/pkg/lib/python3.8/_sysconfigdata__netbsd9_.py # bug in netbsd 9.2, expected filename not there.
|
|
|
pkg_add python39 py39-sqlite3 py39-pip py39-virtualenv py39-expat
|
|
|
ln -s /usr/pkg/bin/python3.9 /usr/pkg/bin/python
|
|
|
ln -s /usr/pkg/bin/python3.9 /usr/pkg/bin/python3
|
|
@@ -159,7 +159,6 @@ def install_pythons(boxname)
|
|
|
. ~/.bash_profile
|
|
|
pyenv install 3.10.0 # tests, version supporting openssl 1.1
|
|
|
pyenv install 3.9.10 # tests, version supporting openssl 1.1, binary build
|
|
|
- pyenv install 3.8.0 # tests, version supporting openssl 1.1
|
|
|
pyenv rehash
|
|
|
EOF
|
|
|
end
|
|
@@ -228,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.8.0 3.9.10 3.10.0
|
|
|
- pyenv local 3.8.0 3.9.10 3.10.0
|
|
|
+ pyenv global 3.9.10 3.10.0
|
|
|
+ pyenv local 3.9.10 3.10.0
|
|
|
fi
|
|
|
# otherwise: just use the system python
|
|
|
# some OSes can only run specific test envs, e.g. because they miss FUSE support:
|
|
@@ -423,6 +422,6 @@ Vagrant.configure(2) do |config|
|
|
|
b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("openindiana64", ".*fuse.*")
|
|
|
end
|
|
|
|
|
|
- # TODO: create more VMs with python 3.8+ and openssl 1.1 or 3.0.
|
|
|
+ # TODO: create more VMs with python 3.9+ and openssl 1.1 or 3.0.
|
|
|
# See branch 1.1-maint for a better equipped Vagrantfile (but still on py35 and openssl 1.0).
|
|
|
end
|