Skip to content

Commit

Permalink
ROS 2 Port (reopened) (#53)
Browse files Browse the repository at this point in the history
* Port package.xml and setup.py to ROS 2

* Remove CMakeLists.txt according to ROS 2 port instructions

* 1.0.0

Co-authored-by: Víctor Mayoral Vilches <[email protected]>
  • Loading branch information
2 people authored and clalancette committed Jan 6, 2020
1 parent b213e6e commit 04be157
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 35 deletions.
17 changes: 0 additions & 17 deletions CMakeLists.txt

This file was deleted.

20 changes: 8 additions & 12 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="3">
<name>urdfdom_py</name>
<version>0.4.1</version>
<version>1.0.0</version>
<description>Python implementation of the URDF parser.</description>

<license>BSD</license>
Expand All @@ -21,17 +21,13 @@
<url type="bugtracker">https://github.com/ros/urdf_parser_py/issues</url>
<url type="repository">https://github.com/ros/urdf_parser_py</url>

<buildtool_depend>catkin</buildtool_depend>
<exec_depend>rclpy</exec_depend>

<exec_depend>rospy</exec_depend>

<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-lxml</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-lxml</exec_depend>

<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-yaml</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-yaml</exec_depend>

<test_depend condition="$ROS_PYTHON_VERSION == 2">python-mock</test_depend>
<test_depend condition="$ROS_PYTHON_VERSION == 3">python3-mock</test_depend>
<exec_depend>python3-lxml</exec_depend>
<exec_depend>python3-yaml</exec_depend>
<test_depend>python3-mock</test_depend>

<export>
<build_type>ament_python</build_type>
</export>
</package>
Empty file added resource/urdfdom_py
Empty file.
32 changes: 26 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,29 @@
from distutils.core import setup
from catkin_pkg.python_setup import generate_distutils_setup
from glob import glob
from setuptools import setup

d = generate_distutils_setup(
package_name = 'urdfdom_py'

setup(
name=package_name,
version='1.0.0',
package_dir={'': 'src'},
packages=['urdf_parser_py', 'urdf_parser_py.xml_reflection'],
package_dir={'': 'src'}
data_files=[
('share/ament_index/resource_index/packages',
['resource/' + package_name]),
('share/' + package_name, ['package.xml']),
('share/' + package_name + '/scripts', glob('scripts/display_urdf')),
],
install_requires=['setuptools'],
zip_safe=True,
keywords=['ROS2'],
classifiers=[
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD',
'Programming Language :: Python',
'Topic :: Software Development',
],
description='Python implementation of the URDF parser.',
license='BSD',
tests_require=['pytest'],
)

setup(**d)

0 comments on commit 04be157

Please sign in to comment.