1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-01-04 22:41:16 +00:00

Merge pull request #8610 from ThomasWaldmann/vagrant-updates2-1.4

Vagrant updates2 (1.4)
This commit is contained in:
TW 2024-12-29 01:53:40 +01:00 committed by GitHub
commit f10842f39b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 6 deletions

8
Vagrantfile vendored
View file

@ -71,6 +71,7 @@ end
def packages_openbsd
return <<-EOF
echo "https://ftp.eu.openbsd.org/pub/OpenBSD" > /etc/installurl
pkg_add bash
chsh -s bash vagrant
pkg_add xxhash
@ -166,10 +167,7 @@ end
def install_pythons(boxname)
return <<-EOF
. ~/.bash_profile
pyenv install 3.12.0 # tests
pyenv install 3.11.11 # tests, binary build
pyenv install 3.10.2 # tests
pyenv install 3.9.4 # tests
pyenv rehash
EOF
end
@ -234,8 +232,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.11 3.12.0
pyenv local 3.9.4 3.10.2 3.11.11 3.12.0
pyenv global 3.11.11
pyenv local 3.11.11
fi
# otherwise: just use the system python
# avoid that git complains about dubious ownership if we use fakeroot:

View file

@ -9,4 +9,4 @@ pytest==7.4.3
pytest-xdist==3.5.0
pytest-cov==4.1.0
pytest-benchmark==4.0.0
Cython==3.0.10
Cython==3.0.11

View file

@ -44,6 +44,12 @@
# warnings.filterwarnings('ignore', r'... regex for warning message to ignore ...')
# we do not want that urllib spoils test output with LibreSSL related warnings on OpenBSD.
# NotOpenSSLWarning: urllib3 v2 only supports OpenSSL 1.1.1+,
# currently the 'ssl' module is compiled with 'LibreSSL 3.8.2'.
warnings.filterwarnings("ignore", message=r".*urllib3 v2 only supports OpenSSL.*")
def _log_warning(message, category, filename, lineno, file=None, line=None):
# for warnings, we just want to use the logging system, not stderr or other files
msg = f"{filename}:{lineno}: {category.__name__}: {message}"