From b934ec39ab937e2ac9f7f96ec90da83e4ce34e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mayoral=20Vilches?= Date: Sun, 10 Feb 2019 17:36:49 +0100 Subject: [PATCH 1/7] Adapt package.xml to ROS 2 --- package.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/package.xml b/package.xml index 358099d..e431f2d 100644 --- a/package.xml +++ b/package.xml @@ -1,5 +1,6 @@ - + + urdfdom_py 0.3.3 Python implementation of the URDF parser. @@ -13,6 +14,7 @@ Eric Cousineau Ioan Sucan Jackie Kay + Víctor Mayoral Vilches Chris Lalancette Shane Loretz @@ -21,13 +23,14 @@ https://github.com/ros/urdf_parser_py/issues https://github.com/ros/urdf_parser_py - catkin + ament_cmake python - python-lxml python-yaml - python-mock + + ament_python + From 17c8ead5269e57178c6a7ec235bf19342a1d3115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mayoral=20Vilches?= Date: Sun, 10 Feb 2019 17:37:14 +0100 Subject: [PATCH 2/7] Remove CMakeLists.txt according to ROS 2 port instructions --- CMakeLists.txt | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 7c98e9d..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -cmake_minimum_required( VERSION 2.8 FATAL_ERROR ) -project(urdfdom_py) - -find_package(catkin REQUIRED) -catkin_package() - -catkin_python_setup() - -catkin_install_python(PROGRAMS - scripts/display_urdf - DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} -) - -if (CATKIN_ENABLE_TESTING) - catkin_add_nosetests(test/test_urdf.py) -endif() From 7de64e3cc02bf1a916158941e1482e93676617b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mayoral=20Vilches?= Date: Sun, 10 Feb 2019 17:49:58 +0100 Subject: [PATCH 3/7] Update setup.py to meet ROS 2 requirements --- setup.py | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 2b1050e..2e4d844 100644 --- a/setup.py +++ b/setup.py @@ -1,11 +1,41 @@ -#!/usr/bin/env python +from setuptools import setup -from distutils.core import setup -from catkin_pkg.python_setup import generate_distutils_setup +package_name = 'urdfdom_py' -d = generate_distutils_setup( +setup( + name=package_name, + version='0.3.3', + package_dir={'': 'src'}, packages=['urdf_parser_py', 'urdf_parser_py.xml_reflection'], - package_dir={'': 'src'} + data_files=[ + ('scripts/display_urdf', + ['package.xml']), + ], + install_requires=['setuptools'], + zip_safe=True, + author='Víctor Mayoral Vilches', + author_email='vmayoral@acutronicrobotics.com', + maintainer='Víctor Mayoral Vilches', + maintainer_email='vmayoral@acutronicrobotics.com', + keywords=['ROS2'], + classifiers=[ + 'Intended Audience :: Developers', + 'License :: OSI Approved :: Apache Software License', + 'Programming Language :: Python', + 'Topic :: Software Development', + ], + description='Python implementation of the URDF parser.', + license='Apache License, Version 2.0', + tests_require=['pytest'], ) -setup(**d) +# from distutils.core import setup +# from catkin_pkg.python_setup import generate_distutils_setup +# +# d = generate_distutils_setup( +# packages=['urdf_parser_py', 'urdf_parser_py.xml_reflection'], +# package_dir={'': 'src'} +# ) +# +# setup(**d) +# From eac52db6a62b1a3e0d2f46f0e2c0a7bdb884f11e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mayoral=20Vilches?= Date: Sun, 10 Feb 2019 17:51:54 +0100 Subject: [PATCH 4/7] Update README, add authors --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 4fd97ad..51a10da 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,9 @@ Not yet sure how to get it to generate catkin-like development installs, which u * Kelsey Hawkins - `urdf_parser_python` implementation, integration * Antonio El Khoury - bugfixes * Eric Cousineau - reflection (serialization?) changes +* Ioan Sucan +* Jackie Kay +* Víctor Mayoral Vilches - port to ROS 2 ## Reflection (or just Serialization?) From c4a8862ea6db3e854f790d3eab054d86488e8f95 Mon Sep 17 00:00:00 2001 From: Michael Lautman Date: Tue, 12 Mar 2019 18:49:47 -0600 Subject: [PATCH 5/7] fixes bug in xml_string method and updates rosdeps for ROS2 --- package.xml | 7 +++---- setup.py | 11 ----------- src/urdf_parser_py/xml_reflection/basics.py | 2 +- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/package.xml b/package.xml index e431f2d..5106940 100644 --- a/package.xml +++ b/package.xml @@ -25,10 +25,9 @@ ament_cmake - python - python-lxml - python-yaml - python-mock + python3-lxml + python3-yaml + python3-mock ament_python diff --git a/setup.py b/setup.py index 2e4d844..6453942 100644 --- a/setup.py +++ b/setup.py @@ -28,14 +28,3 @@ license='Apache License, Version 2.0', tests_require=['pytest'], ) - -# from distutils.core import setup -# from catkin_pkg.python_setup import generate_distutils_setup -# -# d = generate_distutils_setup( -# packages=['urdf_parser_py', 'urdf_parser_py.xml_reflection'], -# package_dir={'': 'src'} -# ) -# -# setup(**d) -# diff --git a/src/urdf_parser_py/xml_reflection/basics.py b/src/urdf_parser_py/xml_reflection/basics.py index f206088..f8ea8a7 100644 --- a/src/urdf_parser_py/xml_reflection/basics.py +++ b/src/urdf_parser_py/xml_reflection/basics.py @@ -10,7 +10,7 @@ def xml_string(rootXml, addHeader=True): # Meh - xmlString = etree.tostring(rootXml, pretty_print=True) + xmlString = etree.tostring(rootXml, pretty_print=True, encoding=str) if addHeader: xmlString = '\n' + xmlString return xmlString From ed256589ef023e9471ca5bac121381245ec88921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mayoral=20Vilches?= Date: Sun, 7 Apr 2019 16:10:16 +0200 Subject: [PATCH 6/7] Python 3 fix, avoid concatenate errors in tests --- src/urdf_parser_py/xml_reflection/basics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/urdf_parser_py/xml_reflection/basics.py b/src/urdf_parser_py/xml_reflection/basics.py index f8ea8a7..ca2a608 100644 --- a/src/urdf_parser_py/xml_reflection/basics.py +++ b/src/urdf_parser_py/xml_reflection/basics.py @@ -12,7 +12,7 @@ def xml_string(rootXml, addHeader=True): # Meh xmlString = etree.tostring(rootXml, pretty_print=True, encoding=str) if addHeader: - xmlString = '\n' + xmlString + xmlString = "\n" + xmlString return xmlString From 6a8cc4684efbbb628fb0a25009695a32734205fa Mon Sep 17 00:00:00 2001 From: nzlz Date: Thu, 18 Jul 2019 19:53:12 +0200 Subject: [PATCH 7/7] Remove non-ascii characters from setup config --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 6453942..333f1b8 100644 --- a/setup.py +++ b/setup.py @@ -13,9 +13,9 @@ ], install_requires=['setuptools'], zip_safe=True, - author='Víctor Mayoral Vilches', + author='Victor Mayoral Vilches', author_email='vmayoral@acutronicrobotics.com', - maintainer='Víctor Mayoral Vilches', + maintainer='Victor Mayoral Vilches', maintainer_email='vmayoral@acutronicrobotics.com', keywords=['ROS2'], classifiers=[