[wip/{ → py-}pal-statistics] add patch-ab for python 3

While here, use PKGTAG.python- prefix & fix PLIST

The renaming affects the following packages:

- wip/pal-hardware-gazebo-melodic
- wip/pal-hardware-gazebo

Makefile

@@ -56,7 +56,6 @@ SUBDIR+=	pal-hardware-gazebo-melodic
 SUBDIR+=	pal-hardware-interfaces
 SUBDIR+=	pal-msgs
 SUBDIR+=	pal-navigation-sm
-SUBDIR+=	pal-statistics
 SUBDIR+=	pal-transmissions
 SUBDIR+=	pal-wsg-gripper
 SUBDIR+=	parametric-curves
@@ -99,6 +98,7 @@ SUBDIR+=	py-mraa
 SUBDIR+=	py-multicontact-api
 SUBDIR+=	py-ospi
 SUBDIR+=	py-pal
+SUBDIR+=	py-pal-statistics
 SUBDIR+=	py-parametric-curves
 SUBDIR+=	py-qpoases
 SUBDIR+=	py-qt-gepetto-pythonqt

dynamic-introspection/Makefile

@@ -25,7 +25,7 @@ include ../../lang/ros-message-generation/depend.mk
 include ../../lang/ros-message-runtime/depend.mk
 include ../../math/ros-geometry/depend.mk
 include ../../wip/backward-ros/depend.mk
-include ../../wip/pal-statistics/depend.mk
+include ../../wip/py-pal-statistics/depend.mk
 
 include ../../mk/language/c++.mk
 include ../../mk/language/c.mk

pal-hardware-gazebo-melodic/Makefile

@@ -37,7 +37,7 @@ include ../../lang/ros-message-generation/depend.mk
 include ../../lang/ros-message-runtime/depend.mk
 include ../../middleware/ros-comm/depend.mk
 include ../../wip/pal-hardware-interfaces/depend.mk
-include ../../wip/pal-statistics/depend.mk
+include ../../wip/py-pal-statistics/depend.mk
 include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk
 include ../../wip/prf-ros-control/depend.mk
 include ../../wip/dynamic-introspection/depend.mk

pal-hardware-gazebo/Makefile

@@ -35,7 +35,7 @@ include ../../lang/ros-message-generation/depend.mk
 include ../../lang/ros-message-runtime/depend.mk
 include ../../middleware/ros-comm/depend.mk
 include ../../wip/pal-hardware-interfaces/depend.mk
-include ../../wip/pal-statistics/depend.mk
+include ../../wip/py-pal-statistics/depend.mk
 include ../../wip/prf-gazebo-ros-pkgs/depend.mk
 include ../../wip/prf-ros-control/depend.mk
 include ../../wip/dynamic-introspection/depend.mk

pal-statistics/depend.mk

-# robotpkg depend.mk for:	wip/pal-statistics
-# Created:			Olivier Stasse on Thu, 30 Mar 2017
-#
-
-DEPEND_DEPTH:=			${DEPEND_DEPTH}+
-PAL_STATISTICS_DEPEND_MK:=	${PAL_STATISTICS_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=			pal-statistics
-endif
-
-ifeq (+,$(PAL_STATISTICS_DEPEND_MK)) # ---------------------------------
-
-PREFER.pal-statistics?=	robotpkg
-
-DEPEND_USE+=			pal-statistics
-
-DEPEND_ABI.pal-statistics?=\
-	pal-statistics>=1.1.0
-DEPEND_DIR.pal-statistics?=\
-	../../wip/pal-statistics
-
-SYSTEM_SEARCH.pal-statistics=\
-  'include/pal_statistics/pal_statistics.h'	\
-  'share/pal_statistics/cmake/pal_statisticsConfig.cmake' \
-  'share/pal_statistics/package.xml:/<version>/s/[^0-9.]//gp'	\
-  'lib/pkgconfig/pal_statistics.pc:/Version/s/[^0-9.]//gp'
-
-endif # PAL_STATISTICS_DEPEND_MK ---------------------------------------
-
-DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}

pal-statistics/Makefile → py-pal-statistics/Makefile

 # robotpkg Makefile for:	wip/pal-statistics
-# Created:			Olivier Stasse on Thu, 12 Dec 2018
+# Created:			Guilhem Saurel on Mon, 23 Mar 2020
 #
