diff --git a/Vagrantfile b/Vagrantfile index 88d99793d..9e4370e94 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -71,7 +71,15 @@ end def packages_openbsd return <<-EOF + hostname "openbsd77.localdomain" + echo "$(hostname)" > /etc/myname + echo "127.0.0.1 localhost" > /etc/hosts + echo "::1 localhost" >> /etc/hosts + echo "127.0.0.1 $(hostname) $(hostname -s)" >> /etc/hosts echo "https://ftp.eu.openbsd.org/pub/OpenBSD" > /etc/installurl + ftp https://cdn.openbsd.org/pub/OpenBSD/$(uname -r)/$(uname -m)/comp$(uname -r | tr -d .).tgz + tar -C / -xzphf comp$(uname -r | tr -d .).tgz + rm comp$(uname -r | tr -d .).tgz pkg_add bash chsh -s bash vagrant pkg_add xxhash @@ -79,7 +87,7 @@ def packages_openbsd pkg_add zstd pkg_add git # no fakeroot pkg_add rust - pkg_add openssl%3.0 + pkg_add openssl%3.4 pkg_add py3-pip pkg_add py3-virtualenv EOF @@ -109,17 +117,24 @@ def packages_netbsd EOF end +def package_update_openindiana + return <<-EOF + echo "nameserver 1.1.1.1" > /etc/resolv.conf + # needs separate provisioning step + reboot to become effective: + pkg update + EOF +end + def packages_openindiana return <<-EOF - # needs separate provisioning step + reboot: - #pkg update - pkg install gcc-13 git pkg-config libxxhash + pkg install gcc-13 git + pkg install pkg-config libxxhash ln -sf /usr/bin/python3.9 /usr/bin/python3 python3 -m ensurepip ln -sf /usr/bin/pip3.9 /usr/bin/pip3 pip3 install virtualenv # let borg's pkg-config find openssl: - pfexec pkg set-mediator -V 3.1 openssl + pfexec pkg set-mediator -V 3 openssl EOF end @@ -141,7 +156,7 @@ end def install_pythons(boxname) return <<-EOF . ~/.bash_profile - pyenv install 3.11.13 # tests, binary build + pyenv install 3.11.14 # tests, binary build pyenv rehash EOF end @@ -159,8 +174,8 @@ def build_pyenv_venv(boxname) . ~/.bash_profile cd /vagrant/borg # use the latest 3.11 release - pyenv global 3.11.13 - pyenv virtualenv 3.11.13 borg-env + pyenv global 3.11.14 + pyenv virtualenv 3.11.14 borg-env ln -s ~/.pyenv/versions/borg-env . EOF end @@ -206,8 +221,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.11.13 - pyenv local 3.11.13 + pyenv global 3.11.14 + pyenv local 3.11.14 fi # otherwise: just use the system python # avoid that git complains about dubious ownership if we use fakeroot: @@ -357,7 +372,7 @@ Vagrant.configure(2) do |config| end config.vm.define "openbsd7" do |b| - b.vm.box = "generic/openbsd7" + b.vm.box = "l3system/openbsd77-amd64" b.vm.provider :virtualbox do |v| v.memory = 1024 + $wmem end @@ -388,6 +403,7 @@ Vagrant.configure(2) do |config| v.memory = 2048 + $wmem end b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") + b.vm.provision "package update openindiana", :type => :shell, :inline => package_update_openindiana, :reboot => true b.vm.provision "packages openindiana", :type => :shell, :inline => packages_openindiana b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("openindiana") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("nofuse") diff --git a/pyproject.toml b/pyproject.toml index 4f29410a6..64e9ee12e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -264,7 +264,7 @@ labels = ["lint"] [tool.coverage.run] branch = true -disable_warnings = ["module-not-measured"] +disable_warnings = ["module-not-measured", "no-ctracer"] source = ["src/borg"] omit = [ "*/borg/__init__.py",