diff options
| author |   Marek Szuba <marecki@gentoo.org> | 2023-05-19 08:48:03 +0100 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2023-05-19 09:37:34 +0100 |
| commit | 8efd4037347a31b16c39c67cd300a29f123c6c44 (patch) | |
| tree | b289e6354ccc73cb6a5d56c96419935583b829ad | |
| parent | app-admin/ansible-lint: add 6.16.1, drop 6.16.0 (diff) | |
| download | gentoo-8efd4037347a31b16c39c67cd300a29f123c6c44.tar.gz gentoo-8efd4037347a31b16c39c67cd300a29f123c6c44.tar.bz2 gentoo-8efd4037347a31b16c39c67cd300a29f123c6c44.zip | |
app-backup/borgmatic: add 1.7.13, drop 1.7.12
Signed-off-by: Marek Szuba <marecki@gentoo.org>
| -rw-r--r-- | app-backup/borgmatic/Manifest | 2 | ||||
| -rw-r--r-- | app-backup/borgmatic/borgmatic-1.7.13.ebuild (renamed from app-backup/borgmatic/borgmatic-1.7.12.ebuild) | 3 | ||||
| -rw-r--r-- | app-backup/borgmatic/files/borgmatic-1.7.12-tests_flexmock.patch | 23 | ||||
| -rw-r--r-- | app-backup/borgmatic/files/borgmatic-1.7.13-no_test_coverage.patch | 11 |
4 files changed, 13 insertions, 26 deletions
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest index 3c218c9fc4cc..98dc0531ada5 100644 --- a/app-backup/borgmatic/Manifest +++ b/app-backup/borgmatic/Manifest @@ -1,3 +1,3 @@ DIST borgmatic-1.7.11.tar.gz 365247 BLAKE2B a06737c48722fdf24efca76d40f6b413f39635b4137685d6279bf7a7dd002fadef28dab35a503fabf872c732a0f32fbff8c791fa9b4602299937aeae568d6137 SHA512 cedca889cd409e92484c15240fd8da91c655f81e38c6672d25e44feedc4adf6594281d92f7072fd11edc5c9f8589098226a3520e71e3441ee7a7acf97e1b2daa -DIST borgmatic-1.7.12.tar.gz 371090 BLAKE2B eb06d88320f2c49721938c756d637b6ce463192260ac734303079095c693cadde68805356249fdad86738bed8ea0afa2e7a5c5de3c68bbedba2162e1cb445cdd SHA512 6688eb48d9ac82e9c43816aebab36b6dc011132e9f90591b7add423743a7305f55ca60f3f02f983c2d5d2e86e2429da62aec2508fac472b05334a025a308c325 +DIST borgmatic-1.7.13.tar.gz 378163 BLAKE2B c20b384853c0ddf52a095250a05d9ebe813a23ee6ef00bd5748dacf05adcff9e4d324eb2e785ebbf139d34cadab3e58d3b8305d50ec5ff20681630040433e5ae SHA512 5109c093ad3096269e27abe761e6e87ebc31b78a56bfe16e540c686ea1cd935249d063aa7c350b60a3c509990065f3a50f9e4516d40d4a1bde68c43617de18b4 DIST borgmatic-1.7.8.tar.gz 350233 BLAKE2B 3fcd392983f73ec5e97f0dc6b96e211d7f1e1d1a4ce95c635c675cf043e796925df53c30c1e4f8eb1a095d9ec5ff81e90edee5ff2576f4683053d3108004afd9 SHA512 bcc65fdb7ea1171fb61deda9b1f69a00596e1e10a99508d336977b694bd8f93d74837aad9211bf1065b785220aaf1460a3ea403bf23fa4873d1bf4c6b4016525 diff --git a/app-backup/borgmatic/borgmatic-1.7.12.ebuild b/app-backup/borgmatic/borgmatic-1.7.13.ebuild index 128d6c2e7a7c..89d5cb17e987 100644 --- a/app-backup/borgmatic/borgmatic-1.7.12.ebuild +++ b/app-backup/borgmatic/borgmatic-1.7.13.ebuild @@ -33,9 +33,8 @@ BDEPEND=" )" PATCHES=( - "${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch "${FILESDIR}"/${PN}-1.7.3-systemd_service_bin_path.patch - "${FILESDIR}"/${PN}-1.7.12-tests_flexmock.patch + "${FILESDIR}"/${PN}-1.7.13-no_test_coverage.patch ) # A fragile test whose only purpose is to make sure the NEWS file diff --git a/app-backup/borgmatic/files/borgmatic-1.7.12-tests_flexmock.patch b/app-backup/borgmatic/files/borgmatic-1.7.12-tests_flexmock.patch deleted file mode 100644 index 5c41f9a7e701..000000000000 --- a/app-backup/borgmatic/files/borgmatic-1.7.12-tests_flexmock.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ebe5c5e83903685742a39ae63b779d7a64527cff Mon Sep 17 00:00:00 2001 -From: polyzen <polyzen@noreply.torsion.org> -Date: Fri, 14 Apr 2023 01:01:31 +0000 -Subject: [PATCH] Fix "TypeError: 'module' object is not callable" in - test_commands.py - ---- a/tests/integration/borg/test_commands.py -+++ b/tests/integration/borg/test_commands.py -@@ -1,6 +1,6 @@ - import copy - --import flexmock -+from flexmock import flexmock - - import borgmatic.borg.info - import borgmatic.borg.list -@@ -105,4 +105,4 @@ def test_display_archives_info_command_does_not_duplicate_flags_or_raise(): - - borgmatic.borg.info.display_archives_info( - 'repo', {}, '2.3.4', fuzz_argument(arguments, argument_name) -- ) -+ ) -\ No newline at end of file diff --git a/app-backup/borgmatic/files/borgmatic-1.7.13-no_test_coverage.patch b/app-backup/borgmatic/files/borgmatic-1.7.13-no_test_coverage.patch new file mode 100644 index 000000000000..a3c02598b724 --- /dev/null +++ b/app-backup/borgmatic/files/borgmatic-1.7.13-no_test_coverage.patch @@ -0,0 +1,11 @@ +--- a/setup.cfg ++++ b/setup.cfg +@@ -3,7 +3,7 @@ + + [tool:pytest] + testpaths = tests +-addopts = --cov-report term-missing:skip-covered --cov=borgmatic --ignore=tests/end-to-end ++addopts = --ignore=tests/end-to-end + + [flake8] + max-line-length = 100 |