diff --git a/Vagrantfile b/Vagrantfile index a1d1cccb6..bd84710c7 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -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: diff --git a/requirements.d/development.lock.txt b/requirements.d/development.lock.txt index 1272873ce..e7c1a3f01 100644 --- a/requirements.d/development.lock.txt +++ b/requirements.d/development.lock.txt @@ -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 diff --git a/src/borg/logger.py b/src/borg/logger.py index 8641f52f2..8c23d392d 100644 --- a/src/borg/logger.py +++ b/src/borg/logger.py @@ -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}"