On 2022/02/23 07:05, Bjorn Ketelaars wrote:
> I just send a diff to ports@ for the addition of
> sysutils/borgbackup-1.2.0. As a result sysutils/borgmatic needs some
> attention.
>
> Comments/OK?
borgmatic wants an update to 1.5.23 so that it can use compact for 1.2.x.
Tests fail partway through as they want newer pytest but I think that's good
enough for now.
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/borgmatic/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile 2 Nov 2021 00:02:21 -0000 1.35
+++ Makefile 23 Feb 2022 11:41:44 -0000
@@ -2,9 +2,8 @@
COMMENT = wrapper for Borg to create and prune backups
-MODPY_EGG_VERSION = 1.5.13
+MODPY_EGG_VERSION = 1.5.23
DISTNAME = borgmatic-${MODPY_EGG_VERSION}
-REVISION = 0
MAINTAINER = Jasper Lievisse Adriaanse <[email protected]>
@@ -17,16 +16,16 @@ PERMIT_PACKAGE = Yes
MODULES = lang/python
MODPY_PI = Yes
+MODPY_PYTEST = Yes
MODPY_SETUPTOOLS = Yes
RUN_DEPENDS = devel/py-colorama${MODPY_FLAVOR} \
- devel/py-docopt${MODPY_FLAVOR} \
- sysutils/borgbackup \
- textproc/py-pykwalify${MODPY_FLAVOR} \
- textproc/py-ruamel.yaml${MODPY_FLAVOR} \
+ borgbackup-*:sysutils/borgbackup/1.1 \
+ devel/py-jsonschema${MODPY_FLAVOR} \
+ textproc/py-ruamel.yaml${MODPY_FLAVOR}>=0.15.0,<0.18.0 \
www/py-requests${MODPY_FLAVOR}
TEST_DEPENDS = devel/py-flexmock${MODPY_FLAVOR} \
- devel/py-test${MODPY_FLAVOR}
+ devel/py-test-cov${MODPY_FLAVOR}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/borgmatic/
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/borgmatic/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- distinfo 2 Apr 2021 10:27:40 -0000 1.28
+++ distinfo 23 Feb 2022 11:41:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (borgmatic-1.5.13.tar.gz) = g9chmvP2T72eskOVQbsgUNu9+FP7ijQLYxaM15wDaYg=
-SIZE (borgmatic-1.5.13.tar.gz) = 72469
+SHA256 (borgmatic-1.5.23.tar.gz) = pBJ3Ix3Al9qTxKL04fyb5FZ017cVw1EAg2KwoJBP/0I=
+SIZE (borgmatic-1.5.23.tar.gz) = 290506
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/sysutils/borgmatic/patches/patch-setup_py,v
retrieving revision 1.6
diff -u -p -r1.6 patch-setup_py
--- patches/patch-setup_py 28 Dec 2019 14:33:14 -0000 1.6
+++ patches/patch-setup_py 23 Feb 2022 11:41:44 -0000
@@ -6,10 +6,10 @@ Index: setup.py
+++ setup.py
@@ -34,7 +34,7 @@ setup(
'requests',
- 'ruamel.yaml>0.15.0,<0.17.0',
+ 'ruamel.yaml>0.15.0,<0.18.0',
'setuptools',
- 'colorama>=0.4.1,<0.5',
+ 'colorama',
),
include_package_data=True,
- )
+ python_requires='>3.7.0',
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/borgmatic/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST 24 Jul 2020 07:45:43 -0000 1.14
+++ pkg/PLIST 23 Feb 2022 11:41:44 -0000
@@ -22,11 +22,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}borg.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}check.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}compact.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}create.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}export_tar.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}extract.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}feature.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}flags.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
@@ -34,11 +37,15 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}mount.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}prune.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}umount.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/borg.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/check.py
+lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/compact.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/create.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/environment.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/export_tar.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/extract.py
+lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/feature.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/flags.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/info.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/init.py
@@ -46,6 +53,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/mount.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/prune.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/umount.py
+lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/version.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/
lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/${MODPY_PYCACHE}/
@@ -94,6 +102,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/borgmatic/hooks/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/hooks/${MODPY_PYCACHE}dump.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/hooks/${MODPY_PYCACHE}healthchecks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/borgmatic/hooks/${MODPY_PYCACHE}mongodb.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/hooks/${MODPY_PYCACHE}monitor.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/hooks/${MODPY_PYCACHE}mysql.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/hooks/${MODPY_PYCACHE}pagerduty.${MODPY_PYC_MAGIC_TAG}pyc
@@ -104,6 +113,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/borgmatic/hooks/dispatch.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/hooks/dump.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/hooks/healthchecks.py
+lib/python${MODPY_VERSION}/site-packages/borgmatic/hooks/mongodb.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/hooks/monitor.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/hooks/mysql.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/hooks/pagerduty.py
