From 055fb76bd834596621f5226d5d2533803c266a15 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Tue, 29 Aug 2023 19:44:30 +0200 Subject: [PATCH 1/2] vagrant / binary build: use python 3.9.18 --- Vagrantfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 45a835382..8ce86b382 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -161,7 +161,7 @@ def install_pythons(boxname) . ~/.bash_profile pyenv install 3.11.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.18 # tests, version supporting openssl 1.1, binary build pyenv rehash EOF end @@ -179,8 +179,8 @@ def build_pyenv_venv(boxname) . ~/.bash_profile cd /vagrant/borg # use the latest 3.9 release - pyenv global 3.9.16 - pyenv virtualenv 3.9.16 borg-env + pyenv global 3.9.18 + pyenv virtualenv 3.9.18 borg-env ln -s ~/.pyenv/versions/borg-env . EOF end @@ -227,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.9.16 3.10.2 3.11.1 - pyenv local 3.9.16 3.10.2 3.11.1 + pyenv global 3.9.18 3.10.2 3.11.1 + pyenv local 3.9.18 3.10.2 3.11.1 fi # otherwise: just use the system python # avoid that git complains about dubious ownership if we use fakeroot: From de51c670854456c6e04c127a18a808050d43556c Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Tue, 29 Aug 2023 19:45:24 +0200 Subject: [PATCH 2/2] vagrant: fix netbsd pkgsrc 9.0_current stopped working, let's use 9.3. --- Vagrantfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 8ce86b382..5defc4f4c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -82,8 +82,7 @@ end def packages_netbsd return <<-EOF - # use the latest stuff, some packages in "9.2" are quite broken - echo 'http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$arch/9.0_current/All' > /usr/pkg/etc/pkgin/repositories.conf + echo 'http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$arch/9.3/All' > /usr/pkg/etc/pkgin/repositories.conf pkgin update pkgin -y upgrade pkg_add zstd lz4 xxhash git