diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a98378327..cca41d479 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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"}, diff --git a/docs/changes.rst b/docs/changes.rst index 460e2f0de..8b85c7c8a 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -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: diff --git a/pyproject.toml b/pyproject.toml index dafcb15a9..063cb1d8d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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"] diff --git a/scripts/Dockerfile.linux-tox b/scripts/Dockerfile.linux-run similarity index 100% rename from scripts/Dockerfile.linux-tox rename to scripts/Dockerfile.linux-run diff --git a/scripts/borg.exe.spec b/scripts/borg.exe.spec index a77520c80..d7272e5ae 100644 --- a/scripts/borg.exe.spec +++ b/scripts/borg.exe.spec @@ -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, diff --git a/scripts/linux-run b/scripts/linux-run index c56f8db65..1e0b0ccf1 100755 --- a/scripts/linux-run +++ b/scripts/linux-run @@ -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..."