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

borgbackup: update to 1.1.7, add borgmatic 1.2.2 #3471

Merged
merged 5 commits into from
Nov 30, 2018
Merged

borgbackup: update to 1.1.7, add borgmatic 1.2.2 #3471

merged 5 commits into from
Nov 30, 2018

Conversation

yuroller
Copy link
Contributor

Motivation: Update borgbackup to 1.1.7, add borgmatic 1.2.2
Linked issues: #3418

Checklist

  • [] Build rule all-supported completed successfully
  • [] Package upgrade completed successfully
  • New installation of package completed successfully

Little testing of borgbackup and borgmatic on DS212+

@noplanman
Copy link

What is the ruamel.yaml for? Is it required?

Building nicely now, well done 👍

@yuroller
Copy link
Contributor Author

ruamel.yaml is required by the new version of borgmatic. Since it is a native python module, I had to add it to python3 package as a dependency: I was not able to do otherwise.

@@ -10,7 +10,7 @@ DEPENDS += cross/setuptools cross/pip cross/wheel
DEPENDS += cross/cffi cross/bcrypt cross/sqlite
# Cross-compiled wheels
DEPENDS += cross/lxml cross/pycrypto cross/pycurl cross/pyyaml
DEPENDS += cross/msgpack-python cross/attr cross/acl cross/lz4
DEPENDS += cross/msgpack-python cross/ruamel.yaml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why removing attr, acl and lz4 from Python 3?
Isn't there any way to load ruamel.yaml (typically as borgbackup package specific wheel) instead of enforcing Python 3 publish (again) ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These have just been added for HomeAssistant in #3396
In fact Python 3 publishing is pending because of both HomeAssistant and Borgbackup.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I know, attr, acl and lz4 are used by no other python3 dependent packages except for borgbackup.
I managed to put those dependencies inside borkgbackup package itself.
Better check with HomeAssistant spk maintainer, because in my eyes it looks those dependencies are not used.
About ruamel.yaml, I was not able to put it inside borgbackup package (any idea?).

@@ -1,7 +1,7 @@
SPK_NAME = python
SPK_SHORT_VERS = 2.7
SPK_VERS = $(SPK_SHORT_VERS).14
SPK_REV = 19
SPK_REV = 20
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why updating Python 2.7? borgbackup runs on Python 3, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

borgbackup depends on python3, but I had to upgrade package msgpack-python that it is used by both python and python3 packages.

@ymartin59
Copy link
Contributor

I have tested with python3 #3529. Please review, I have planned to publish soon.

@ymartin59 ymartin59 merged commit 3d5aa0d into SynoCommunity:master Nov 30, 2018
stefaang pushed a commit to stefaang/spksrc that referenced this pull request Jan 21, 2019
* borgbackup: update to 1.1.7, add borgmatic 1.2.2
* [borgbackup] increase revision
* update ruamel.yaml
* improve installer logging for diagnostic
@noplanman noplanman mentioned this pull request Mar 31, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants