Hi,
With latest update of borgbackup, we broke borgmatic.
$ borgmatic -h
Traceback (most recent call last):
File "/usr/local/bin/borgmatic", line 11, in <module>
load_entry_point('borgmatic==1.3.2', 'console_scripts', 'borgmatic')()
File "/usr/local/lib/python3.7/site-packages/pkg_resources/__init__.py", line
489, in load_entry_point
return get_distribution(dist).load_entry_point(group, name)
File "/usr/local/lib/python3.7/site-packages/pkg_resources/__init__.py", line
2843, in load_entry_point
return ep.load()
File "/usr/local/lib/python3.7/site-packages/pkg_resources/__init__.py", line
2434, in load
return self.resolve()
File "/usr/local/lib/python3.7/site-packages/pkg_resources/__init__.py", line
2440, in resolve
module = __import__(self.module_name, fromlist=['__name__'], level=0)
File
"/usr/local/lib/python3.7/site-packages/borgmatic/commands/borgmatic.py", line
11, in <module>
from borgmatic.borg import (
File "/usr/local/lib/python3.7/site-packages/borgmatic/borg/create.py", line
7, in <module>
from borgmatic.borg.execute import execute_command
ModuleNotFoundError: No module named 'borgmatic.borg.execute'
So let's upgrade borgmatic to 1.3.5. but...
borgmatic now depends on colorama, and requires 'colorama>=0.4.1,<0.5'
version, whereas we have 0.3.7 in port, and this specific version is
required by awscli ('colorama>=0.2.5,<=0.3.9' exactly).
for I checked if borgmatic strongly requires 'colorama>=0.4.1,<0.5' or
not, and it seems fine with the version we have in port.
Please note I am using borgmatic, so if it breaks I am crying a lot (and
I write a patch like now).
Comments or OK ?
Thanks.
--
Sebastien Marie
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/borgmatic/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile 12 May 2019 15:53:55 -0000 1.19
+++ Makefile 19 May 2019 12:33:34 -0000
@@ -2,7 +2,7 @@
COMMENT = wrapper for Borg to create and prune backups
-MODPY_EGG_VERSION = 1.3.3
+MODPY_EGG_VERSION = 1.3.5
DISTNAME = borgmatic-${MODPY_EGG_VERSION}
MAINTAINER = Jasper Lievisse Adriaanse <jas...@openbsd.org>
@@ -19,7 +19,8 @@ MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
-RUN_DEPENDS = devel/py-docopt${MODPY_FLAVOR} \
+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}
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/borgmatic/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 12 May 2019 15:53:55 -0000 1.17
+++ distinfo 19 May 2019 12:28:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (borgmatic-1.3.3.tar.gz) = agdkycx08hen1UucqADMGgLUljpquaGzCplLnXWeZTs=
-SIZE (borgmatic-1.3.3.tar.gz) = 36978
+SHA256 (borgmatic-1.3.5.tar.gz) = Lsc3lfnhmOmAUOWF5SCFW0Hzv3ekzTbU8zOy7p06KVU=
+SIZE (borgmatic-1.3.5.tar.gz) = 38171
Index: patches/patch-setup_py
===================================================================
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-setup_py 19 May 2019 12:56:19 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+Permit to use the specific version of colorama we have in ports.
+
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -33,7 +33,7 @@ setup(
+ 'pykwalify>=1.6.0,<14.06',
+ 'ruamel.yaml>0.15.0,<0.16.0',
+ 'setuptools',
+- 'colorama>=0.4.1,<0.5',
++ 'colorama',
+ ),
+ include_package_data=True,
+ )
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/borgmatic/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 12 May 2019 15:53:55 -0000 1.9
+++ pkg/PLIST 19 May 2019 12:29:22 -0000
@@ -12,13 +12,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/borgmatic-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/borgmatic-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/borgmatic/__init__.py
-lib/python${MODPY_VERSION}/site-packages/borgmatic/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/borgmatic/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/borgmatic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/borgmatic/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/${MODPY_PYCACHE}signals.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/${MODPY_PYCACHE}verbosity.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/__init__.py
-lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}/
+${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}check.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}create.${MODPY_PYC_MAGIC_TAG}pyc
@@ -40,7 +41,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/prune.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/
lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/__init__.py
-lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/${MODPY_PYCACHE}borgmatic.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/${MODPY_PYCACHE}convert_config.${MODPY_PYC_MAGIC_TAG}pyc
@@ -54,7 +55,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/validate_config.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/config/
lib/python${MODPY_VERSION}/site-packages/borgmatic/config/__init__.py
-lib/python${MODPY_VERSION}/site-packages/borgmatic/config/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/borgmatic/config/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/borgmatic/config/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/config/${MODPY_PYCACHE}checks.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/config/${MODPY_PYCACHE}collect.${MODPY_PYC_MAGIC_TAG}pyc
@@ -71,6 +72,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/borgmatic/config/load.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/config/schema.yaml
lib/python${MODPY_VERSION}/site-packages/borgmatic/config/validate.py
+lib/python${MODPY_VERSION}/site-packages/borgmatic/logger.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/signals.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/verbosity.py
share/examples/borgmatic/
