Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Vagrant updates #8437

Merged
merged 3 commits into from
Sep 30, 2024
Merged

Vagrant updates #8437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3a63bd
use python 3.12.6 for binary builds
ThomasWaldmann Sep 30, 2024
7a0540d
vagrant: install rust on *BSD
ThomasWaldmann Sep 30, 2024
358ceab
pin pip to 24.1 until #8415 is fixed
ThomasWaldmann Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -165,8 +168,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
Expand All @@ -185,9 +188,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
Expand Down Expand Up @@ -233,8 +236,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:
Expand Down
2 changes: 1 addition & 1 deletion requirements.d/development.lock.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.d/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
setuptools >=45, !=60.6.0, !=60.7.0
setuptools_scm
pip
pip ==24.1
wheel
virtualenv
build
Expand Down
Loading