On 2020/10/28 08:41, Martin Reindl wrote:
> Am 27.10.20 um 22:08 schrieb Stuart Henderson:
>
> > This can't work, it needs a python 3 version of the rrdtool bindings,
> > this is in the separate pypi project "rrdtool". As things stand
> > rrd2whisper will be broken.
> >
> > Port for that attached. OK to import? I have tested it by following
> > "usage" on https://github.com/commx/python-rrdtool and checking
> > produced rrd with "rrdtool dump". If that goes in, you can then change
> > this to RUN_DEPENDS=net/py-rrdtool${MODPY_FLAVOR} and rrd2whisper.py
> > should work again.
> >
> > I would put it in databases/, but rrdtool itself is already in net/
> > (which I consider the wrong subdirectory), so I'll just follow along with
> > that otherwise things get even more confusing :)
>
> Thanks, I ran the same test on arm64. OK to import.
>
I've imported it and added a py2 version so I could move across from the
older code in rrdtool main distfile. I've switched the existing py-whisper
to use it, here's a refreshed diff for your py-whisper update which is OK
with me.
Other than the /usr/local/storage dirs, your py-carbon update and the
associated quirks/Makefile changes are also OK with me.
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/py-whisper/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 28 Oct 2020 12:13:06 -0000 1.11
+++ Makefile 28 Oct 2020 12:17:09 -0000
@@ -1,23 +1,27 @@
# $OpenBSD: Makefile,v 1.11 2020/10/28 12:13:06 sthen Exp $
-COMMENT= fixed size round-robin style database
+COMMENT = fixed size round-robin style database
-MODPY_EGG_VERSION= 1.0.2
-REVISION= 0
+MODPY_EGG_VERSION= 1.1.7
-DISTNAME= whisper-${MODPY_EGG_VERSION}
-PKGNAME= py-${DISTNAME}
-CATEGORIES= databases
+DISTNAME = whisper-${MODPY_EGG_VERSION}
+PKGNAME = py-${DISTNAME}
+CATEGORIES = databases
# Apache
-PERMIT_PACKAGE= Yes
+PERMIT_PACKAGE = Yes
-MODULES= lang/python
+MODULES = lang/python
MODPY_PI = Yes
+MODPY_SETUPTOOLS = Yes
-RUN_DEPENDS= net/py-rrdtool${MODPY_FLAVOR}
+FLAVORS = python3
+FLAVOR = python3
-NO_TEST = Yes
+RUN_DEPENDS = net/py-rrdtool${MODPY_FLAVOR}
+
+TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR} \
+ devel/py-six${MODPY_FLAVOR}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/py-whisper/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 14 Nov 2017 15:59:27 -0000 1.6
+++ distinfo 28 Oct 2020 12:17:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (whisper-1.0.2.tar.gz) = Q9v7R9wUHBdKANjVYdsByfCZp18imTjJJ9fEQN2IK+w=
-SIZE (whisper-1.0.2.tar.gz) = 24064
+SHA256 (whisper-1.1.7.tar.gz) = huAeZudLW/6gbFNvCKpxuwfN3vrKbWqDUuKabt7gcSE=
+SIZE (whisper-1.1.7.tar.gz) = 37376
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/py-whisper/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 8 Jul 2017 16:09:17 -0000 1.4
+++ pkg/PLIST 28 Oct 2020 12:17:09 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2017/07/08 16:09:17 jasper Exp $
+@conflict py-whisper-*
+@pkgpath databases/py-whisper
bin/find-corrupt-whisper-files.py
bin/rrd2whisper.py
bin/update-storage-times.py
@@ -15,6 +17,12 @@ bin/whisper-resize.py
bin/whisper-set-aggregation-method.py
bin/whisper-set-xfilesfactor.py
bin/whisper-update.py
-lib/python${MODPY_VERSION}/site-packages/whisper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}whisper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/whisper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/whisper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/whisper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/whisper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/whisper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/whisper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/whisper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/whisper.py
-lib/python${MODPY_VERSION}/site-packages/whisper.pyc
