diff options
Diffstat (limited to 'app-backup/borgmatic')
| -rw-r--r-- | app-backup/borgmatic/Manifest | 7 | ||||
| -rw-r--r-- | app-backup/borgmatic/borgmatic-1.5.16.ebuild (renamed from app-backup/borgmatic/borgmatic-1.5.13.ebuild) | 27 | ||||
| -rw-r--r-- | app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch | 19 | ||||
| -rw-r--r-- | app-backup/borgmatic/files/borgmatic-1.5.16-systemd_service_bin_path.patch | 8 | ||||
| -rw-r--r-- | app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch | 34 |
5 files changed, 79 insertions, 16 deletions
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest index 0cd2ae76c08f..de1299814bad 100644 --- a/app-backup/borgmatic/Manifest +++ b/app-backup/borgmatic/Manifest @@ -1,7 +1,10 @@ AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc AUX borgmatic-1.5.1-systemd_service_bin_path.patch 446 BLAKE2B bad832573f35e832e5a111a12d6c61cf2e2b1111e91252923e841ae5ec6661ed4f1c4d1e4cc94fe31887d8ee0b2a54aac7d79f8bd0e6f27a2e89f1ff0484c091 SHA512 299791d5079522270954a6742669f3031c0d6164ad7037387dad7f7dccebbe20b83f21f1e30ee61915c2703a370ba9987ab66989c4a99c1706ddf2b17bc2c718 -DIST borgmatic-1.5.13.tar.gz 72469 BLAKE2B 3a71be201143a96968bb1ea6008b62e11f6ab199f44f38d0d66f31f24827a8f32cc7b8f50cc5d33a8bbd7046e6697afe509525be90dd9519f4c686b8737f64c5 SHA512 60bcbcc825db3f93a423ab8e44e0b0809ff4937d8e41bc56ec6226e4865c3a66fae8b6749d33cdb0692ea9dd07cfff56750ff2feee68c96791b83c9dd5f35433 +AUX borgmatic-1.5.16-flexmock_write_args.patch 738 BLAKE2B aef28c6cc9f3e4c6294cf34cb6e3a1291fce90e0696f54d8f3975d7823faf64d73f2f625f1ccc7d1473e74f81342e6243d283950c505ed7cfc2279afe8eb5df9 SHA512 a9e1645dad137a9a20e71967d4578b3bbedca5556ce8e7b588215eb240c5581e6e0d5b657941eedb637ff94ac6e09ed06d3d9ef941cc1d4365daef0ae536659d +AUX borgmatic-1.5.16-systemd_service_bin_path.patch 556 BLAKE2B f90b66d3d46ea972ed67bff74365b72e5e7df16199b439e5ad785b731eaa9a3eff5cfa6c9084c1b212b2359e9b8a14b1d0952ec6a560746acfbe594a2267e0ac SHA512 b23d899754762e29221b537c303e65a3b84e4a580d502f96870e8927ab2ef79b557f2c5638cfc4557ea5dfb6bea82b9776c6a67e65fda8a02138d3c57dfc00e6 +AUX borgmatic-1.5.16-tests_no_vim_dep.patch 1364 BLAKE2B c88361ff0c9a1fcb40e7d26e9c341ad69e7311bf6441b46cc835d62d39156b0f98ade91f03c6051782a8ccec9eab566867db9b38c7ceb7dc6db0c3875e31e7a6 SHA512 b23624f2da4531f51306893dd23c0bf97e310295006d0829bd880f7aa1798c6f6392759acd023d789c3de00d71ac27d285ab663be567cffe66d67651a4decce2 DIST borgmatic-1.5.15.tar.gz 275702 BLAKE2B c01c469a4e0b96f4a364e0e44cd26d60cf34bc1c969cbf9931ee5ec6688cf012a1c22acb20e3a434b765ef5ec68657a2507e292e5ed3b9e0587f8784e85ecfe9 SHA512 5520e2e903162caa42c66c1e172af225f5f9622c1b33e5f0854f2dc8379752865e8cb8c442e545ec4fc98509e5c7c863373b12e57cf0bbd417b4e8c0887a27fc -EBUILD borgmatic-1.5.13.ebuild 2136 BLAKE2B d47ab1d52be44bcfdbd48f4ecc71d3e52745ac4aae355d01ea523c0365c0f2c99ad186cd1de8573e5ef55eacbf9807510926d32495ca6fde4ef4394168ff2463 SHA512 e8b6c7fe7f5eef392df91887539d908aa1fec90a05a0c1ff09950dcf225c180414e2f7760cc854f6d33bfd25d3c8cd1a6f69d904001902c04f55ed22bc62e5c9 +DIST borgmatic-1.5.16.tar.gz 276802 BLAKE2B 14eb511202b30b570cdf1097a68f732af09a6412e72dddaad0d01982f3375e1f0acf77546222b0166066d27ed6ac450db4e9cc9347eb7af972aa1df023ef0168 SHA512 c28a5e272309370620cc53275f44b5bbe8b0f43180c3bd3333009217a71e35b6ae02d88d9da95629c5a6b7457aec13059024da9e594ed2fbac65d0a41dd24444 EBUILD borgmatic-1.5.15.ebuild 2143 BLAKE2B 2a29e0c8c0274a2e02d4137c0cd3661bf2c86c9f9d5b3f59068d3222022ff70975eda4344699f03e181bd746b3c4ccda7e34c365301f1a1d4cb7a167e7ffcceb SHA512 cdabf0735ac44acdfd96f6ada94db2c9cb7fa0de0650d62948850156a08a7266184ed5da9d3d347e19a30609fd104f07c12fca6c515d5767403aa2bf9c42929f +EBUILD borgmatic-1.5.16.ebuild 2163 BLAKE2B b38b58c6c9b616536e321358ad77613e59ecebc836df3444017a0c5c801a71f3bfe0646610d655c99f802ed63fe7f6cdce7509dbd1e7f44a025afa01347ac498 SHA512 c79717361295aeae8e1b8afc976f4e3072df410d997bc4c0caa1aa70df4ba7e280b66fff09ce387af8be8b66b4ded0ecf51b7de956b205900d35068f5b6d0e91 MISC metadata.xml 365 BLAKE2B 6fceb22a831c0ee0669e3545737da7a6fe778e9b188fba0c72f8e70988404ad444b2b75cd7e6001012cd2226d5f6f7a7096b3f837de905e559e94badf649d412 SHA512 72be8c3e4d69e9c33307d20b3ec2b05b134787fde7e015fa70f0dbea365163f235f21490500d68fe19b771528f813cf3257d1df175d5d009f6e9414ba5ea4db1 diff --git a/app-backup/borgmatic/borgmatic-1.5.13.ebuild b/app-backup/borgmatic/borgmatic-1.5.16.ebuild index 5fd3f3e72644..faca0182b6c8 100644 --- a/app-backup/borgmatic/borgmatic-1.5.13.ebuild +++ b/app-backup/borgmatic/borgmatic-1.5.16.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS="rdepend" @@ -15,29 +15,28 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64" - -# Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128 -RESTRICT="test" +KEYWORDS="~amd64 ~riscv" # borg is called as an external tool, hence no pythonic stuff RDEPEND="app-backup/borgbackup $(python_gen_cond_dep ' dev-python/colorama[${PYTHON_USEDEP}] - >=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}] + dev-python/jsonschema[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] <dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}] ')" -#BDEPEND=" -# test? ( -# $(python_gen_cond_dep ' -# dev-python/flexmock[${PYTHON_USEDEP}] -# ') -# )" +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + dev-python/flexmock[${PYTHON_USEDEP}] + ') + )" PATCHES=( - "${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch "${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch + "${FILESDIR}"/${PN}-1.5.16-flexmock_write_args.patch + "${FILESDIR}"/${PN}-1.5.16-systemd_service_bin_path.patch + "${FILESDIR}"/${PN}-1.5.16-tests_no_vim_dep.patch # already merged upstream ) distutils_enable_tests pytest diff --git a/app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch b/app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch new file mode 100644 index 000000000000..32937adadba0 --- /dev/null +++ b/app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch @@ -0,0 +1,19 @@ +Apparently in the flexmock universe, sys.stdout.write() takes two +arguments rather than one. As of late July 2021, upstream hasn't said +a word of comment on this; see +https://github.com/flexmock/flexmock/issues/37 + +--- a/tests/unit/commands/test_borgmatic.py ++++ b/tests/unit/commands/test_borgmatic.py +@@ -448,7 +448,10 @@ + ['baz'] + ) + stdout = flexmock() +- stdout.should_receive('write').with_args('["foo", "bar", "baz"]').once() ++ try: ++ stdout.should_receive('write').with_args('["foo", "bar", "baz"]').once() ++ except flexmock.MethodSignatureError: ++ stdout.should_receive('write').with_args('["foo", "bar", "baz"]', None).once() + flexmock(module.sys).stdout = stdout + arguments = {} + diff --git a/app-backup/borgmatic/files/borgmatic-1.5.16-systemd_service_bin_path.patch b/app-backup/borgmatic/files/borgmatic-1.5.16-systemd_service_bin_path.patch new file mode 100644 index 000000000000..26298625fc1a --- /dev/null +++ b/app-backup/borgmatic/files/borgmatic-1.5.16-systemd_service_bin_path.patch @@ -0,0 +1,8 @@ +--- a/sample/systemd/borgmatic.service ++++ b/sample/systemd/borgmatic.service +@@ -57,4 +57,4 @@ + # Delay start to prevent backups running during boot. Note that systemd-inhibit requires dbus and + # dbus-user-session to be installed. + ExecStartPre=sleep 1m +-ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting scheduled backup" /root/.local/bin/borgmatic --verbosity -1 --syslog-verbosity 1 ++ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting scheduled backup" /usr/bin/borgmatic --verbosity -1 --syslog-verbosity 1 diff --git a/app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch b/app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch new file mode 100644 index 000000000000..492743e36e04 --- /dev/null +++ b/app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch @@ -0,0 +1,34 @@ +From e8b8d86592565acde1ac6e7809947b8a761f2f91 Mon Sep 17 00:00:00 2001 +From: Marek Szuba <marek.szuba@cern.ch> +Date: Tue, 27 Jul 2021 13:46:51 +0100 +Subject: [PATCH] tests/integration/test_execute: use plain Python rather than + xxd + +Removes this test's dependencies on vim and /dev/urandom. + +Signed-off-by: Marek Szuba <marek.szuba@cern.ch> +--- + tests/integration/test_execute.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/integration/test_execute.py b/tests/integration/test_execute.py +index 6dc6467..3b9bef9 100644 +--- a/tests/integration/test_execute.py ++++ b/tests/integration/test_execute.py +@@ -1,5 +1,6 @@ + import logging + import subprocess ++import sys + + import pytest + from flexmock import flexmock +@@ -134,7 +135,8 @@ def test_log_outputs_vents_other_processes_when_one_exits(): + flexmock(module).should_receive('command_for_process').and_return('grep') + + process = subprocess.Popen( +- ['xxd', '-l', '40000', '-p', '/dev/urandom'], stdout=subprocess.PIPE, stderr=subprocess.PIPE ++ [sys.executable, '-c', "import random, string; print(''.join(random.choice(string.ascii_letters) for _ in range(40000)))"], ++ stdout=subprocess.PIPE, stderr=subprocess.PIPE + ) + other_process = subprocess.Popen( + ['true'], stdin=process.stdout, stdout=subprocess.PIPE, stderr=subprocess.STDOUT |