From 3d856a1c1e765d4cc7c10f8bb167d711566051cf Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 25 Dec 2023 16:24:56 +0100 Subject: [PATCH 1/4] vagrant: remove debian 9 "stretch" box there are multiple issues with that box: - debian 9 is out of support by debian, out of even lts support since 2022 - it has a OpenSSL 1.x that is also out of support and noone will care for it. - has python 3.5 We'll try to keep this box alive for borg 1.2.x, but for borg 1.4 it is "game over". --- Vagrantfile | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 2a56aa8b5e..c0a1c9198d 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -342,22 +342,6 @@ Vagrant.configure(2) do |config| b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("buster64", ".*none.*") end - config.vm.define "stretch64" do |b| - b.vm.box = "generic/debian9" - b.vm.provider :virtualbox do |v| - v.memory = 1024 + $wmem - end - b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") - b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant") - b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("stretch64") - b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("stretch64") - b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("stretch64") - b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse") - b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller() - b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("stretch64") - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("stretch64", ".*(fuse3|none).*") - end - config.vm.define "freebsd64" do |b| b.vm.box = "generic/freebsd14" b.vm.provider :virtualbox do |v| From 8088125f5c9a46a56969f99d2692d5c92a9f37bc Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 25 Dec 2023 16:32:41 +0100 Subject: [PATCH 2/4] vagrant: remove ubuntu 20.04 "focal" box there are multiple issues with that box: - it has a OpenSSL 1.x that is out of upstream support. - has python 3.8 also: - conservative users who did not upgrade yet to 22.04 will likely not jump onto borg 1.4 soon, but rather use borg 1.2.x. We'll try to keep this box alive for borg 1.2.x, but for borg 1.4 it is "game over". --- Vagrantfile | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index c0a1c9198d..a779bbfa52 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -270,18 +270,6 @@ Vagrant.configure(2) do |config| v.cpus = $cpus end - config.vm.define "focal64" do |b| - b.vm.box = "ubuntu/focal64" - b.vm.provider :virtualbox do |v| - v.memory = 1024 + $wmem - end - b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") - b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant") - b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("focal64") - b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse") - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("focal64", ".*none.*") - end - config.vm.define "jammy64" do |b| b.vm.box = "ubuntu/jammy64" b.vm.provider :virtualbox do |v| From 0c89f2c07b9caeb089d77d4fe0bff205c7bc6e38 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 25 Dec 2023 19:20:24 +0100 Subject: [PATCH 3/4] vagrant: use python 3.9.4 3.9.3 was withdrawn by python.org and pyenv devs. --- Vagrantfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index a779bbfa52..b08783f96e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -161,7 +161,7 @@ def install_pythons(boxname) pyenv install 3.12.0 # tests pyenv install 3.11.7 # tests, binary build pyenv install 3.10.2 # tests - pyenv install 3.9.3 # tests + pyenv install 3.9.4 # tests pyenv rehash EOF end @@ -226,8 +226,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.9.3 3.10.2 3.11.7 3.12.0 - pyenv local 3.9.3 3.10.2 3.11.7 3.12.0 + pyenv global 3.9.4 3.10.2 3.11.7 3.12.0 + pyenv local 3.9.4 3.10.2 3.11.7 3.12.0 fi # otherwise: just use the system python # avoid that git complains about dubious ownership if we use fakeroot: From b3d0b0abf6c2d29025114c36d3dc55c5c68ed34a Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 25 Dec 2023 20:02:08 +0100 Subject: [PATCH 4/4] vagrant: netbsd: test on py311 only the netbsd vagrant machine tends to segfault, guess due to some kernel or virtualbox issue. thus, rather only do 1 tox run, so there is less output to review. --- Vagrantfile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index b08783f96e..a3e8307b2a 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -93,15 +93,13 @@ 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 - pkg_add python39 py39-sqlite3 py39-pip py39-virtualenv py39-expat - pkg_add py310-sqlite3 py310-pip py310-virtualenv py310-expat - ln -s /usr/pkg/bin/python3.9 /usr/pkg/bin/python - ln -s /usr/pkg/bin/python3.9 /usr/pkg/bin/python3 - ln -s /usr/pkg/bin/pip3.9 /usr/pkg/bin/pip - ln -s /usr/pkg/bin/pip3.9 /usr/pkg/bin/pip3 - ln -s /usr/pkg/bin/virtualenv-3.9 /usr/pkg/bin/virtualenv - ln -s /usr/pkg/bin/virtualenv-3.9 /usr/pkg/bin/virtualenv3 + pkg_add py311-sqlite3 py311-pip py311-virtualenv py311-expat + ln -s /usr/pkg/bin/python3.11 /usr/pkg/bin/python + ln -s /usr/pkg/bin/python3.11 /usr/pkg/bin/python3 + ln -s /usr/pkg/bin/pip3.11 /usr/pkg/bin/pip + ln -s /usr/pkg/bin/pip3.11 /usr/pkg/bin/pip3 + ln -s /usr/pkg/bin/virtualenv-3.11 /usr/pkg/bin/virtualenv + ln -s /usr/pkg/bin/virtualenv-3.11 /usr/pkg/bin/virtualenv3 EOF end