Attachment #193922 for bug #228683




# $FreeBSD$

PORTNAME=	osprofiler
PORTVERSION=	1.15.2
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	alexander.nusov@nfvexpress.com
COMMENT=	OpenStack Profiler Library

LICENSE=	APACHE20
LICENSE_FILE=	${WRKSRC}/LICENSE
		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.13:net/py-netaddr@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${FLAVOR}

RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.13:net/py-netaddr@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}oslo.config>=3.2.0:devel/py-oslo.config@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=0:devel/py-oslo.serialization@${PY_FLAVOR}

USES=		python
USE_PYTHON=	autoplist concurrent distutils

NO_ARCH=	yes
PORTDOCS=	*

OPTIONS_DEFINE=	DOCS
DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} \
			${PYTHON_PKGNAMEPREFIX}openstackdocstheme>=0:textproc/py-openstackdocstheme@${PY_FLAVOR}
DOCS_VARS=		PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	(cd ${WRKSRC}/doc/build/html && \
		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
			"! -name .buildinfo -and ! -name objects.inv")

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)py-osprofiler/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1485281715	1	TIMESTAMP = 1527876497
2	SHA256 (osprofiler-1.5.0.tar.gz) = aee63cfd888e6049ea82535ce458ce4844b4ac893dcb18060eda24192505627e	2	SHA256 (osprofiler-1.15.2.tar.gz) = 7b5501af2027986cfa50ca4638a681f48425d72f231eea24ee7bfeccdb985f61
3	SIZE (osprofiler-1.5.0.tar.gz) = 72539	3	SIZE (osprofiler-1.15.2.tar.gz) = 80503




--- osprofiler/cmd/shell.py.orig	2018-03-14 17:31:26 UTC
+++ osprofiler/cmd/shell.py
@@ -54,7 +54,9 @@ class OSProfilerShell(object):
         return parser
 
     def _append_subcommands(self, parent_parser):
-        subcommands = parent_parser.add_subparsers(help="<subcommands>")
+	# Fix CLI for Python 3.x
+        subcommands = parent_parser.add_subparsers(help="<subcommands>", dest="too few arguments")
+        subcommands.required = True
         for group_cls in commands.BaseCommand.__subclasses__():
             group_parser = subcommands.add_parser(group_cls.group_name)
             subcommand_parser = group_parser.add_subparsers()




OSProfiler provides a tiny but powerful library that is used by most (soon to
be all) OpenStack projects and their python clients.
to be able to generate 1 trace per request, that goes through all involved
services. This trace can then be extracted and used to build a tree of calls
which can be quite handy for a variety of reasons (for example in isolating
cross-project performance issues).

It provides functionality to be able to generate 1 trace per request, that goes
through all involved services. This trace can then be extracted and used to
build a tree of calls which can be quite handy for a variety of reasons (for
example in isolating cross-project performance issues).

WWW: https://https://docs.openstack.org/osprofiler/

Return to bug 228683

Lines 2-8 Link Here

(-)py-osprofiler/Makefile (-12 / +26 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= osprofiler	4	PORTNAME= osprofiler
5	PORTVERSION= 1.5.0	5	PORTVERSION= 1.15.2
6	CATEGORIES= devel python	6	CATEGORIES= devel python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 10-28 Link Here
10	MAINTAINER= alexander.nusov@nfvexpress.com	10	MAINTAINER= alexander.nusov@nfvexpress.com
11	COMMENT= OpenStack Profiler Library	11	COMMENT= OpenStack Profiler Library
12		12
13	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR}	13	LICENSE= APACHE20
14	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \	14	LICENSE_FILE= ${WRKSRC}/LICENSE
15	${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \
16	${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \
17	${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \
18	${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging@${FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.13:net/py-netaddr@${FLAVOR} \
20	${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
21	${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${FLAVOR}
22		15
23	NO_ARCH= yes	16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
		17	${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${PY_FLAVOR} \
		18	${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${PY_FLAVOR} \
		19	${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
		20	${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.13:net/py-netaddr@${PY_FLAVOR} \
		21	${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
		22	${PYTHON_PKGNAMEPREFIX}oslo.config>=3.2.0:devel/py-oslo.config@${PY_FLAVOR} \
		23	${PYTHON_PKGNAMEPREFIX}oslo.serialization>=0:devel/py-oslo.serialization@${PY_FLAVOR}
24		24
25	USES= python	25	USES= python
26	USE_PYTHON= autoplist distutils	26	USE_PYTHON= autoplist concurrent distutils
27		27
		28	NO_ARCH= yes
		29	PORTDOCS= *
		30
		31	OPTIONS_DEFINE= DOCS
		32	DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} \
		33	${PYTHON_PKGNAMEPREFIX}openstackdocstheme>=0:textproc/py-openstackdocstheme@${PY_FLAVOR}
		34	DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
		35
		36	post-install-DOCS-on:
		37	@${MKDIR} ${STAGEDIR}${DOCSDIR}
		38	(cd ${WRKSRC}/doc/build/html && \
		39	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
		40	"! -name .buildinfo -and ! -name objects.inv")
		41
28	.include <bsd.port.mk>	42	.include <bsd.port.mk>

Line 0 Link Here

(-)py-osprofiler/files/patch-osprofiler_cmd_shell.py (+13 lines)
	1	--- osprofiler/cmd/shell.py.orig 2018-03-14 17:31:26 UTC
	2	+++ osprofiler/cmd/shell.py
	3	@@ -54,7 +54,9 @@ class OSProfilerShell(object):
	4	return parser
	5
	6	def _append_subcommands(self, parent_parser):
	7	- subcommands = parent_parser.add_subparsers(help="<subcommands>")
	8	+ # Fix CLI for Python 3.x
	9	+ subcommands = parent_parser.add_subparsers(help="<subcommands>", dest="too few arguments")
	10	+ subcommands.required = True
	11	for group_cls in commands.BaseCommand.__subclasses__():
	12	group_parser = subcommands.add_parser(group_cls.group_name)
	13	subcommand_parser = group_parser.add_subparsers()

Lines 1-8 Link Here

(-)py-osprofiler/pkg-descr (-6 / +7 lines)
1	OSProfiler provides a tiny but powerful library that is used by most (soon to	1	OSProfiler provides a tiny but powerful library that is used by most (soon to
2	be all) OpenStack projects and their python clients. It provides functionality	2	be all) OpenStack projects and their python clients.
3	to be able to generate 1 trace per request, that goes through all involved
4	services. This trace can then be extracted and used to build a tree of calls
5	which can be quite handy for a variety of reasons (for example in isolating
6	cross-project performance issues).
7		3
8	WWW: https://pypi.org/project/osprofiler/	4	It provides functionality to be able to generate 1 trace per request, that goes
		5	through all involved services. This trace can then be extracted and used to
		6	build a tree of calls which can be quite handy for a variety of reasons (for
		7	example in isolating cross-project performance issues).
		8
		9	WWW: https://https://docs.openstack.org/osprofiler/