From 2c45729300be8c53082a7ff11d1562605e7380d2 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 30 Mar 2023 16:52:50 -0400 Subject: [PATCH] borgmatic: update to 1.7.12. --- srcpkgs/borgmatic/patches/flexmock.patch | 12 ++++++++++++ srcpkgs/borgmatic/template | 16 ++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 srcpkgs/borgmatic/patches/flexmock.patch diff --git a/srcpkgs/borgmatic/patches/flexmock.patch b/srcpkgs/borgmatic/patches/flexmock.patch new file mode 100644 index 000000000000..1af9c7679b6c --- /dev/null +++ b/srcpkgs/borgmatic/patches/flexmock.patch @@ -0,0 +1,12 @@ +diff --git a/tests/integration/borg/test_commands.py b/tests/integration/borg/test_commands.py +index 49cd0e9..1afb0e0 100644 +--- 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 diff --git a/srcpkgs/borgmatic/template b/srcpkgs/borgmatic/template index cda82c57f429..f1abd8d106a5 100644 --- a/srcpkgs/borgmatic/template +++ b/srcpkgs/borgmatic/template @@ -1,13 +1,10 @@ # Template file for 'borgmatic' pkgname=borgmatic -version=1.7.8 +version=1.7.12 revision=1 build_style=python3-module -# test_borgmatic.py runs not yet installed self, -# tests from test_execute.py sporadically fail in CI -make_check_args="--deselect=tests/integration/commands/test_borgmatic.py - --deselect=tests/integration/test_execute.py::test_log_outputs_returns_output_without_logging_for_output_log_level_none - --deselect=tests/integration/test_execute.py::test_log_outputs_logs_each_line_separately" +# runs not yet installed self +make_check_args="--deselect=tests/integration/commands/test_borgmatic.py" hostmakedepends="python3-setuptools" depends="borg python3-setuptools python3-ruamel.yaml python3-jsonschema python3-colorama python3-requests" @@ -18,9 +15,4 @@ license="GPL-3.0-or-later" homepage="https://torsion.org/borgmatic/" changelog="https://projects.torsion.org/borgmatic-collective/borgmatic/raw/branch/master/NEWS" distfiles="${PYPI_SITE}/b/borgmatic/borgmatic-${version}.tar.gz" -checksum=fa563208f2a069664f5242068e0981112eaf83565b819e5be962a6a6a01cca13 - -post_install() { - # remove tests directory polluting site-packages - rm -rf ${DESTDIR}/usr/lib/python*/site-packages/tests -} +checksum=f0557760d42c654ffc9851f8e078b6ed0c0cae93fbd6d39080880b38f4e6401c