Re: update py-carbon

2019-02-18 Thread Martijn van Duren 
ping

On 1/24/19 1:29 PM, Martijn van Duren wrote:
> ping
> 
> On 11/28/18 1:56 PM, Martijn van Duren wrote:
>> So something like this?
>> I'll send py-cachetools in a separate diff.
>>
>> On 11/28/18 12:07 PM, Stuart Henderson wrote:
>>> On 2018/11/28 08:25, Martijn van Duren wrote:
 On 11/27/18 2:36 PM, Daniel Jakots wrote:
> On Tue, 27 Nov 2018 12:43:52 +0100, Martijn van Duren
>  wrote:
>
>> Here's an update to databases/py-carbon.
>> There's experimental support for python3, but I haven't included it
>> here because of other dependencies which don't yet have python3
>> support in our tree.
>
> Which one(s)?
>
 I must have goofed somewhere. It's not py-carbon directly which has
 "issues", but py-whisper. But let's safe that discussion for that
 threat.

 Here's an updated diff. I don't know whether mostly executable
 python packages should be moved to python3, or if they still
 should come in flavors, so I just made it a flavor, so we can
 quite easily dumb it down again if we just want python3.
>>>
>>> If it's actually useful as a library then it might be worth considering
>>> whether to subpackage it - have the executables as a separate package
>>> only built with the python3 flavour.
>>>
>>> But if (as COMMENT implies) it's only really useful as daemon/utilties
>>> then I'd much prefer to just switch to py3 outright. This cuts a lot of
>>> complexity from Makefile, patches and PLIST, and makes it so all users
>>> are on recent python (rather than the "default" being old python).
>>>
 Note: carbon-aggregator{,-cache} doesn't work because it misses
 py-cachetools, but people could get that themselves via pip, or it
 could be added as a package in the future, so I left the plumbing in
 as is.
>>>
>>> Hmm. People shouldn't be installing via pip to make packages work3
>>> I'd prefer to either port the dep, or @comment the files that need it.
>>>
 @@ -108,3 +121,13 @@ share/examples/graphite/whitelist.conf.e
  @sample /var/graphite/storage/whisper/
  @owner
  @group
 +storage/
 +storage/ceres/
 +storage/ceres/dummy.txt/
 +storage/lists/
 +storage/log/
 +storage/log/dummy.txt/
 +storage/rrd/
 +storage/rrd/dummy.txt/
 +storage/whisper/
 +storage/whisper/dummy.txt/
