[wip/{ → py-}prf-ros-controllers] Add patch-aa for python 3

While here, use PKGTAG.python- prefix

The renaming affects the following packages:
- wip/talos-metapkg-ros-control-sot
- wip/talos-simulation
- wip/tiago-metapkg-ros-control-sot
- wip/tiago-tutorials
- wip/tiago-description-calibration
- wip/py-roscontrol-sot
- wip/tiago-simulation

Makefile

@@ -66,7 +66,6 @@ SUBDIR+=	pmb2-simulation
 SUBDIR+=	prf-gazebo-ros-pkgs
 SUBDIR+=	prf-gazebo-ros-pkgs-melodic
 SUBDIR+=	prf-roboticsgroup-gazebo-plugins
-SUBDIR+=	prf-ros-controllers
 SUBDIR+=	prf-teleop-tools
 SUBDIR+=	py-bmtools
 SUBDIR+=	py-casadi
@@ -100,6 +99,7 @@ SUBDIR+=	py-pal
 SUBDIR+=	py-pal-statistics
 SUBDIR+=	py-parametric-curves
 SUBDIR+=	py-prf-ros-control
+SUBDIR+=	py-prf-ros-controllers
 SUBDIR+=	py-qpoases
 SUBDIR+=	py-qt-gepetto-pythonqt
 SUBDIR+=	py-quadprog

py-pal-statistics/depend.mk

@@ -15,7 +15,7 @@ PREFER.py-pal-statistics?=	robotpkg
 
 DEPEND_USE+=			py-pal-statistics
 
-DEPEND_ABI.py-pal-statistics?=	py-pal-statistics>=1.1.0
+DEPEND_ABI.py-pal-statistics?=	${PKGTAG.python-}pal-statistics>=1.1.0
 DEPEND_DIR.py-pal-statistics?=	../../wip/py-pal-statistics
 
 SYSTEM_SEARCH.py-pal-statistics=\
@@ -25,6 +25,8 @@ SYSTEM_SEARCH.py-pal-statistics=\
   'lib/pkgconfig/pal_statistics.pc:/Version/s/[^0-9.]//gp'	\
   '${PYTHON_SYSLIBSEARCH}/pal_statistics/__init__.py'
 
+include ../../mk/sysdep/python.mk
+
 endif # PY_PAL_STATISTICS_DEPEND_MK ---------------------------------------
 
 DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}

py-prf-ros-control/Makefile

 # robotpkg Makefile for:	wip/py-prf-ros-control
 # Created:			Olivier Stasse on Wed, 27 Apr 2018
 #
-#
+
 ORG=			pal-robotics-forks
 VERSION=		0.2.8
 PRFNAME=		ros-control
@@ -18,13 +18,12 @@ CONFLICTS=		${PKGBBASE}-[0-9]*
 CONFLICTS+=		py[0-9][0-9]-${PKGBBASE}-[0-9]*
 CONFLICTS+=		ros-control-[0-9]*
 
