Merge pull request #9326 from ThomasWaldmann/misc-fixes-1.4
Some checks failed
CodeQL / Analyze (push) Waiting to run
Windows CI / msys2-ucrt64 (push) Waiting to run
CI / lint (push) Has been cancelled
CI / asan_ubsan (push) Has been cancelled
CI / native_tests (push) Has been cancelled
CI / vm_tests (Haiku, false, haiku, r1beta5) (push) Has been cancelled
CI / vm_tests (NetBSD, false, netbsd, 10.1) (push) Has been cancelled
CI / vm_tests (OpenBSD, false, openbsd, 7.7) (push) Has been cancelled
CI / vm_tests (borg-freebsd-14-x86_64-gh, FreeBSD, true, freebsd, 14.3) (push) Has been cancelled

Misc. fixes (1.4-maint)
This commit is contained in:
TW 2026-02-17 15:15:31 +01:00 committed by GitHub
commit 0e13fbdd7f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 34 additions and 7 deletions

View file

@ -133,8 +133,8 @@ jobs:
}' || '{
"include": [
{"os": "ubuntu-22.04", "python-version": "3.10", "toxenv": "py310-fuse2"},
{"os": "ubuntu-22.04", "python-version": "3.11", "toxenv": "py311-fuse2", "binary": "borg-linux-glibc235-x86_64-gh"},
{"os": "ubuntu-22.04-arm", "python-version": "3.11", "toxenv": "py311-fuse2", "binary": "borg-linux-glibc235-arm64-gh"},
{"os": "ubuntu-22.04", "python-version": "3.11", "toxenv": "py311-fuse3", "binary": "borg-linux-glibc235-x86_64-gh"},
{"os": "ubuntu-22.04-arm", "python-version": "3.11", "toxenv": "py311-fuse3", "binary": "borg-linux-glibc235-arm64-gh"},
{"os": "ubuntu-24.04", "python-version": "3.12", "toxenv": "py312-fuse3"},
{"os": "ubuntu-24.04", "python-version": "3.13", "toxenv": "py313-fuse3"},
{"os": "ubuntu-24.04", "python-version": "3.14", "toxenv": "py314-fuse3"},

View file

@ -414,14 +414,41 @@ Compatibility notes:
Change Log
==========
Version 1.4.3 (2025-12-02)
--------------------------
Version 1.4.4 (not yet released)
--------------------------------
For upgrade and compatibility hints, please also read the "Upgrade Notes" section
above.
New features:
- prune: added -v / --info output, #9262
- mount: warn about symlinks pointing outside of the mountpoint, #9254
Fixes:
- compress: make Padme size obfuscation usable ("obfuscate,250,...")
Other changes:
- pyinstaller binary: do not exclude ssl, needed for pyfuse3/trio, #9196
- mount: fuse fs performance improvement
- CI / tests:
- build linux binaries with pyfuse3
- use macos-15 to build the binaries
- tox: use pytest -n auto by default to speed up tests
- scripts/linux-run: run commands (e.g. tox) in a podman linux container
- docs:
- fix typos found by codespell
- update binary readme
Version 1.4.3 (2025-12-02)
--------------------------
New features:
- None.
Fixes:

View file

@ -182,7 +182,7 @@ description = "Run tests with pytest"
package = "editable-legacy" # without this it does not find setup_docs when running under fakeroot
deps = ["-rrequirements.d/development.txt"]
commands = [
["pytest", "-v", "-n", "{env:XDISTN:1}", "-rs", "--cov=borg", "--cov-config=pyproject.toml", "--benchmark-skip", "--pyargs", "{posargs:borg.testsuite}"]
["pytest", "-v", "-n", "{env:XDISTN:auto}", "-rs", "--cov=borg", "--cov-config=pyproject.toml", "--benchmark-skip", "--pyargs", "{posargs:borg.testsuite}"]
]
pass_env = ["*"] # fakeroot -u needs some env vars
labels = ["test"]

View file

@ -26,7 +26,7 @@ a = Analysis([os.path.join(basepath, 'src', 'borg', '__main__.py'), ],
hookspath=[],
runtime_hooks=[],
excludes=[
'_ssl', 'ssl',
# '_ssl', 'ssl', # do not exclude these, needed for pyfuse3/trio
'pkg_resources', # avoid pkg_resources related warnings
],
win_no_prefer_redirects=False,

View file

@ -74,7 +74,7 @@ if [[ "$REBUILD" == "true" ]] || ! podman image exists "$FULL_IMAGE_NAME"; then
podman build \
--build-arg BASE_IMAGE="$BASE_IMAGE" \
-t "$FULL_IMAGE_NAME" \
-f scripts/Dockerfile.linux-tox .
-f scripts/Dockerfile.linux-run .
fi
echo "Running in container..."