diff --git a/Vagrantfile b/Vagrantfile index fef045e2c..4aca93150 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -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 @@ -157,7 +159,8 @@ end def install_pythons(boxname) return <<-EOF . ~/.bash_profile - pyenv install 3.10.0 # 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.9.16 # tests, version supporting openssl 1.1, binary build pyenv install 3.8.0 # tests, version supporting openssl 1.1 pyenv rehash @@ -225,8 +228,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.16 3.10.0 - pyenv local 3.8.0 3.9.16 3.10.0 + pyenv global 3.8.0 3.9.16 3.10.1 3.11.1 + pyenv local 3.8.0 3.9.16 3.10.1 3.11.1 fi # otherwise: just use the system python # avoid that git complains about dubious ownership if we use fakeroot: @@ -342,7 +345,7 @@ Vagrant.configure(2) do |config| end config.vm.define "freebsd64" do |b| - b.vm.box = "freebsd121-64" + b.vm.box = "generic/freebsd13" b.vm.provider :virtualbox do |v| v.memory = 1024 + $wmem end