* [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/, app-backup/borgmatic/files/
@ 2020-03-25 16:57 Marek Szuba
0 siblings, 0 replies; 9+ messages in thread
From: Marek Szuba @ 2020-03-25 16:57 UTC (permalink / raw
To: gentoo-commits
commit: 5c190b0b3b75919c10a38707b7252b42d5b1c323
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 16:26:22 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 16:54:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c190b0b
app-backup/borgmatic: new package
Nominally works with python3_8 to but not all of its dependencies handle
this version in Gentoo yet.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-backup/borgmatic/Manifest | 1 +
app-backup/borgmatic/borgmatic-1.5.1.ebuild | 62 ++++++++++++++++++++++
.../files/borgmatic-1.5.1-no_test_coverage.patch | 11 ++++
app-backup/borgmatic/metadata.xml | 12 +++++
4 files changed, 86 insertions(+)
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
new file mode 100644
index 00000000000..e6ae1752a42
--- /dev/null
+++ b/app-backup/borgmatic/Manifest
@@ -0,0 +1 @@
+DIST borgmatic-1.5.1.tar.gz 67401 BLAKE2B c11f4b9f9acc7d7bf4e482953968dbaabc33f1513ec8f20868518bca22ffcafee90569c06ec603be919d47d724dd4a3a904e44fbb40c2309d8cb78e9277b5cc7 SHA512 9ded9bd5d6db866d196fedee88737f3d3eef6cb0e61c5f55ac543602c4429adcb57608d7f6c798edfd6ac1ecd14aadd9a88fdf94ef1f0eab4c26a9d2a29c5e38
diff --git a/app-backup/borgmatic/borgmatic-1.5.1.ebuild b/app-backup/borgmatic/borgmatic-1.5.1.ebuild
new file mode 100644
index 00000000000..754e0f063c9
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.5.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+inherit distutils-r1
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="${PYTHON_DEPS}
+ dev-python/colorama[${PYTHON_USEDEP}]
+ >=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ <dev-python/ruamel-yaml-0.17.0"[${PYTHON_USEDEP}]
+RDEPEND="${DEPEND}
+ app-backup/borgbackup"
+BDEPEND="test? (
+ ${DEPEND}
+ dev-python/flexmock[${PYTHON_USEDEP}]
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ distutils-r1_src_prepare
+
+ # Unlike the other two test files in integration/commands, which use the
+ # relevant modules' respective APIs, test_borgmatic.py tries to call the
+ # 'borgmatic' executable - which has not even been created by now.
+ # Seeing as the only test run from this file as of 2020-03-25 is the
+ # parsing of contents of 'borgmatic --version', just skip it for now.
+ rm -f "${S}"/tests/integration/commands/test_borgmatic.py
+}
+
+src_install() {
+ distutils-r1_src_install
+ keepdir /etc/borgmatic
+ # TODO: install systemd units (and explain them in postinst); need patching
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "To generate a sample configuration file, run:"
+ elog " generate-borgmatic-config"
+ else
+ elog "To upgrade your configuration file to the current version, run:"
+ elog " upgrade-borgmatic-config"
+ fi
+}
diff --git a/app-backup/borgmatic/files/borgmatic-1.5.1-no_test_coverage.patch b/app-backup/borgmatic/files/borgmatic-1.5.1-no_test_coverage.patch
new file mode 100644
index 00000000000..28562398a40
--- /dev/null
+++ b/app-backup/borgmatic/files/borgmatic-1.5.1-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
+ filterwarnings =
+ ignore:Coverage disabled.*:pytest.PytestWarning
+
diff --git a/app-backup/borgmatic/metadata.xml b/app-backup/borgmatic/metadata.xml
new file mode 100644
index 00000000000..e69f4b798a4
--- /dev/null
+++ b/app-backup/borgmatic/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
+</maintainer>
+<upstream>
+ <remote-id type="github">witten/borgmatic</remote-id>
+ <remote-id type="pypi">borgmatic</remote-id>
+</upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/, app-backup/borgmatic/files/
@ 2021-07-27 17:29 Marek Szuba
0 siblings, 0 replies; 9+ messages in thread
From: Marek Szuba @ 2021-07-27 17:29 UTC (permalink / raw
To: gentoo-commits
commit: 48b15bf2eb35edbd9b6b328d68c5fa96d905a685
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 27 17:28:14 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Jul 27 17:29:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48b15bf2
app-backup/borgmatic: get rid of vim dependency in tests
Already merged upstream so will no longer be needed come 1.5.17.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-backup/borgmatic/borgmatic-1.5.16.ebuild | 3 +-
.../files/borgmatic-1.5.16-tests_no_vim_dep.patch | 34 ++++++++++++++++++++++
2 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/app-backup/borgmatic/borgmatic-1.5.16.ebuild b/app-backup/borgmatic/borgmatic-1.5.16.ebuild
index 72cfe91c89c..faca0182b6c 100644
--- a/app-backup/borgmatic/borgmatic-1.5.16.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.16.ebuild
@@ -25,10 +25,8 @@ RDEPEND="app-backup/borgbackup
dev-python/requests[${PYTHON_USEDEP}]
<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
')"
-# one of the tests needs xxd
BDEPEND="
test? (
- app-editors/vim-core
$(python_gen_cond_dep '
dev-python/flexmock[${PYTHON_USEDEP}]
')
@@ -38,6 +36,7 @@ PATCHES=(
"${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-tests_no_vim_dep.patch b/app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch
new file mode 100644
index 00000000000..492743e36e0
--- /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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/, app-backup/borgmatic/files/
@ 2021-10-12 23:03 Marek Szuba
0 siblings, 0 replies; 9+ messages in thread
From: Marek Szuba @ 2021-10-12 23:03 UTC (permalink / raw
To: gentoo-commits
commit: 4ac7b44fdc0b86680c0b473f9ca8b75e4cc81971
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 12 22:54:14 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Oct 12 22:54:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac7b44f
app-backup/borgmatic: drop 1.5.15
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-backup/borgmatic/Manifest | 1 -
app-backup/borgmatic/borgmatic-1.5.15.ebuild | 71 ----------------------
.../borgmatic-1.5.1-systemd_service_bin_path.patch | 8 ---
3 files changed, 80 deletions(-)
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 82f553f1856..61e367b079c 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,2 +1 @@
-DIST borgmatic-1.5.15.tar.gz 275702 BLAKE2B c01c469a4e0b96f4a364e0e44cd26d60cf34bc1c969cbf9931ee5ec6688cf012a1c22acb20e3a434b765ef5ec68657a2507e292e5ed3b9e0587f8784e85ecfe9 SHA512 5520e2e903162caa42c66c1e172af225f5f9622c1b33e5f0854f2dc8379752865e8cb8c442e545ec4fc98509e5c7c863373b12e57cf0bbd417b4e8c0887a27fc
DIST borgmatic-1.5.18.tar.gz 277064 BLAKE2B 43f5f8d2fb7f13ed6bcfd5b00f99a797f214f5220b27f8c173f636d37b4c0b5c8d1915a73684597d71fb436717a84de542be51a9b23f735e304e15427d40ace1 SHA512 2e008ef01922851a3fd5c7b5d1ad30d5b0e007e5f76af4849159ff2f730add591ffb30ba3d867b0e7221b98e949e4cf3e11b8853a3412395a63c135248761264
diff --git a/app-backup/borgmatic/borgmatic-1.5.15.ebuild b/app-backup/borgmatic/borgmatic-1.5.15.ebuild
deleted file mode 100644
index 55397ae435f..00000000000
--- a/app-backup/borgmatic/borgmatic-1.5.15.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv"
-
-# Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
-RESTRICT="test"
-
-# 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/requests[${PYTHON_USEDEP}]
- <dev-python/ruamel-yaml-0.18.0[${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
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
- distutils-r1_src_prepare
-
- # Unlike the other two test files in integration/commands, which use the
- # relevant modules' respective APIs, test_borgmatic.py tries to call the
- # 'borgmatic' executable - which by the time we execute src_test will
- # not have been created yet. Adding --install to distutils_enable_tests would
- # likely take care of this - but between the aforementioned behaviour
- # inconsistency and the fact the only test run from this file as of version
- # 1.5.13 is the parsing of contents of 'borgmatic --version', just skip it.
- rm -f "${S}"/tests/integration/commands/test_borgmatic.py
-}
-
-src_install() {
- distutils-r1_src_install
- systemd_dounit sample/systemd/borgmatic.{service,timer}
- keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "To generate a sample configuration file, run:"
- elog " generate-borgmatic-config"
- fi
- elog
- elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
-}
diff --git a/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch b/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch
deleted file mode 100644
index 90e94ac1f55..00000000000
--- a/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/sample/systemd/borgmatic.service
-+++ b/sample/systemd/borgmatic.service
-@@ -21,4 +21,4 @@
-
- # Delay start to prevent backups running during boot.
- ExecStartPre=sleep 1m
--ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting scheduled backup" /root/.local/bin/borgmatic --syslog-verbosity 1
-+ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting scheduled backup" /usr/bin/borgmatic --syslog-verbosity 1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/, app-backup/borgmatic/files/
@ 2022-10-13 9:31 Marek Szuba
0 siblings, 0 replies; 9+ messages in thread
From: Marek Szuba @ 2022-10-13 9:31 UTC (permalink / raw
To: gentoo-commits
commit: 05080d4d865f13bba83b65734de2b5d3bff3f9a7
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 09:11:19 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 09:31:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05080d4d
app-backup/borgmatic: add 1.7.3
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-backup/borgmatic/Manifest | 1 +
app-backup/borgmatic/borgmatic-1.7.3.ebuild | 68 ++++++++++++++++++++++
.../borgmatic-1.7.3-systemd_service_bin_path.patch | 8 +++
3 files changed, 77 insertions(+)
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 91760f50ee99..8ec71b9b9c77 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,2 +1,3 @@
DIST borgmatic-1.6.6.tar.gz 323601 BLAKE2B b40d8f00e3b7bbd343336cf4c6992e34d8289de451c184717827e8e43519b84d4bb9b8cff6a835a7cc502d2e93045f0196d744e4b6ad800de1276e11c3189cec SHA512 f1a6dfa344ebee89e88f1aa6b43d8493c80815c637d8e0f7f6314462fd511b576e62246d957023ab2f9a68875d2818e2b8ef00cbf3339dc35a93d6ebad0bed19
DIST borgmatic-1.7.2.tar.gz 333772 BLAKE2B fd628e9c77547686d4edf5d1066d3c171575f4d923ebc5205c5eb64f3a960e94c121282e9f4fb02b1291a81011a18dc393c6d13a07f215585459e7a5b55f8107 SHA512 6ec12ec25ae4d0210bb9114795c1ea292d8236f9e68c9425e24ee7b580796504e4c317a3fcf778806a33bbd3db68669beb4ef7a88ec538c1bd432db9a2845b3e
+DIST borgmatic-1.7.3.tar.gz 337143 BLAKE2B 3cd0112978feb6476c9d6ea9a81bb535406514e82d2134f408935c5949ecc276881c4402251bffdccf814fe58c93d6db4d0cbe4a63138a865bbab3459e1bd83f SHA512 aa40090fbddd5453c792cf289021d52347b022a2dfb5bf53d7695f594c27a2fd8e7d9cfe0912e02fb3c1c1b8cd7a4a1a4f4890f86458bde58554f58d9d30b523
diff --git a/app-backup/borgmatic/borgmatic-1.7.3.ebuild b/app-backup/borgmatic/borgmatic-1.7.3.ebuild
new file mode 100644
index 000000000000..7693ff51ae61
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.7.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+
+# borg is called as an external tool, hence no pythonic stuff
+RDEPEND="app-backup/borgbackup
+ $(python_gen_cond_dep '
+ <dev-python/colorama-0.5[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ <dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')"
+BDEPEND="
+ test? (
+ $(python_gen_cond_dep '
+ >=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
+ ')
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
+ "${FILESDIR}"/${PN}-1.7.3-systemd_service_bin_path.patch
+)
+
+# test_borgmatic_version_matches_news_version tries to run the 'borgmatic'
+# executable so making it work would require passing --install
+# to distutils_enable_tests. Given that this is the only test requiring
+# this and that all it does is make sure the NEWS file has been updated
+# for the current version, just skip it.
+EPYTEST_DESELECT=(
+ tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
+)
+
+distutils_enable_tests pytest
+
+src_install() {
+ distutils-r1_src_install
+ systemd_dounit sample/systemd/borgmatic.{service,timer}
+ keepdir /etc/borgmatic
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "To generate a sample configuration file, run:"
+ elog " generate-borgmatic-config"
+ else
+ ewarn "Please note that since version 1.7.0 ${PN} no longer supports old-style command-line action flags like '--create', '--list', etc."
+ ewarn "Make sure all your scripts use actions, e.g. 'create', 'list' and so on"
+ fi
+ elog
+ elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
+}
diff --git a/app-backup/borgmatic/files/borgmatic-1.7.3-systemd_service_bin_path.patch b/app-backup/borgmatic/files/borgmatic-1.7.3-systemd_service_bin_path.patch
new file mode 100644
index 000000000000..25b283777408
--- /dev/null
+++ b/app-backup/borgmatic/files/borgmatic-1.7.3-systemd_service_bin_path.patch
@@ -0,0 +1,8 @@
+--- a/sample/systemd/borgmatic.service
++++ b/sample/systemd/borgmatic.service
+@@ -61,4 +61,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" --what="sleep:shutdown" --why="Prevent interrupting scheduled backup" /root/.local/bin/borgmatic --verbosity -1 --syslog-verbosity 1
++ExecStart=systemd-inhibit --who="borgmatic" --what="sleep:shutdown" --why="Prevent interrupting scheduled backup" /usr/bin/borgmatic --verbosity -1 --syslog-verbosity 1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/, app-backup/borgmatic/files/
@ 2023-05-11 12:30 Marek Szuba
0 siblings, 0 replies; 9+ messages in thread
From: Marek Szuba @ 2023-05-11 12:30 UTC (permalink / raw
To: gentoo-commits
commit: 94340d71baa8d709c0cf529a7ca95120654bba8c
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu May 11 12:29:57 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu May 11 12:29:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94340d71
app-backup/borgmatic: add 1.7.12
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-backup/borgmatic/Manifest | 1 +
app-backup/borgmatic/borgmatic-1.7.12.ebuild | 74 ++++++++++++++++++++++
.../files/borgmatic-1.7.12-tests_flexmock.patch | 23 +++++++
3 files changed, 98 insertions(+)
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index badfb50b3b04..3c218c9fc4cc 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,2 +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.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.12.ebuild
new file mode 100644
index 000000000000..128d6c2e7a7c
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.7.12.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 systemd pypi
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+
+# borg is called as an external tool, hence no pythonic stuff
+RDEPEND="app-backup/borgbackup
+ $(python_gen_cond_dep '
+ <dev-python/colorama-0.5[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ <dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')"
+BDEPEND="
+ test? (
+ $(python_gen_cond_dep '
+ >=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
+ ')
+ )"
+
+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
+)
+
+# A fragile test whose only purpose is to make sure the NEWS file
+# has been updated for the current version.
+EPYTEST_DESELECT=(
+ tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
+)
+
+distutils_enable_tests pytest
+
+src_install() {
+ distutils-r1_src_install
+ systemd_dounit sample/systemd/borgmatic.{service,timer}
+ keepdir /etc/borgmatic
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "To generate a sample configuration file, run:"
+ elog " generate-borgmatic-config"
+ else
+ local oldver
+ for oldver in ${REPLACING_VERSIONS}; do
+ if ver_test "${oldver}" -lt 1.7.11; then
+ ewarn "Since version 1.7.11 ${PN} defaults to a different way of selecting archives for multi-archive actions."
+ ewarn "For details, please see"
+ ewarn
+ ewarn " https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#archive-naming"
+ ewarn
+ break
+ fi
+ done
+ fi
+ elog
+ elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
+}
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
new file mode 100644
index 000000000000..5c41f9a7e701
--- /dev/null
+++ b/app-backup/borgmatic/files/borgmatic-1.7.12-tests_flexmock.patch
@@ -0,0 +1,23 @@
+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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/, app-backup/borgmatic/files/
@ 2023-05-19 8:37 Marek Szuba
0 siblings, 0 replies; 9+ messages in thread
From: Marek Szuba @ 2023-05-19 8:37 UTC (permalink / raw
To: gentoo-commits
commit: 8efd4037347a31b16c39c67cd300a29f123c6c44
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri May 19 07:48:03 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri May 19 08:37:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8efd4037
app-backup/borgmatic: add 1.7.13, drop 1.7.12
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-backup/borgmatic/Manifest | 2 +-
...matic-1.7.12.ebuild => borgmatic-1.7.13.ebuild} | 3 +--
.../files/borgmatic-1.7.12-tests_flexmock.patch | 23 ----------------------
.../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
similarity index 95%
rename from app-backup/borgmatic/borgmatic-1.7.12.ebuild
rename to 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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/, app-backup/borgmatic/files/
@ 2023-06-07 21:59 Marek Szuba
0 siblings, 0 replies; 9+ messages in thread
From: Marek Szuba @ 2023-06-07 21:59 UTC (permalink / raw
To: gentoo-commits
commit: 37fde8d5c1acb190c25d63622f7b427482da28e5
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 7 21:58:24 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jun 7 21:58:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37fde8d5
app-backup/borgmatic: add 1.7.14
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-backup/borgmatic/Manifest | 1 +
app-backup/borgmatic/borgmatic-1.7.14.ebuild | 73 ++++++++++++++++++++++
...borgmatic-1.7.14-systemd_service_bin_path.patch | 8 +++
3 files changed, 82 insertions(+)
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 98dc0531ada5..fcd57574c6a2 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,3 +1,4 @@
DIST borgmatic-1.7.11.tar.gz 365247 BLAKE2B a06737c48722fdf24efca76d40f6b413f39635b4137685d6279bf7a7dd002fadef28dab35a503fabf872c732a0f32fbff8c791fa9b4602299937aeae568d6137 SHA512 cedca889cd409e92484c15240fd8da91c655f81e38c6672d25e44feedc4adf6594281d92f7072fd11edc5c9f8589098226a3520e71e3441ee7a7acf97e1b2daa
DIST borgmatic-1.7.13.tar.gz 378163 BLAKE2B c20b384853c0ddf52a095250a05d9ebe813a23ee6ef00bd5748dacf05adcff9e4d324eb2e785ebbf139d34cadab3e58d3b8305d50ec5ff20681630040433e5ae SHA512 5109c093ad3096269e27abe761e6e87ebc31b78a56bfe16e540c686ea1cd935249d063aa7c350b60a3c509990065f3a50f9e4516d40d4a1bde68c43617de18b4
+DIST borgmatic-1.7.14.tar.gz 380875 BLAKE2B c30939392df03ce03feed4c5132ef99eaf9c676f51f7ad6b8bd536f45a7e76eff1871fc5bf0d7fd0025835b51325e961f538a661f2f6a78e0ce026550a9ecd84 SHA512 15f774b994d13ab224bcbcb0335145b5cf9a2fca04b098c15bf790c20fc5033073fe341a76d4e9dc8ad85e5fb898a0447c73fc5bc74d0ac9ec6900c333e6660b
DIST borgmatic-1.7.8.tar.gz 350233 BLAKE2B 3fcd392983f73ec5e97f0dc6b96e211d7f1e1d1a4ce95c635c675cf043e796925df53c30c1e4f8eb1a095d9ec5ff81e90edee5ff2576f4683053d3108004afd9 SHA512 bcc65fdb7ea1171fb61deda9b1f69a00596e1e10a99508d336977b694bd8f93d74837aad9211bf1065b785220aaf1460a3ea403bf23fa4873d1bf4c6b4016525
diff --git a/app-backup/borgmatic/borgmatic-1.7.14.ebuild b/app-backup/borgmatic/borgmatic-1.7.14.ebuild
new file mode 100644
index 000000000000..4cd57ed17ff4
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.7.14.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 systemd pypi
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+
+# borg is called as an external tool, hence no pythonic stuff
+RDEPEND="app-backup/borgbackup
+ $(python_gen_cond_dep '
+ <dev-python/colorama-0.5[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ <dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')"
+BDEPEND="
+ test? (
+ $(python_gen_cond_dep '
+ >=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
+ ')
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.13-no_test_coverage.patch
+ "${FILESDIR}"/${PN}-1.7.14-systemd_service_bin_path.patch
+)
+
+# A fragile test whose only purpose is to make sure the NEWS file
+# has been updated for the current version.
+EPYTEST_DESELECT=(
+ tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
+)
+
+distutils_enable_tests pytest
+
+src_install() {
+ distutils-r1_src_install
+ systemd_dounit sample/systemd/borgmatic.{service,timer}
+ keepdir /etc/borgmatic
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "To generate a sample configuration file, run:"
+ elog " generate-borgmatic-config"
+ else
+ local oldver
+ for oldver in ${REPLACING_VERSIONS}; do
+ if ver_test "${oldver}" -lt 1.7.11; then
+ ewarn "Since version 1.7.11 ${PN} defaults to a different way of selecting archives for multi-archive actions."
+ ewarn "For details, please see"
+ ewarn
+ ewarn " https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#archive-naming"
+ ewarn
+ break
+ fi
+ done
+ fi
+ elog
+ elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
+}
diff --git a/app-backup/borgmatic/files/borgmatic-1.7.14-systemd_service_bin_path.patch b/app-backup/borgmatic/files/borgmatic-1.7.14-systemd_service_bin_path.patch
new file mode 100644
index 000000000000..5e6f8b7482b5
--- /dev/null
+++ b/app-backup/borgmatic/files/borgmatic-1.7.14-systemd_service_bin_path.patch
@@ -0,0 +1,8 @@
+--- a/sample/systemd/borgmatic.service
++++ b/sample/systemd/borgmatic.service
+@@ -61,4 +61,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" --what="sleep:shutdown" --why="Prevent interrupting scheduled backup" /root/.local/bin/borgmatic --verbosity -2 --syslog-verbosity 1
++ExecStart=systemd-inhibit --who="borgmatic" --what="sleep:shutdown" --why="Prevent interrupting scheduled backup" /usr/bin/borgmatic --verbosity -2 --syslog-verbosity 1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/, app-backup/borgmatic/files/
@ 2023-08-22 11:05 Marek Szuba
0 siblings, 0 replies; 9+ messages in thread
From: Marek Szuba @ 2023-08-22 11:05 UTC (permalink / raw
To: gentoo-commits
commit: a84ec8293ff62abf2546c30a13b5bb67f7014b9c
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 10:51:16 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 10:51:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a84ec829
app-backup/borgmatic: drop 1.7.8
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-backup/borgmatic/Manifest | 1 -
app-backup/borgmatic/borgmatic-1.7.8.ebuild | 61 ----------------------
.../files/borgmatic-1.5.1-no_test_coverage.patch | 11 ----
.../borgmatic-1.7.3-systemd_service_bin_path.patch | 8 ---
4 files changed, 81 deletions(-)
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 3311519b9138..a8d371a5df67 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,3 +1,2 @@
DIST borgmatic-1.7.15.tar.gz 390819 BLAKE2B dc9086a0363afb8acbe943776cd6f388ba85a18e50554b5187c86e7054e7ff748ea878623d9b46c19564198faf5c566b137e54681812086115311970bc517455 SHA512 cf1f6da782a5ad547a76b9e4cb00cbd4ca4232cfb5dcd027c6fee9f1a3b97fda894f27c512007b449b8e11e939249060f63c3cdde29aee3aa86710200cf8d2db
-DIST borgmatic-1.7.8.tar.gz 350233 BLAKE2B 3fcd392983f73ec5e97f0dc6b96e211d7f1e1d1a4ce95c635c675cf043e796925df53c30c1e4f8eb1a095d9ec5ff81e90edee5ff2576f4683053d3108004afd9 SHA512 bcc65fdb7ea1171fb61deda9b1f69a00596e1e10a99508d336977b694bd8f93d74837aad9211bf1065b785220aaf1460a3ea403bf23fa4873d1bf4c6b4016525
DIST borgmatic-1.8.2.tar.gz 396972 BLAKE2B d9444ec49c3d325d865d553fa1cb28de9416aa36e999ef6452c62a9a6519e58afbc922398c52f3a1de441fd8da02e5618bc03a67baae161677a15a1780209788 SHA512 8de49c071c54516d0fb3f0d918f05226ac00519cc0605eacf204795a239554764fd1f3b0f44f3110fc551d6a89e92a59ca34ddebbfb02bf3deabc326f81ccf9c
diff --git a/app-backup/borgmatic/borgmatic-1.7.8.ebuild b/app-backup/borgmatic/borgmatic-1.7.8.ebuild
deleted file mode 100644
index c707d4ebecb2..000000000000
--- a/app-backup/borgmatic/borgmatic-1.7.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 systemd pypi
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
- $(python_gen_cond_dep '
- <dev-python/colorama-0.5[${PYTHON_USEDEP}]
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- <dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')"
-BDEPEND="
- test? (
- $(python_gen_cond_dep '
- >=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
- ')
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
- "${FILESDIR}"/${PN}-1.7.3-systemd_service_bin_path.patch
-)
-
-# A fragile test whose only purpose is to make sure the NEWS file
-# has been updated for the current version.
-EPYTEST_DESELECT=(
- tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
-)
-
-distutils_enable_tests pytest
-
-src_install() {
- distutils-r1_src_install
- systemd_dounit sample/systemd/borgmatic.{service,timer}
- keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "To generate a sample configuration file, run:"
- elog " generate-borgmatic-config"
- fi
- elog
- elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
-}
diff --git a/app-backup/borgmatic/files/borgmatic-1.5.1-no_test_coverage.patch b/app-backup/borgmatic/files/borgmatic-1.5.1-no_test_coverage.patch
deleted file mode 100644
index 28562398a407..000000000000
--- a/app-backup/borgmatic/files/borgmatic-1.5.1-no_test_coverage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- filterwarnings =
- ignore:Coverage disabled.*:pytest.PytestWarning
-
diff --git a/app-backup/borgmatic/files/borgmatic-1.7.3-systemd_service_bin_path.patch b/app-backup/borgmatic/files/borgmatic-1.7.3-systemd_service_bin_path.patch
deleted file mode 100644
index 25b283777408..000000000000
--- a/app-backup/borgmatic/files/borgmatic-1.7.3-systemd_service_bin_path.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/sample/systemd/borgmatic.service
-+++ b/sample/systemd/borgmatic.service
-@@ -61,4 +61,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" --what="sleep:shutdown" --why="Prevent interrupting scheduled backup" /root/.local/bin/borgmatic --verbosity -1 --syslog-verbosity 1
-+ExecStart=systemd-inhibit --who="borgmatic" --what="sleep:shutdown" --why="Prevent interrupting scheduled backup" /usr/bin/borgmatic --verbosity -1 --syslog-verbosity 1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/, app-backup/borgmatic/files/
@ 2024-07-03 14:47 Petr Vaněk
0 siblings, 0 replies; 9+ messages in thread
From: Petr Vaněk @ 2024-07-03 14:47 UTC (permalink / raw
To: gentoo-commits
commit: 77d6f53f807e6dc56c885c9829a5a6a3612127d6
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 3 14:40:40 2024 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 14:47:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d6f53f
app-backup/borgmatic: add 1.8.12, enable py3.13
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
app-backup/borgmatic/Manifest | 1 +
app-backup/borgmatic/borgmatic-1.8.12.ebuild | 81 ++++++++++++++++++++++
.../files/borgmatic-1.8.12-datetime-utc.patch | 20 ++++++
3 files changed, 102 insertions(+)
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 4e03e8260e60..a4e887164116 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,4 +1,5 @@
DIST borgmatic-1.8.10.tar.gz 599453 BLAKE2B 1ae994d452d29139d23940500d7c9f01e7fc1ddbd36254bf0c36d7f56064ccba7fb8434741dd0114d42271eb241098a12f8a07b83046447ae2225f7cd2ab12ae SHA512 10f5d962f6d25ef42ba4d076e238e1986dcfcd9832b3eea08560f367524824fdb0f80f42962ea6a471d711c6a0e293669b85abdc160475c20eed851ce7ad7f42
DIST borgmatic-1.8.11.tar.gz 600265 BLAKE2B 04c5e419de892e636e644185681c3e9ce0ca2dd9b62a043dfdabd38a32ca2f101f6a845fd1ebc68a025625066ea9c53aff9ab1e831a2aeaa566bccb7ec4827c7 SHA512 da19a341713302378409c0e90395a0e5ac4759b1ef593fe53a50113a0c90f130af060d38f49dae80018b8d8605da87415b841fedfc2d2778eee4a690aa5cc311
+DIST borgmatic-1.8.12.tar.gz 602369 BLAKE2B 79589e1510be9065d70b48ac5b8ce83a8d82776040cfe0ec833e7c9cbc33e4d285a2292870e2237902900ebb03204c6aafd702a2729b8860aec234429ec00921 SHA512 9cb91a4e7047da4effff69dfaea2358bd0d0897197d306775a3e9e260a2da6cc183c7675e02885fcd3d853c185171372371638b482b3e8b2f1bfcbcb2a14e4b7
DIST borgmatic-1.8.8.tar.gz 589575 BLAKE2B 09a3ca616bd1cf5fcc6c773d8066357d764b44230d691b7afa90bb1fdbce3aa3bfaac509e921adaa9086ba60310b24d1f2ba186849853c8f04e2a85c4b0ec94f SHA512 3984f6e34f8aed5c57df22799e60724903bfcec833e5c3215ad731977b7d376f36129fabd489c166f945d7103f272bcc132a9ea49010552001794b57f27fb5d5
DIST borgmatic-1.8.9.tar.gz 592715 BLAKE2B 3586404985b8cc0d5575f570ba6679c406e95b83453a7c2414872049067b1736010b9f8498fa92e91d281b1cdf75882bc09e40d6d9e443bff33c399ee1392ff9 SHA512 05386f6321d78e304030ebb78c495aee53a1b6f17241f101e73a097aa4208ac641d6105b1e8161cf714b2eab7c34fe682e082e9e997dc4ac6a6a4207253e8421
diff --git a/app-backup/borgmatic/borgmatic-1.8.12.ebuild b/app-backup/borgmatic/borgmatic-1.8.12.ebuild
new file mode 100644
index 000000000000..cac1b9a834e8
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.8.12.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 systemd pypi
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+IUSE="apprise"
+
+REQUIRED_USE="test? ( apprise )"
+
+# borg is called as an external tool, hence no pythonic stuff
+RDEPEND="app-backup/borgbackup
+ $(python_gen_cond_dep '
+ <dev-python/colorama-0.5[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+ ')
+ apprise? ( $(python_gen_cond_dep '
+ dev-python/apprise[${PYTHON_USEDEP}]
+ ') )"
+BDEPEND="
+ test? (
+ $(python_gen_cond_dep '
+ >=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
+ ')
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.13-no_test_coverage.patch
+ "${FILESDIR}"/${PN}-1.7.14-systemd_service_bin_path.patch
+ # fix for py3.10
+ "${FILESDIR}"/${PN}-1.8.12-datetime-utc.patch
+)
+
+# A fragile test whose only purpose is to make sure the NEWS file
+# has been updated for the current version.
+EPYTEST_DESELECT=(
+ tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
+)
+
+distutils_enable_tests pytest
+
+src_install() {
+ distutils-r1_src_install
+ systemd_dounit sample/systemd/borgmatic.{service,timer}
+ keepdir /etc/borgmatic
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "To generate a sample configuration file, run:"
+ elog " ${PN} config generate"
+ else
+ local oldver
+ for oldver in ${REPLACING_VERSIONS}; do
+ if ver_test "${oldver}" -lt 1.8.0; then
+ ewarn "Please be warned that ${PN}-1.8.0 has introduced several breaking changes."
+ ewarn "For details, please see"
+ ewarn
+ ewarn " https://github.com/borgmatic-collective/borgmatic/releases/tag/1.8.0"
+ ewarn
+ break
+ fi
+ done
+ fi
+ elog
+ elog "Systemd users wishing to periodically run ${PN} can use the provided timer and service units."
+}
diff --git a/app-backup/borgmatic/files/borgmatic-1.8.12-datetime-utc.patch b/app-backup/borgmatic/files/borgmatic-1.8.12-datetime-utc.patch
new file mode 100644
index 000000000000..4a3505976f90
--- /dev/null
+++ b/app-backup/borgmatic/files/borgmatic-1.8.12-datetime-utc.patch
@@ -0,0 +1,20 @@
+From f5a1dd31c8e5807e52196ecfd337c22e0f197bf5 Mon Sep 17 00:00:00 2001
+From: Dan Helfman <witten@torsion.org>
+Date: Sun, 23 Jun 2024 18:28:41 -0700
+Subject: [PATCH] Fix PagerDuty hook traceback with Python < 3.10 (#886).
+
+https://github.com/borgmatic-collective/borgmatic/commit/f5a1dd31c8e5807e52196ecfd337c22e0f197bf5
+
+diff --git a/borgmatic/hooks/pagerduty.py b/borgmatic/hooks/pagerduty.py
+index 6ec1a6ef..e9e34da0 100644
+--- a/borgmatic/hooks/pagerduty.py
++++ b/borgmatic/hooks/pagerduty.py
+@@ -40,7 +40,7 @@ def ping_monitor(hook_config, config, config_filename, state, monitoring_log_lev
+ return
+
+ hostname = platform.node()
+- local_timestamp = datetime.datetime.now(datetime.UTC).astimezone().isoformat()
++ local_timestamp = datetime.datetime.now(datetime.timezone.utc).astimezone().isoformat()
+ payload = json.dumps(
+ {
+ 'routing_key': hook_config['integration_key'],
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-07-03 14:47 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-27 17:29 [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/, app-backup/borgmatic/files/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2024-07-03 14:47 Petr Vaněk
2023-08-22 11:05 Marek Szuba
2023-06-07 21:59 Marek Szuba
2023-05-19 8:37 Marek Szuba
2023-05-11 12:30 Marek Szuba
2022-10-13 9:31 Marek Szuba
2021-10-12 23:03 Marek Szuba
2020-03-25 16:57 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox