From 8dbfc50cde9c5042e6f3b9d24bb02522f89a44cc Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Tue, 2 Jun 2026 00:54:36 +0200 Subject: [PATCH] require borgstore 0.5.1, always with rest extra --- .github/workflows/canary.yml | 2 +- .github/workflows/ci.yml | 12 +++++------ pyproject.toml | 39 ++++++++++++++++++------------------ 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index cfc57ec88..0d100c35e 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -136,7 +136,7 @@ jobs: run: | # build borg.exe . env/bin/activate - pip install -e ".[cockpit,s3,sftp,rest,rclone]" + pip install -e ".[cockpit,s3,sftp,rclone]" mkdir -p dist/binary pyinstaller -y --clean --distpath=dist/binary scripts/borg.exe.spec # build sdist and wheel in dist/... diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 464ad960e..c997495b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -281,13 +281,13 @@ jobs: - name: Install borgbackup run: | if [[ "$TOXENV" == *"llfuse"* ]]; then - pip install -ve ".[llfuse,cockpit,s3,sftp,rest,rclone]" + pip install -ve ".[llfuse,cockpit,s3,sftp,rclone]" elif [[ "$TOXENV" == *"pyfuse3"* ]]; then - pip install -ve ".[pyfuse3,cockpit,s3,sftp,rest,rclone]" + pip install -ve ".[pyfuse3,cockpit,s3,sftp,rclone]" elif [[ "$TOXENV" == *"mfusepy"* ]]; then - pip install -ve ".[mfusepy,cockpit,s3,sftp,rest,rclone]" + pip install -ve ".[mfusepy,cockpit,s3,sftp,rclone]" else - pip install -ve ".[cockpit,s3,sftp,rest,rclone]" + pip install -ve ".[cockpit,s3,sftp,rclone]" fi - name: Build Borg fat binaries (${{ matrix.binary }}) @@ -461,7 +461,7 @@ jobs: pip -V python -m pip install --upgrade pip wheel pip install -r requirements.d/development.lock.txt - pip install -e ".[mfusepy,cockpit,s3,sftp,rest,rclone]" + pip install -e ".[mfusepy,cockpit,s3,sftp,rclone]" tox -e py311-mfusepy if [[ "${{ matrix.do_binaries }}" == "true" && "${{ startsWith(github.ref, 'refs/tags/') }}" == "true" ]]; then @@ -659,7 +659,7 @@ jobs: run: | # build borg.exe . env/bin/activate - pip install -e ".[cockpit,s3,sftp,rest,rclone]" + pip install -e ".[cockpit,s3,sftp,rclone]" mkdir -p dist/binary pyinstaller -y --clean --distpath=dist/binary scripts/borg.exe.spec # build sdist and wheel in dist/... diff --git a/pyproject.toml b/pyproject.toml index a0e7d1b8f..e66d11ce2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ license = "BSD-3-Clause" license-files = ["LICENSE", "AUTHORS"] dependencies = [ "borghash ~= 0.1.0", - "borgstore ~= 0.5.0", + "borgstore[rest] ~= 0.5.1", "msgpack >=1.0.3, <=1.1.2", "packaging", "platformdirs >=3.0.0, <5.0.0; sys_platform == 'darwin'", # for macOS: breaking changes in 3.0.0. @@ -51,10 +51,9 @@ mfusepy = ["mfusepy >= 3.1.0, <4.0.0"] # fuse 2+3, high-level # a pypi release of borgbackup can't contain a dependency on github! # mfusepym = ["mfusepy @ git+https://github.com/mxmlnkn/mfusepy.git@master"] nofuse = [] -s3 = ["borgstore[s3] ~= 0.5.0"] -sftp = ["borgstore[sftp] ~= 0.5.0"] -rclone = ["borgstore[rclone] ~= 0.5.0"] -rest = ["borgstore[rest] ~= 0.5.0"] +s3 = ["borgstore[rest,s3] ~= 0.5.1"] +sftp = ["borgstore[rest,sftp] ~= 0.5.1"] +rclone = ["borgstore[rest,rclone] ~= 0.5.1"] cockpit = ["textual>=6.8.0"] # might also work with older versions, untested [project.urls] @@ -192,71 +191,71 @@ pass_env = ["*"] # needed by tox4, so env vars are visible for building borg [tool.tox.env.py310-llfuse] set_env = {BORG_FUSE_IMPL = "llfuse"} -extras = ["llfuse", "sftp", "s3", "rest", "rclone"] +extras = ["llfuse", "sftp", "s3", "rclone"] [tool.tox.env.py310-pyfuse3] set_env = {BORG_FUSE_IMPL = "pyfuse3"} -extras = ["pyfuse3", "sftp", "s3", "rest", "rclone"] +extras = ["pyfuse3", "sftp", "s3", "rclone"] [tool.tox.env.py310-mfusepy] set_env = {BORG_FUSE_IMPL = "mfusepy"} -extras = ["mfusepy", "sftp", "s3", "rest", "rclone"] +extras = ["mfusepy", "sftp", "s3", "rclone"] [tool.tox.env.py311-none] [tool.tox.env.py311-llfuse] set_env = {BORG_FUSE_IMPL = "llfuse"} -extras = ["llfuse", "sftp", "s3", "rest", "rclone"] +extras = ["llfuse", "sftp", "s3", "rclone"] [tool.tox.env.py311-pyfuse3] set_env = {BORG_FUSE_IMPL = "pyfuse3"} -extras = ["pyfuse3", "sftp", "s3", "rest", "rclone"] +extras = ["pyfuse3", "sftp", "s3", "rclone"] [tool.tox.env.py311-mfusepy] set_env = {BORG_FUSE_IMPL = "mfusepy"} -extras = ["mfusepy", "sftp", "s3", "rest", "rclone"] +extras = ["mfusepy", "sftp", "s3", "rclone"] [tool.tox.env.py312-none] [tool.tox.env.py312-llfuse] set_env = {BORG_FUSE_IMPL = "llfuse"} -extras = ["llfuse", "sftp", "s3", "rest", "rclone"] +extras = ["llfuse", "sftp", "s3", "rclone"] [tool.tox.env.py312-pyfuse3] set_env = {BORG_FUSE_IMPL = "pyfuse3"} -extras = ["pyfuse3", "sftp", "s3", "rest", "rclone"] +extras = ["pyfuse3", "sftp", "s3", "rclone"] [tool.tox.env.py312-mfusepy] set_env = {BORG_FUSE_IMPL = "mfusepy"} -extras = ["mfusepy", "sftp", "s3", "rest", "rclone"] +extras = ["mfusepy", "sftp", "s3", "rclone"] [tool.tox.env.py313-none] [tool.tox.env.py313-llfuse] set_env = {BORG_FUSE_IMPL = "llfuse"} -extras = ["llfuse", "sftp", "s3", "rest", "rclone"] +extras = ["llfuse", "sftp", "s3", "rclone"] [tool.tox.env.py313-pyfuse3] set_env = {BORG_FUSE_IMPL = "pyfuse3"} -extras = ["pyfuse3", "sftp", "s3", "rest", "rclone"] +extras = ["pyfuse3", "sftp", "s3", "rclone"] [tool.tox.env.py313-mfusepy] set_env = {BORG_FUSE_IMPL = "mfusepy"} -extras = ["mfusepy", "sftp", "s3", "rest", "rclone"] +extras = ["mfusepy", "sftp", "s3", "rclone"] [tool.tox.env.py314-none] [tool.tox.env.py314-llfuse] set_env = {BORG_FUSE_IMPL = "llfuse"} -extras = ["llfuse", "sftp", "s3", "rest", "rclone"] +extras = ["llfuse", "sftp", "s3", "rclone"] [tool.tox.env.py314-pyfuse3] set_env = {BORG_FUSE_IMPL = "pyfuse3"} -extras = ["pyfuse3", "sftp", "s3", "rest", "rclone"] +extras = ["pyfuse3", "sftp", "s3", "rclone"] [tool.tox.env.py314-mfusepy] set_env = {BORG_FUSE_IMPL = "mfusepy"} -extras = ["mfusepy", "sftp", "s3", "rest", "rclone"] +extras = ["mfusepy", "sftp", "s3", "rclone"] [tool.tox.env.ruff] skip_install = true