From c3a63bd2b27539137bf4da5b4ad489969b4747cc Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 30 Sep 2024 17:33:06 +0200 Subject: [PATCH 1/3] use python 3.12.6 for binary builds --- Vagrantfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 6c62dc6e7b..fba102cf23 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -165,8 +165,8 @@ def install_pythons(boxname) return <<-EOF . ~/.bash_profile echo "PYTHON_CONFIGURE_OPTS: ${PYTHON_CONFIGURE_OPTS}" - pyenv install 3.12.0 # tests - pyenv install 3.11.9 # tests, binary build + pyenv install 3.12.6 # tests, binary build + pyenv install 3.11.2 # tests pyenv install 3.10.2 # tests pyenv install 3.9.4 # tests pyenv rehash @@ -185,9 +185,9 @@ def build_pyenv_venv(boxname) return <<-EOF . ~/.bash_profile cd /vagrant/borg - # use the latest 3.11 release - pyenv global 3.11.9 - pyenv virtualenv 3.11.9 borg-env + # use the latest 3.12 release + pyenv global 3.12.6 + pyenv virtualenv 3.12.6 borg-env ln -s ~/.pyenv/versions/borg-env . EOF end @@ -233,8 +233,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.4 3.10.2 3.11.9 3.12.0 - pyenv local 3.9.4 3.10.2 3.11.9 3.12.0 + pyenv global 3.9.4 3.10.2 3.11.2 3.12.6 + pyenv local 3.9.4 3.10.2 3.11.2 3.12.6 fi # otherwise: just use the system python # some OSes can only run specific test envs, e.g. because they miss FUSE support: From 7a0540db7bb567d1a1a84826e6b9ac1db4d16703 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 30 Sep 2024 17:37:49 +0200 Subject: [PATCH 2/3] vagrant: install rust on *BSD --- Vagrantfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index fba102cf23..8bda0da3bc 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -41,6 +41,7 @@ def packages_freebsd pkg install -y xxhash liblz4 zstd pkgconf pkg install -y fusefs-libs || true pkg install -y fusefs-libs3 || true + pkg install -y rust 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 python310 py310-sqlite3 @@ -77,6 +78,7 @@ def packages_openbsd pkg_add lz4 pkg_add zstd pkg_add git # no fakeroot + pkg_add rust pkg_add openssl%3.0 pkg_add py3-pip pkg_add py3-virtualenv @@ -89,6 +91,7 @@ def packages_netbsd pkgin update pkgin -y upgrade pkg_add zstd lz4 xxhash git + pkg_add rust pkg_add bash chsh -s bash vagrant echo "export PROMPT_COMMAND=" >> ~vagrant/.bash_profile # bug in netbsd 9.3, .bash_profile broken for screen From 358ceab64d15c1a1e194440a0bb2e58f16b94e54 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 30 Sep 2024 20:09:48 +0200 Subject: [PATCH 3/3] pin pip to 24.1 until #8415 is fixed --- requirements.d/development.lock.txt | 2 +- requirements.d/development.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.d/development.lock.txt b/requirements.d/development.lock.txt index b2089c1884..d8c0fc93b6 100644 --- a/requirements.d/development.lock.txt +++ b/requirements.d/development.lock.txt @@ -1,6 +1,6 @@ setuptools==75.1.0 setuptools-scm==8.1.0 -pip==24.2 +pip==24.1 wheel==0.44.0 virtualenv==20.26.5 build==1.2.2 diff --git a/requirements.d/development.txt b/requirements.d/development.txt index 09878cee72..74899f3c84 100644 --- a/requirements.d/development.txt +++ b/requirements.d/development.txt @@ -1,6 +1,6 @@ setuptools >=45, !=60.6.0, !=60.7.0 setuptools_scm -pip +pip ==24.1 wheel virtualenv build