-
 CATEGORIES=		wip
 
 MASTER_REPOSITORY=	${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
 CHECKOUT_VCS_OPTS+=	--recursive
 
-HOMEPAGE= 		${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
+HOMEPAGE=		${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
 MASTER_SITES=		${HOMEPAGE}/archive/
 COMMENT=		ros_control package with torque sensors
 LICENSE=		2-clause-bsd

py-prf-ros-control/depend.mk

@@ -15,7 +15,7 @@ PREFER.py-prf-ros-control?=	robotpkg
 
 DEPEND_USE+=			py-prf-ros-control
 
-DEPEND_ABI.py-prf-ros-control?=	py-prf-ros-control>=0.2
+DEPEND_ABI.py-prf-ros-control?=	${PKGTAG.python-}prf-ros-control>=0.2
 DEPEND_DIR.py-prf-ros-control?=	../../wip/py-prf-ros-control
 
 SYSTEM_SEARCH.py-prf-ros-control=\
@@ -93,7 +93,7 @@ SYSTEM_SEARCH.py-prf-ros-control=\
   'lib/libtransmission_interface_loader_plugins.so'	\
   'lib/libtransmission_interface_parser.so'	\
   'share/ros_control/package.xml:/<version>/s/[^0-9.]//gp'	\
-  '${PYTHON_SYSLIBSEARCH}/controller_manager/__init__.py	\
+  '${PYTHON_SYSLIBSEARCH}/controller_manager/__init__.py'	\
   $(foreach _,							\
 	controller_interface					\
 	rqt_controller_manager					\
@@ -107,6 +107,8 @@ SYSTEM_SEARCH.py-prf-ros-control=\
   'share/$_/cmake/$_Config.cmake'				\
   'lib/pkgconfig/$_.pc:/Version/s/[^0-9.]//gp')
 
+include ../../mk/sysdep/python.mk
+
 endif # PY_PRF_ROS_CONTROL_DEPEND_MK ----------------------------------------
 
 DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}

prf-ros-controllers/Makefile → py-prf-ros-controllers/Makefile

-# robotpkg Makefile for:	wip/prf-ros-controllers
+# robotpkg Makefile for:	wip/py-prf-ros-controllers
 # Created:			Olivier Stasse on Wed, 29 Mar 2017
 #
-ORG=		pal-robotics-forks
-VERSION=	0.3.15
-PRFNAME=	ros-controllers
-PKGBASE=	prf-${PRFNAME}
-PKGNAME=	${PKGBASE}-${VERSION}
-DISTNAME=	${VERSION}
-ROSNAME=	$(subst -,_,${PRFNAME})
-WRKSRC=		${WRKDIR}/${ROSNAME}-${VERSION}
-
-CATEGORIES=	wip
+
+ORG=			pal-robotics-forks
+VERSION=		0.3.15
+PRFNAME=		ros-controllers
+PKGBASE=		prf-${PRFNAME}
+PKGNAME=		${PKGTAG.python-}${PKGBASE}-${VERSION}
+DISTNAME=		${VERSION}
+ROSNAME=		$(subst -,_,${PRFNAME})
+WRKSRC=			${WRKDIR}/${ROSNAME}-${VERSION}
+PKGREVISION=		1
+
+# old package name and other Python versions
+CONFLICTS=		${PKGBBASE}-[0-9]*
+CONFLICTS+=		py[0-9][0-9]-${PKGBBASE}-[0-9]*
+CONFLICTS=		talos-ros-controllers
+
+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=	Library of ros controllers
-LICENSE=	2-clause-bsd
+HOMEPAGE=		${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
+MASTER_SITES=		${HOMEPAGE}/archive/
+COMMENT=		Library of ros controllers
+LICENSE=		2-clause-bsd
 
-ROS_METAPKG=	yes
+ROS_METAPKG=		yes
 
-CONFLICTS=	talos-ros-controllers
 
 # Allows to have robotpkg ros packages with the highest priority
 # over system ros packages.

prf-ros-controllers/depend.mk → py-prf-ros-controllers/depend.mk

-# robotpkg depend.mk for:	wip/ros-controllers
+# robotpkg depend.mk for:	wip/py-prf-ros-controllers
 # Created:			Olivier Stasse on Wed, 29 Mar 2017
 #
 
 DEPEND_DEPTH:=			${DEPEND_DEPTH}+
-ROS_CONTROLLERS_DEPEND_MK:=	${ROS_CONTROLLERS_DEPEND_MK}+
+PY_PRF_ROS_CONTROLLERS_DEPEND_MK:=	${PY_PRF_ROS_CONTROLLERS_DEPEND_MK}+
 
 ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=			prf-ros-controllers
+DEPEND_PKG+=			py-prf-ros-controllers
 endif
 
-ifeq (+,$(ROS_CONTROLLERS_DEPEND_MK)) # ----------------------------------
+ifeq (+,$(PY_PRF_ROS_CONTROLLERS_DEPEND_MK)) # ----------------------------------
 
 PREFER.ros-controllers?=	robotpkg
 
-DEPEND_USE+=			prf-ros-controllers
+DEPEND_USE+=			py-prf-ros-controllers
 
-DEPEND_ABI.prf-ros-controllers?=	prf-ros-controllers>=0.2.8
-DEPEND_DIR.prf-ros-controllers?=	../../wip/prf-ros-controllers
+DEPEND_ABI.py-prf-ros-controllers?=	${PKGTAG.python-}prf-ros-controllers>=0.2.8
+DEPEND_DIR.py-prf-ros-controllers?=	../../wip/py-prf-ros-controllers
 
-SYSTEM_SEARCH.prf-ros-controllers=\
+SYSTEM_SEARCH.py-prf-ros-controllers=\
   'include/joint_state_controller/joint_state_controller.h'		\
-  'lib/libjoint_state_controller.so'				\
+  'lib/libjoint_state_controller.so'					\
   'share/joint_state_controller/package.xml:/<version>/s/[^0-9.]//gp'	\
-  'lib/pkgconfig/joint_state_controller.pc:/Version/s/[^0-9.]//gp'  \
-  'share/controller_interface/cmake/controller_interfaceConfig.cmake'
+  'lib/pkgconfig/joint_state_controller.pc:/Version/s/[^0-9.]//gp'	\
+  'share/controller_interface/cmake/controller_interfaceConfig.cmake'	\
+  '${PYTHON_SYSLIBSEARCH}/diff_drive_controller/__init__.py'
 
-endif # ROS_CONTROLLERS_DEPEND_MK ----------------------------------------
+include ../../mk/sysdep/python.mk
+
+endif # PY_PRF_ROS_CONTROLLERS_DEPEND_MK ----------------------------------------
 
 DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}

prf-ros-controllers/distinfo → py-prf-ros-controllers/distinfo

 SHA1 (0.3.15.tar.gz) = bfd6696e961f05a7a0957d2a3a28880071cd3318
 RMD160 (0.3.15.tar.gz) = 1d93e609e8d022d9d60f891dfc687fabe71e5346
 Size (0.3.15.tar.gz) = 484646 bytes
+SHA1 (patch-ab) = 6071abb0ea9918238ade52ebf0d145d8d8587b45

py-prf-ros-controllers/patches/patch-ab

+--- rqt_joint_trajectory_controller/src/rqt_joint_trajectory_controller/joint_trajectory_controller.py.orig	2019-09-09 10:34:01.000000000 +0200
++++ rqt_joint_trajectory_controller/src/rqt_joint_trajectory_controller/joint_trajectory_controller.py	2020-03-24 09:12:19.974060717 +0100
+@@ -25,6 +25,8 @@
+ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ # POSSIBILITY OF SUCH DAMAGE.
+ 
++from __future__ import print_function
++
+ import os
+ import rospy
+ import rospkg
+@@ -328,7 +330,7 @@
+         except:
+             # TODO: Can we do better than swallow the exception?
+             from sys import exc_info
+-            print 'Unexpected error:', exc_info()[0]
++            print('Unexpected error:', exc_info()[0])
+ 
+         # Enter monitor mode (sending commands disabled)
+         self._on_jtc_enabled(False)

py-roscontrol-sot/Makefile

@@ -61,12 +61,12 @@ ifeq (erbium,${PREFER.pal-distro})
   else
     include ../../wip/pal-hardware-interfaces/depend.mk
     include ../../wip/py-prf-ros-control/depend.mk
-    include ../../wip/prf-ros-controllers/depend.mk
+    include ../../wip/py-prf-ros-controllers/depend.mk
   endif
 else
   include ../../wip/pal-hardware-interfaces/depend.mk
   include ../../wip/py-prf-ros-control/depend.mk
-  include ../../wip/prf-ros-controllers/depend.mk
+  include ../../wip/py-prf-ros-controllers/depend.mk
 endif
 
 

talos-metapkg-ros-control-sot/Makefile

@@ -43,7 +43,7 @@ ifeq (erbium,${PREFER.pal-distro})
     CMAKE_PREFIX_PATH+=/opt/pal/erbium
   else
     include ../../wip/pal-hardware-interfaces/depend.mk
-    include ../../wip/prf-ros-controllers/depend.mk
+    include ../../wip/py-prf-ros-controllers/depend.mk
     include ../../motion/ros-control-toolbox/depend.mk
   endif
 
@@ -53,7 +53,7 @@ displaytalosmetapkg:
 
 else
   include ../../wip/pal-hardware-interfaces/depend.mk
-  include ../../wip/prf-ros-controllers/depend.mk
+  include ../../wip/py-prf-ros-controllers/depend.mk
   include ../../motion/ros-control-toolbox/depend.mk
 
 displaytalosmetapkg:

talos-simulation/Makefile

@@ -62,7 +62,7 @@ endif
 include ../../wip/talos-robot/depend.mk
 include ../../wip/talos-moveit-config/depend.mk
 include ../../wip/prf-roboticsgroup-gazebo-plugins/depend.mk
-include ../../wip/prf-ros-controllers/depend.mk
+include ../../wip/py-prf-ros-controllers/depend.mk
 ifeq (xenial,${UBUNTUDISTRO})
   include ../../wip/pal-gazebo-plugins/depend.mk
 else

tiago-description-calibration/Makefile

@@ -41,7 +41,7 @@ else
   include ../../wip/pal-gazebo-plugins-melodic/depend.mk
   include ../../wip/pal-hardware-gazebo-melodic/depend.mk
 endif
-include ../../wip/prf-ros-controllers/depend.mk
+include ../../wip/py-prf-ros-controllers/depend.mk
 include ../../wip/tiago-moveit-config/depend.mk
 include ../../wip/play-motion/depend.mk
 include ../../mk/language/c++.mk

tiago-metapkg-ros-control-sot/Makefile

@@ -42,7 +42,7 @@ ifeq (erbium,${PREFER.pal-distro})
     CMAKE_PREFIX_PATH+=/opt/pal/erbium
   else
     include ../../wip/pal-hardware-interfaces/depend.mk
-    include ../../wip/prf-ros-controllers/depend.mk
+    include ../../wip/py-prf-ros-controllers/depend.mk
     include ../../motion/ros-control-toolbox/depend.mk
   endif
 
@@ -52,7 +52,7 @@ displaytiagometapkg:
 
 else
   include ../../wip/pal-hardware-interfaces/depend.mk
-  include ../../wip/prf-ros-controllers/depend.mk
+  include ../../wip/py-prf-ros-controllers/depend.mk
   include ../../motion/ros-control-toolbox/depend.mk
 
 displaytiagometapkg:

tiago-simulation/Makefile

@@ -43,7 +43,7 @@ else
   include ../../wip/pal-hardware-gazebo-melodic/depend.mk
 endif
 include ../../wip/pal-gazebo-worlds/depend.mk
-include ../../wip/prf-ros-controllers/depend.mk
+include ../../wip/py-prf-ros-controllers/depend.mk
 include ../../wip/tiago-moveit-config/depend.mk
 include ../../wip/tiago-description-calibration/depend.mk
 include ../../wip/simple-grasping-action/depend.mk

tiago-tutorials/Makefile

@@ -45,7 +45,7 @@ else
 endif
 include ../../wip/pal-msgs/depend.mk
 include ../../wip/play-motion/depend.mk
-include ../../wip/prf-ros-controllers/depend.mk
+include ../../wip/py-prf-ros-controllers/depend.mk
 include ../../wip/tiago-moveit-config/depend.mk
 include ../../wip/play-motion/depend.mk
 include ../../mk/language/c++.mk