>>>
>>> It feels like these /usr/local/storage directories should not be installed,
>>> they are already @sample'd under /var/graphite/storage so I think should 
>>> just
>>> be rm'd. But there are some missing @extra or @extraunexec that would be
>>> needed for pkg_delete -c to correctly remove files generated in this tree.
>>>
>>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/devel/quirks/Makefile,v
>> retrieving revision 1.651
>> diff -u -p -r1.651 Makefile
>> --- Makefile 27 Nov 2018 15:24:15 -  1.651
>> +++ Makefile 28 Nov 2018 12:54:48 -
>> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
>>  DISTFILES =
>>  
>>  # API.rev
>> -PKGNAME =   quirks-3.44
>> +PKGNAME =   quirks-3.45
>>  PKG_ARCH =  *
>>  MAINTAINER =Marc Espie 
>>  
>> Index: files/Quirks.pm
>> ===
>> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
>> retrieving revision 1.665
>> diff -u -p -r1.665 Quirks.pm
>> --- files/Quirks.pm  27 Nov 2018 15:24:15 -  1.665
>> +++ files/Quirks.pm  28 Nov 2018 12:54:48 -
>> @@ -288,6 +288,7 @@ my $stem_extensions = {
>>  'py-pafy' => 'py3-pafy',
>>  'py-libmagic' => 'py-magic',
>>  'py3-libmagic' => 'py3-magic',
>> +'py-carbon' => 'py3-carbon',
>>  };
>>  
>>  my $obsolete_reason = {
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/databases/py-carbon/Makefile,v
>> retrieving revision 1.9
>> diff -u -p -r1.9 Makefile
>> --- Makefile 1 Nov 2017 10:44:39 -   1.9
>> +++ Makefile 28 Nov 2018 12:54:15 -
>> @@ -2,12 +2,11 @@
>>  
>>  COMMENT=backend data caching and persistence daemon for Graphite
>>  
>> -MODPY_EGG_VERSION=  1.0.1
>> +MODPY_EGG_VERSION=  1.1.4
>>  
>>  DISTNAME=   carbon-${MODPY_EGG_VERSION}
>>  PKGNAME=py-${DISTNAME}
>>  CATEGORIES= databases
>> -REVISION=   0
>>  
>>  # Apache
>>  PERMIT_PACKAGE_CDROM=   Yes
>> @@ -16,19 +15,26 @@ MODULES= lang/python
>>  MODPY_PI =  Yes
>>  
>>  BUILD_DEPENDS=  ${RUN_DEPENDS}
>> -RUN_DEPENDS=databases/py-whisper \
>> -devel/py-twisted
>> +RUN_DEPENDS=databases/py-whisper${MODPY_FLAVOR} \
>> +devel/py-cachetools${MODPY_FLAVOR} \
>> +devel/py-twisted${MODPY_FLAVOR} \
>> +www/py-urllib3${MODPY_FLAVOR}
>>  
>> -BIN_FILES=  carbon-aggregator.py carbon-cache.py carbon-client.py \
>> -

Re: update py-carbon

2019-01-24 Thread Martijn van Duren 
ping

On 11/28/18 1:56 PM, Martijn van Duren wrote:
> So something like this?
> I'll send py-cachetools in a separate diff.
> 
> On 11/28/18 12:07 PM, Stuart Henderson wrote:
>> On 2018/11/28 08:25, Martijn van Duren wrote:
>>> On 11/27/18 2:36 PM, Daniel Jakots wrote:
 On Tue, 27 Nov 2018 12:43:52 +0100, Martijn van Duren
  wrote:

> Here's an update to databases/py-carbon.
> There's experimental support for python3, but I haven't included it
> here because of other dependencies which don't yet have python3
> support in our tree.

 Which one(s)?

>>> I must have goofed somewhere. It's not py-carbon directly which has
>>> "issues", but py-whisper. But let's safe that discussion for that
>>> threat.
>>>
>>> Here's an updated diff. I don't know whether mostly executable
>>> python packages should be moved to python3, or if they still
>>> should come in flavors, so I just made it a flavor, so we can
>>> quite easily dumb it down again if we just want python3.
>>
>> If it's actually useful as a library then it might be worth considering
>> whether to subpackage it - have the executables as a separate package
>> only built with the python3 flavour.
>>
>> But if (as COMMENT implies) it's only really useful as daemon/utilties
>> then I'd much prefer to just switch to py3 outright. This cuts a lot of
>> complexity from Makefile, patches and PLIST, and makes it so all users
>> are on recent python (rather than the "default" being old python).
>>
>>> Note: carbon-aggregator{,-cache} doesn't work because it misses
>>> py-cachetools, but people could get that themselves via pip, or it
>>> could be added as a package in the future, so I left the plumbing in
>>> as is.
>>
>> Hmm. People shouldn't be installing via pip to make packages work3
>> I'd prefer to either port the dep, or @comment the files that need it.
>>
>>> @@ -108,3 +121,13 @@ share/examples/graphite/whitelist.conf.e
>>>  @sample /var/graphite/storage/whisper/
>>>  @owner
>>>  @group
>>> +storage/
>>> +storage/ceres/
>>> +storage/ceres/dummy.txt/
>>> +storage/lists/
>>> +storage/log/
>>> +storage/log/dummy.txt/
>>> +storage/rrd/
>>> +storage/rrd/dummy.txt/
>>> +storage/whisper/
>>> +storage/whisper/dummy.txt/
>>
>> It feels like these /usr/local/storage directories should not be installed,
>> they are already @sample'd under /var/graphite/storage so I think should just
>> be rm'd. But there are some missing @extra or @extraunexec that would be
>> needed for pkg_delete -c to correctly remove files generated in this tree.
>>
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.651
> diff -u -p -r1.651 Makefile
> --- Makefile  27 Nov 2018 15:24:15 -  1.651
> +++ Makefile  28 Nov 2018 12:54:48 -
> @@ -5,7 +5,7 @@ CATEGORIES =  devel databases
>  DISTFILES =
>  
>  # API.rev
> -PKGNAME =quirks-3.44
> +PKGNAME =quirks-3.45
>  PKG_ARCH =   *
>  MAINTAINER = Marc Espie 
>  
> Index: files/Quirks.pm
> ===
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.665
> diff -u -p -r1.665 Quirks.pm
> --- files/Quirks.pm   27 Nov 2018 15:24:15 -  1.665
> +++ files/Quirks.pm   28 Nov 2018 12:54:48 -
> @@ -288,6 +288,7 @@ my $stem_extensions = {
>   'py-pafy' => 'py3-pafy',
>   'py-libmagic' => 'py-magic',
>   'py3-libmagic' => 'py3-magic',
> + 'py-carbon' => 'py3-carbon',
>  };
>  
>  my $obsolete_reason = {
> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/py-carbon/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile  1 Nov 2017 10:44:39 -   1.9
> +++ Makefile  28 Nov 2018 12:54:15 -
> @@ -2,12 +2,11 @@
>  
>  COMMENT= backend data caching and persistence daemon for Graphite
>  
> -MODPY_EGG_VERSION=   1.0.1
> +MODPY_EGG_VERSION=   1.1.4
>  
>  DISTNAME=carbon-${MODPY_EGG_VERSION}
>  PKGNAME= py-${DISTNAME}
>  CATEGORIES=  databases
> -REVISION=0
>  
>  # Apache
>  PERMIT_PACKAGE_CDROM=Yes
> @@ -16,19 +15,26 @@ MODULES=  lang/python
>  MODPY_PI =   Yes
>  
>  BUILD_DEPENDS=   ${RUN_DEPENDS}
> -RUN_DEPENDS= databases/py-whisper \
> - devel/py-twisted
> +RUN_DEPENDS= databases/py-whisper${MODPY_FLAVOR} \
> + devel/py-cachetools${MODPY_FLAVOR} \
> + devel/py-twisted${MODPY_FLAVOR} \
> + www/py-urllib3${MODPY_FLAVOR}
>  
> -BIN_FILES=   carbon-aggregator.py carbon-cache.py carbon-client.py \
> - carbon-relay.py validate-storage-schemas.py
> +PYBINS=  carbon-aggregator carbon-aggregator-cache 
> carbon-cache \
> + carbon-client

Re: update py-carbon

2018-11-28 Thread Martijn van Duren 
So something like this?
I'll send py-cachetools in a separate diff.

On 11/28/18 12:07 PM, Stuart Henderson wrote:
> On 2018/11/28 08:25, Martijn van Duren wrote:
>> On 11/27/18 2:36 PM, Daniel Jakots wrote:
>>> On Tue, 27 Nov 2018 12:43:52 +0100, Martijn van Duren
>>>  wrote:
>>>
 Here's an update to databases/py-carbon.
 There's experimental support for python3, but I haven't included it
 here because of other dependencies which don't yet have python3
 support in our tree.
>>>
>>> Which one(s)?
>>>
>> I must have goofed somewhere. It's not py-carbon directly which has
>> "issues", but py-whisper. But let's safe that discussion for that
>> threat.
>>
>> Here's an updated diff. I don't know whether mostly executable
>> python packages should be moved to python3, or if they still
>> should come in flavors, so I just made it a flavor, so we can
>> quite easily dumb it down again if we just want python3.
> 
> If it's actually useful as a library then it might be worth considering
> whether to subpackage it - have the executables as a separate package
> only built with the python3 flavour.
> 
> But if (as COMMENT implies) it's only really useful as daemon/utilties
> then I'd much prefer to just switch to py3 outright. This cuts a lot of
> complexity from Makefile, patches and PLIST, and makes it so all users
> are on recent python (rather than the "default" being old python).
> 
>> Note: carbon-aggregator{,-cache} doesn't work because it misses
>> py-cachetools, but people could get that themselves via pip, or it
>> could be added as a package in the future, so I left the plumbing in
>> as is.
> 
> Hmm. People shouldn't be installing via pip to make packages work3
> I'd prefer to either port the dep, or @comment the files that need it.
> 
>> @@ -108,3 +121,13 @@ share/examples/graphite/whitelist.conf.e
>>  @sample /var/graphite/storage/whisper/
>>  @owner
>>  @group
>> +storage/
>> +storage/ceres/
>> +storage/ceres/dummy.txt/
>> +storage/lists/
>> +storage/log/
>> +storage/log/dummy.txt/
>> +storage/rrd/
>> +storage/rrd/dummy.txt/
>> +storage/whisper/
>> +storage/whisper/dummy.txt/
> 
> It feels like these /usr/local/storage directories should not be installed,
> they are already @sample'd under /var/graphite/storage so I think should just
> be rm'd. But there are some missing @extra or @extraunexec that would be
> needed for pkg_delete -c to correctly remove files generated in this tree.
> 

Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.651
diff -u -p -r1.651 Makefile
--- Makefile27 Nov 2018 15:24:15 -  1.651
+++ Makefile28 Nov 2018 12:54:48 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-3.44
+PKGNAME =  quirks-3.45
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.665
diff -u -p -r1.665 Quirks.pm
--- files/Quirks.pm 27 Nov 2018 15:24:15 -  1.665
+++ files/Quirks.pm 28 Nov 2018 12:54:48 -
@@ -288,6 +288,7 @@ my $stem_extensions = {
'py-pafy' => 'py3-pafy',
'py-libmagic' => 'py-magic',
'py3-libmagic' => 'py3-magic',
+   'py-carbon' => 'py3-carbon',
 };
 
 my $obsolete_reason = {
Index: Makefile
===
RCS file: /cvs/ports/databases/py-carbon/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile1 Nov 2017 10:44:39 -   1.9
+++ Makefile28 Nov 2018 12:54:15 -
@@ -2,12 +2,11 @@
 
 COMMENT=   backend data caching and persistence daemon for Graphite
 
-MODPY_EGG_VERSION= 1.0.1
+MODPY_EGG_VERSION= 1.1.4
 
 DISTNAME=  carbon-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 CATEGORIES=databases
-REVISION=  0
 
 # Apache
 PERMIT_PACKAGE_CDROM=  Yes
@@ -16,19 +15,26 @@ MODULES=lang/python
 MODPY_PI = Yes
 
 BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS=   databases/py-whisper \
-   devel/py-twisted
+RUN_DEPENDS=   databases/py-whisper${MODPY_FLAVOR} \
+   devel/py-cachetools${MODPY_FLAVOR} \
+   devel/py-twisted${MODPY_FLAVOR} \
+   www/py-urllib3${MODPY_FLAVOR}
 
-BIN_FILES= carbon-aggregator.py carbon-cache.py carbon-client.py \
-   carbon-relay.py validate-storage-schemas.py
+PYBINS=carbon-aggregator carbon-aggregator-cache 
carbon-cache \
+   carbon-client carbon-relay validate-storage-schemas
 
-.for b in ${BIN_FILES}
-MODPY_ADJ_FILES+=  bin/$b
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
+
+.for b in ${PYBINS}
+MODPY_ADJ_FILES+=

Re: update py-carbon

2018-11-28 Thread Stuart Henderson 
On 2018/11/28 08:25, Martijn van Duren wrote:
> On 11/27/18 2:36 PM, Daniel Jakots wrote:
> > On Tue, 27 Nov 2018 12:43:52 +0100, Martijn van Duren
> >  wrote:
> > 
> >> Here's an update to databases/py-carbon.
> >> There's experimental support for python3, but I haven't included it
> >> here because of other dependencies which don't yet have python3
> >> support in our tree.
> > 
> > Which one(s)?
> > 
> I must have goofed somewhere. It's not py-carbon directly which has
> "issues", but py-whisper. But let's safe that discussion for that
> threat.
> 
> Here's an updated diff. I don't know whether mostly executable
> python packages should be moved to python3, or if they still
> should come in flavors, so I just made it a flavor, so we can
> quite easily dumb it down again if we just want python3.

If it's actually useful as a library then it might be worth considering
whether to subpackage it - have the executables as a separate package
only built with the python3 flavour.

But if (as COMMENT implies) it's only really useful as daemon/utilties
then I'd much prefer to just switch to py3 outright. This cuts a lot of
complexity from Makefile, patches and PLIST, and makes it so all users
are on recent python (rather than the "default" being old python).

> Note: carbon-aggregator{,-cache} doesn't work because it misses
> py-cachetools, but people could get that themselves via pip, or it
> could be added as a package in the future, so I left the plumbing in
> as is.

Hmm. People shouldn't be installing via pip to make packages work3
I'd prefer to either port the dep, or @comment the files that need it.

> @@ -108,3 +121,13 @@ share/examples/graphite/whitelist.conf.e
>  @sample /var/graphite/storage/whisper/
>  @owner
>  @group
> +storage/
> +storage/ceres/
> +storage/ceres/dummy.txt/
> +storage/lists/
> +storage/log/
> +storage/log/dummy.txt/
> +storage/rrd/
> +storage/rrd/dummy.txt/
> +storage/whisper/
> +storage/whisper/dummy.txt/

It feels like these /usr/local/storage directories should not be installed,
they are already @sample'd under /var/graphite/storage so I think should just
be rm'd. But there are some missing @extra or @extraunexec that would be
needed for pkg_delete -c to correctly remove files generated in this tree.

Re: update py-carbon

2018-11-27 Thread Martijn van Duren 
On 11/27/18 2:36 PM, Daniel Jakots wrote:
> On Tue, 27 Nov 2018 12:43:52 +0100, Martijn van Duren
>  wrote:
> 
>> Here's an update to databases/py-carbon.
>> There's experimental support for python3, but I haven't included it
>> here because of other dependencies which don't yet have python3
>> support in our tree.
> 
> Which one(s)?
> 
I must have goofed somewhere. It's not py-carbon directly which has
"issues", but py-whisper. But let's safe that discussion for that
threat.

Here's an updated diff. I don't know whether mostly executable
python packages should be moved to python3, or if they still
should come in flavors, so I just made it a flavor, so we can
quite easily dumb it down again if we just want python3.

Note: carbon-aggregator{,-cache} doesn't work because it misses
py-cachetools, but people could get that themselves via pip, or it
could be added as a package in the future, so I left the plumbing in
as is.

martijn@

Index: Makefile
===
RCS file: /cvs/ports/databases/py-carbon/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile1 Nov 2017 10:44:39 -   1.9
+++ Makefile28 Nov 2018 07:22:54 -
@@ -2,12 +2,11 @@
 
 COMMENT=   backend data caching and persistence daemon for Graphite
 
-MODPY_EGG_VERSION= 1.0.1
+MODPY_EGG_VERSION= 1.1.4
 
 DISTNAME=  carbon-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 CATEGORIES=databases
-REVISION=  0
 
 # Apache
 PERMIT_PACKAGE_CDROM=  Yes
@@ -16,25 +15,45 @@ MODULES=lang/python
 MODPY_PI = Yes
 
 BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS=   databases/py-whisper \
-   devel/py-twisted
+RUN_DEPENDS=   databases/py-whisper${MODPY_FLAVOR} \
+   devel/py-twisted${MODPY_FLAVOR} \
+   www/py-urllib3${MODPY_FLAVOR}
 
-BIN_FILES= carbon-aggregator.py carbon-cache.py carbon-client.py \
-   carbon-relay.py validate-storage-schemas.py
+PYBINS=carbon-aggregator carbon-aggregator-cache 
carbon-cache \
+   carbon-client carbon-relay validate-storage-schemas
 
-.for b in ${BIN_FILES}
-MODPY_ADJ_FILES+=  bin/$b
+FLAVORS=   python3
+FLAVOR?=
+
+.for b in ${PYBINS}
+MODPY_ADJ_FILES+=  bin/$b.py
 .endfor
 
 GRAPHITE_EGDIR=${PREFIX}/share/examples/graphite/
 
-SUBST_VARS+=   GRAPHITE_EGDIR MODPY_SITEPKG
+MODPY_RC_SUFFIX=   ${MODPY_BIN_SUFFIX:S/-//1}
+
+SUBST_VARS+=   GRAPHITE_EGDIR MODPY_SITEPKG MODPY_RC_SUFFIX \
+   MODPY_BIN_SUFFIX
 
 NO_TEST=   Yes
 
+PYPKGNAME= ${MODPY_PY_PREFIX}carbon
+
 pre-configure:
${SUBST_CMD} ${WRKSRC}/setup.{cfg,py} ${WRKSRC}/lib/carbon/conf.py \
-   ${WRKSRC}/bin/validate-storage-schemas.py
+   ${WRKSRC}/bin/validate-storage-schemas.py \
+   ${WRKSRC}/lib/twisted/plugins/carbon_aggregator_cache_plugin.py 
\
+   ${WRKSRC}/lib/twisted/plugins/carbon_aggregator_plugin.py \
+   ${WRKSRC}/lib/twisted/plugins/carbon_cache_plugin.py \
+   ${WRKSRC}/lib/twisted/plugins/carbon_relay_plugin.py
rm 
${WRKSRC}/{bin/validate-storage-schemas,lib/carbon/conf}.py.{orig,beforesubst}
+
+post-install:
+.for b in ${PYBINS}
+   mv -f ${PREFIX}/bin/$b.py ${PREFIX}/bin/$b${MODPY_BIN_SUFFIX}.py
+.endfor
+   mv -f ${PREFIX}/share/examples/graphite \
+   ${PREFIX}/share/examples/${MODPY_PY_PREFIX}graphite
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/databases/py-carbon/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo8 Jul 2017 16:09:46 -   1.3
+++ distinfo28 Nov 2018 07:22:54 -
@@ -1,2 +1,2 @@
-SHA256 (carbon-1.0.1.tar.gz) = JbScsdVAFC38wAY4IwjGO5Ic+J0s2EhhHkmHTN1ciUU=
-SIZE (carbon-1.0.1.tar.gz) = 61444
+SHA256 (carbon-1.1.4.tar.gz) = G3DjSsDwvTKgPuFOrx7SyFfiCJhPyXYfWalcIcUmRRM=
+SIZE (carbon-1.1.4.tar.gz) = 71819
Index: patches/patch-bin_validate-storage-schemas_py
===
RCS file: 
/cvs/ports/databases/py-carbon/patches/patch-bin_validate-storage-schemas_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-bin_validate-storage-schemas_py
--- patches/patch-bin_validate-storage-schemas_py   11 Oct 2012 18:00:30 
-  1.1.1.1
+++ patches/patch-bin_validate-storage-schemas_py   28 Nov 2018 07:22:54 
-
@@ -1,12 +1,13 @@
 $OpenBSD: patch-bin_validate-storage-schemas_py,v 1.1.1.1 2012/10/11 18:00:30 
jasper Exp $
 bin/validate-storage-schemas.py.orig   Thu Oct 11 19:15:55 2012
-+++ bin/validate-storage-schemas.pyThu Oct 11 19:16:45 2012
-@@ -22,7 +22,7 @@ if len(sys.argv) == 2:
+Index:

Re: update py-carbon

2018-11-27 Thread Daniel Jakots 
On Tue, 27 Nov 2018 12:43:52 +0100, Martijn van Duren
 wrote:

> Here's an update to databases/py-carbon.
> There's experimental support for python3, but I haven't included it
> here because of other dependencies which don't yet have python3
> support in our tree.

Which one(s)?


Cheers,
Daniel

update py-carbon

2018-11-27 Thread Martijn van Duren 
Currently I'm working at getting nice graphs in my icinga-web2 output,  
which requires graphite. Before I'm ready to submit graphite-web and
icinga-web2-graphite I would like to get some things out so I can keep
better focus.

Here's an update to databases/py-carbon.
There's experimental support for python3, but I haven't included it
here because of other dependencies which don't yet have python3
support in our tree.

Only tested with carbon-cache.
RC-scripts added for convenience.

major release notes found here:
https://graphite.readthedocs.io/en/latest/releases/1_1_1.html

OK?

martijn@

Index: Makefile
===
RCS file: /cvs/ports/databases/py-carbon/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile1 Nov 2017 10:44:39 -   1.9
+++ Makefile27 Nov 2018 10:57:35 -
@@ -2,12 +2,11 @@
 
 COMMENT=   backend data caching and persistence daemon for Graphite
 
-MODPY_EGG_VERSION= 1.0.1
+MODPY_EGG_VERSION= 1.1.4
 
 DISTNAME=  carbon-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 CATEGORIES=databases
-REVISION=  0
 
 # Apache
 PERMIT_PACKAGE_CDROM=  Yes
@@ -17,10 +16,11 @@ MODPY_PI =  Yes
 
 BUILD_DEPENDS= ${RUN_DEPENDS}
 RUN_DEPENDS=   databases/py-whisper \
-   devel/py-twisted
+   devel/py-twisted \
+   www/py-urllib3
 
-BIN_FILES= carbon-aggregator.py carbon-cache.py carbon-client.py \
-   carbon-relay.py validate-storage-schemas.py
+BIN_FILES= carbon-aggregator.py carbon-aggregator-cache.py 
carbon-cache.py \
+   carbon-client.py carbon-relay.py 
validate-storage-schemas.py
 
 .for b in ${BIN_FILES}
 MODPY_ADJ_FILES+=  bin/$b
Index: distinfo
===
RCS file: /cvs/ports/databases/py-carbon/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo8 Jul 2017 16:09:46 -   1.3
+++ distinfo27 Nov 2018 10:57:35 -
@@ -1,2 +1,2 @@
-SHA256 (carbon-1.0.1.tar.gz) = JbScsdVAFC38wAY4IwjGO5Ic+J0s2EhhHkmHTN1ciUU=
-SIZE (carbon-1.0.1.tar.gz) = 61444
+SHA256 (carbon-1.1.4.tar.gz) = G3DjSsDwvTKgPuFOrx7SyFfiCJhPyXYfWalcIcUmRRM=
+SIZE (carbon-1.1.4.tar.gz) = 71819
Index: patches/patch-bin_validate-storage-schemas_py
===
RCS file: 
/cvs/ports/databases/py-carbon/patches/patch-bin_validate-storage-schemas_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-bin_validate-storage-schemas_py
--- patches/patch-bin_validate-storage-schemas_py   11 Oct 2012 18:00:30 
-  1.1.1.1
+++ patches/patch-bin_validate-storage-schemas_py   27 Nov 2018 10:57:35 
-
@@ -1,12 +1,13 @@
 $OpenBSD: patch-bin_validate-storage-schemas_py,v 1.1.1.1 2012/10/11 18:00:30 
jasper Exp $
 bin/validate-storage-schemas.py.orig   Thu Oct 11 19:15:55 2012
-+++ bin/validate-storage-schemas.pyThu Oct 11 19:16:45 2012
-@@ -22,7 +22,7 @@ if len(sys.argv) == 2:
+Index: bin/validate-storage-schemas.py
+--- bin/validate-storage-schemas.py.orig
 bin/validate-storage-schemas.py
+@@ -26,7 +26,7 @@ if len(sys.argv) == 2:
SCHEMAS_FILE = sys.argv[1]
-   print "Loading storage-schemas configuration from: '%s'" % SCHEMAS_FILE
+   print("Loading storage-schemas configuration from: '%s'" % SCHEMAS_FILE)
  else:
 -  SCHEMAS_FILE = realpath(join(dirname(__file__), '..', 'conf', 
'storage-schemas.conf'))
 +  SCHEMAS_FILE = '${SYSCONFDIR}/graphite/storage-schemas.conf'
-   print "Loading storage-schemas configuration from default location at: 
'%s'" % SCHEMAS_FILE
+   print("Loading storage-schemas configuration from default location at: 
'%s'" % SCHEMAS_FILE)
  
  config_parser = ConfigParser()
Index: patches/patch-lib_carbon_conf_py
===
RCS file: /cvs/ports/databases/py-carbon/patches/patch-lib_carbon_conf_py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-lib_carbon_conf_py
--- patches/patch-lib_carbon_conf_py8 Jul 2017 16:09:46 -   1.3
+++ patches/patch-lib_carbon_conf_py27 Nov 2018 10:57:35 -
@@ -2,15 +2,16 @@ $OpenBSD: patch-lib_carbon_conf_py,v 1.3
 Index: lib/carbon/conf.py
 --- lib/carbon/conf.py.orig
 +++ lib/carbon/conf.py
-@@ -545,6 +545,7 @@ def read_config(program, options, **kwargs):
+@@ -577,7 +577,7 @@ def read_config(program, options, **kwargs):
+ for name, value in kwargs.items():
  settings.setdefault(name, value)
  
- graphite_root = kwargs.get("ROOT_DIR")
+-graphite_root = kwargs.get("ROOT_DIR")
 +graphite_root = '/var/graphite/'
  if graphite_root is None:
  graphite_root = os.environ.get('GRAPHITE_ROOT')
  if graphite_root is None:
-@@ -555,7 +556,7 @@ def read_config(program, options, **kwargs):
+@@ -588,7 +588,7 @@