-ORG=		pal-robotics
-VERSION=	1.3.1
-PKGBASE=	pal-statistics
-PKGNAME=	${PKGBASE}-${VERSION}
-DISTNAME=	${VERSION}
-ROSNAME=	$(subst -,_,${PKGBASE})
-WRKSRC=		${WRKDIR}/${ROSNAME}-${VERSION}
-DIST_SUBDIR=	${PKGBASE}
-PKGREVISION=	2
-
-CATEGORIES=	wip
+
+ORG=			pal-robotics
+VERSION=		1.3.1
+PKGBASE=		pal-statistics
+PKGNAME=		${PKGTAG.python-}${PKGBASE}-${VERSION}
+DISTNAME=		${VERSION}
+ROSNAME=		$(subst -,_,${PKGBASE})
+WRKSRC=			${WRKDIR}/${ROSNAME}-${VERSION}
+DIST_SUBDIR=		${PKGBASE}
+PKGREVISION=		3
+
+# old package name and other Python versions
+CONFLICTS=		${PKGBBASE}-[0-9]*
+CONFLICTS+=		py[0-9][0-9]-${PKGBBASE}-[0-9]*
+
+CATEGORIES=		wip
 
 MASTER_REPOSITORY=	${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
 CHECKOUT_VCS_OPTS+=	--recursive
 
-HOMEPAGE= 	${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
-MASTER_SITES=	${HOMEPAGE}/archive/
-COMMENT=	Provides statistics
-LICENSE=	gnu-gpl-v3
+HOMEPAGE= 		${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
+MASTER_SITES=		${HOMEPAGE}/archive/
+COMMENT=		Provides statistics
+LICENSE=		gnu-gpl-v3
 
-USE_BOOST_LIBS=	thread
+USE_BOOST_LIBS=		thread
 
-ROS_METAPKG=	yes
-USE_BOOST_LIBS=	thread
+ROS_METAPKG=		yes
+USE_BOOST_LIBS=		thread
 
 CMAKE_PREFIX_PATH+=${PREFIX}
 include ../../devel/boost-headers/depend.mk
@@ -36,6 +41,7 @@ include ../../lang/ros-message-generation/depend.mk
 include ../../lang/ros-message-runtime/depend.mk
 include ../../middleware/ros-comm/depend.mk
 include ../../mk/sysdep/googletest.mk
+include ../../mk/sysdep/python.mk
 include ../../mk/language/c++.mk
 include ../../mk/language/c.mk
 include ../../mk/robotpkg.mk

pal-statistics/PLIST → py-pal-statistics/PLIST

@@ -8,7 +8,7 @@ include/pal_statistics_msgs/Statistic.h
 include/pal_statistics_msgs/Statistics.h
 include/pal_statistics_msgs/StatisticsNames.h
 include/pal_statistics_msgs/StatisticsValues.h
-lib/libpal_statistics${PYTHON_EXT_SUFFIX}
+lib/libpal_statistics.so
 lib/pal_carbon_collector/carbon_collector_node.py
 lib/pkgconfig/pal_carbon_collector.pc
 lib/pkgconfig/pal_statistics.pc

py-pal-statistics/depend.mk

+# robotpkg depend.mk for:	wip/py-pal-statistics
+# Created:			Guilhem Saurel on Mon, 23 Mar 2020
+#
+
+DEPEND_DEPTH:=			${DEPEND_DEPTH}+
+PY_PAL_STATISTICS_DEPEND_MK:=	${PY_PAL_STATISTICS_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+=			py-pal-statistics
+endif
+
+ifeq (+,$(PY_PAL_STATISTICS_DEPEND_MK)) # ---------------------------------
+
+PREFER.py-pal-statistics?=	robotpkg
+
+DEPEND_USE+=			py-pal-statistics
+
+DEPEND_ABI.py-pal-statistics?=	py-pal-statistics>=1.1.0
+DEPEND_DIR.py-pal-statistics?=	../../wip/py-pal-statistics
+
+SYSTEM_SEARCH.py-pal-statistics=\
+  'include/pal_statistics/pal_statistics.h'			\
+  'share/pal_statistics/cmake/pal_statisticsConfig.cmake'	\
+  'share/pal_statistics/package.xml:/<version>/s/[^0-9.]//gp'	\
+  'lib/pkgconfig/pal_statistics.pc:/Version/s/[^0-9.]//gp'	\
+  '${PYTHON_SYSLIBSEARCH}/pal_statistics/__init__.py'
+
+endif # PY_PAL_STATISTICS_DEPEND_MK ---------------------------------------
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}

pal-statistics/distinfo → py-pal-statistics/distinfo

@@ -2,3 +2,4 @@ SHA1 (pal-statistics/1.3.1.tar.gz) = ffbf1fec732cb39af874859b9db39e6cbd57aa95
 RMD160 (pal-statistics/1.3.1.tar.gz) = 442798405509c712b3289f5eb2fa5fc500c20046
 Size (pal-statistics/1.3.1.tar.gz) = 329941 bytes
 SHA1 (patch-aa) = 334e32f45341e7b778485ce42e6ebefea8c720fb
+SHA1 (patch-ab) = 310a4e8a97abe16dd6e0792517592deb69b6263f

py-pal-statistics/patches/patch-ab

+--- pal_carbon_collector/scripts/carbon_collector_node.py.orig	2019-08-28 13:19:58.000000000 +0200
++++ pal_carbon_collector/scripts/carbon_collector_node.py	2020-03-23 20:58:55.764363209 +0100
+@@ -10,7 +10,7 @@
+     rospy.init_node('carbon_collector_node')
+ 
+     if not rospy.has_param('~topics'):
+-        print "No topics were specified"
++        print("No topics were specified")
+         sys.exit(1)
+ 
+     topics = rospy.get_param('~topics')
+--- pal_carbon_collector/src/pal_carbon_collector/carbon_collector.py.orig	2019-08-28 13:19:58.000000000 +0200
++++ pal_carbon_collector/src/pal_carbon_collector/carbon_collector.py	2020-03-23 20:58:58.974351827 +0100
+@@ -25,7 +25,7 @@
+         result = self.gs.send_list(stats, timestamp.to_sec())
+ 
+         if self.dry_run:
+-            print result
++            print(result)
+ 
+         return result
+