Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded Borgmatic to version 1.9.0 #6306

Merged
merged 5 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions spk/borgbackup/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
SPK_NAME = borgbackup
SPK_VERS = 1.2.6
SPK_REV = 14
SPK_VERS = 1.4.0
SPK_REV = 15
SPK_ICON = src/borgbackup.png

PYTHON_PACKAGE = python311
SPK_DEPENDS = "python311>=3.11.5-8"
UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)

DEPENDS = cross/attr cross/acl cross/openssl3 cross/lz4 cross/zstd cross/libb2 cross/fuse
DEPENDS = cross/attr cross/acl cross/openssl3 cross/lz4 cross/zstd cross/libb2 cross/fuse cross/xxhash

# Requirements file generation
# - first create borgbackup wheel defined in src/requirements-crossenv.txt
Expand All @@ -30,7 +30,7 @@ DESCRIPTION = Deduplicating backup program with compression and authenticated en

DISPLAY_NAME = Borg
STARTABLE = no
CHANGELOG = "1. Update borg to v1.2.6.<br/>2. Update borgmatic to v1.8.2.<br/>3. Update emborg to v1.37.<br/>4. Migrate to python 3.11."
mreid-tt marked this conversation as resolved.
Show resolved Hide resolved
CHANGELOG = "1. Update borgmatic to v1.9.0.<br/>"

HOMEPAGE = https://borgbackup.readthedocs.io
LICENSE = 3-Clause BSD
Expand All @@ -45,6 +45,8 @@ ENV += BORG_OPENSSL_PREFIX="$(OPENSSL_STAGING_PREFIX)"
ENV += BORG_LIBLZ4_PREFIX="$(STAGING_INSTALL_PREFIX)"
ENV += BORG_LIBZSTD_PREFIX="$(STAGING_INSTALL_PREFIX)"
ENV += BORG_LIBB2_PREFIX="$(STAGING_INSTALL_PREFIX)"
ENV += BORG_LIBXXHASH_PREFIX="$(STAGING_INSTALL_PREFIX)"
ENV += BORG_LIBACL_PREFIX="$(STAGING_INSTALL_PREFIX)"

include ../../mk/spksrc.common.mk

Expand Down
10 changes: 5 additions & 5 deletions spk/borgbackup/src/requirements-crossenv.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# requirements that need crossenv to build wheel for

borgbackup==1.2.6
borgbackup==1.4.0

charset-normalizer==3.2.0
charset-normalizer==3.4.0
llfuse==1.5.0
msgpack==1.0.5 # used compiled verrsion for performance
msgpack==1.1.0 # used compiled verrsion for performance
pyrsistent==0.19.3
ruamel.yaml.clib==0.2.7
ruamel.yaml.clib==0.2.12

# [rpds-py]
# Require environment variables
# PYO3_CROSS_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib/
# PYO3_CROSS_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/
# Requires path to maturin from crossenv
# ENV += PATH=$(WORK_DIR)/crossenv/build/bin:$(PATH)
rpds-py==0.10.2
rpds-py==0.20.1
33 changes: 17 additions & 16 deletions spk/borgbackup/src/requirements-pure.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,36 @@
# to be managed as pure-python

appdirs==1.4.4
arrow==1.2.3
attrs==23.1.0
arrow==1.3.0
attrs==24.2.0
#borgbackup ==> crossenv
borgmatic==1.8.2
borgmatic==1.9.0
#certifi ==> python311:pure
#charset-normalizer ==> crossenv
colorama==0.4.6
#distlib ==> python311:pure
docopt==0.6.2
emborg==1.37
emborg==1.40
#filelock ==> python311:pure
idna==3.4
inform==1.28
jsonschema==4.19.0
jsonschema-specifications==2023.7.1
idna==3.10
inform==1.31
jsonschema==4.23.0
jsonschema-specifications==2024.10.1
#llfuse ==> crossenv
#msgpack ==> crossenv
nestedtext==3.6
packaging==23.1
nestedtext==3.7
packaging==24.1
#platformdirs ==> python311:pure
pyparsing==3.1.1
#pyrsistent ==> crossenv
python-dateutil==2.8.2
quantiphy==2.19
referencing==0.30.2
requests==2.31.0
python-dateutil==2.9.0.post0
quantiphy==2.20
referencing==0.35.1
requests==2.32.3
#rpds-py ==> crossenv
ruamel.yaml==0.17.32
ruamel.yaml==0.18.6
#ruamel.yaml.clib ==> crossenv
#six ==> python311:pure
urllib3==2.0.4
types_python_dateutil==2.9.0.20241003
urllib3==2.2.3
#virtualenv ==> python311:pure
Loading