From b181a68b0a511a78735015d87e1526fcdac297ea Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Wed, 14 Apr 2021 14:34:01 -0400 Subject: [PATCH 1/2] Update Python packages to use generate_setuptools_dict Signed-off-by: Christophe Bedard --- ros2trace_analysis/package.xml | 2 ++ ros2trace_analysis/setup.py | 22 +++------------------- tracetools_analysis/package.xml | 2 ++ tracetools_analysis/setup.py | 30 +++--------------------------- 4 files changed, 10 insertions(+), 46 deletions(-) diff --git a/ros2trace_analysis/package.xml b/ros2trace_analysis/package.xml index 1cc496b..e326267 100644 --- a/ros2trace_analysis/package.xml +++ b/ros2trace_analysis/package.xml @@ -11,6 +11,8 @@ ros2cli tracetools_analysis + ament_package + ament_copyright ament_flake8 ament_mypy diff --git a/ros2trace_analysis/setup.py b/ros2trace_analysis/setup.py index f1498ea..5e6b24f 100644 --- a/ros2trace_analysis/setup.py +++ b/ros2trace_analysis/setup.py @@ -1,11 +1,9 @@ +from ament_package.generate_setuptools_dict import generate_setuptools_dict from setuptools import find_packages from setuptools import setup package_name = 'ros2trace_analysis' - -setup( - name=package_name, - version='2.0.0', +package_info = generate_setuptools_dict( packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), @@ -14,22 +12,7 @@ setup( ], install_requires=['ros2cli'], zip_safe=True, - maintainer=( - 'Christophe Bedard' - ), - maintainer_email=( - 'bedard.christophe@gmail.com' - ), - author='Christophe Bedard', - author_email='christophe.bedard@apex.ai', - url='https://gitlab.com/ros-tracing/tracetools_analysis', keywords=[], - description='The trace-analysis command for ROS 2 command line tools.', - long_description=( - 'The package provides the trace-analysis ' - 'command for the ROS 2 command line tools.' - ), - license='Apache 2.0', tests_require=['pytest'], entry_points={ 'ros2cli.command': [ @@ -44,3 +27,4 @@ setup( ], } ) +setup(**package_info) diff --git a/tracetools_analysis/package.xml b/tracetools_analysis/package.xml index 5d9a014..60b6990 100644 --- a/tracetools_analysis/package.xml +++ b/tracetools_analysis/package.xml @@ -13,6 +13,8 @@ tracetools_read python3-pandas + ament_package + jupyter-notebook ament_copyright diff --git a/tracetools_analysis/setup.py b/tracetools_analysis/setup.py index 3d4412d..2112bcb 100644 --- a/tracetools_analysis/setup.py +++ b/tracetools_analysis/setup.py @@ -1,13 +1,11 @@ import glob +from ament_package.generate_setuptools_dict import generate_setuptools_dict from setuptools import find_packages from setuptools import setup package_name = 'tracetools_analysis' - -setup( - name=package_name, - version='2.0.0', +package_info = generate_setuptools_dict( packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), @@ -16,29 +14,7 @@ setup( ['resource/' + package_name]), ], install_requires=['setuptools'], - maintainer=( - 'Christophe Bedard, ' - 'Ingo Lütkebohle' - ), - maintainer_email=( - 'bedard.christophe@gmail.com, ' - 'ingo.luetkebohle@de.bosch.com' - ), - author=( - 'Christophe Bedard, ' - 'Ingo Lütkebohle' - ), - author_email=( - 'fixed-term.christophe.bourquebedard@de.bosch.com, ' - 'ingo.luetkebohle@de.bosch.com' - ), - url='https://gitlab.com/ros-tracing/tracetools_analysis', keywords=[], - description='Tools for analysing trace data.', - long_description=( - 'This package provides tools for analysing trace data, from ' - 'building a model of the trace data to providing plotting utilities.' - ), entry_points={ 'console_scripts': [ f'convert = {package_name}.convert:main', @@ -48,6 +24,6 @@ setup( f'memory_usage = {package_name}.scripts.memory_usage:main', ], }, - license='Apache 2.0', tests_require=['pytest'], ) +setup(**package_info) From 18a8ff28b569c63a8e0f3534d3c902b47aa11b07 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Wed, 14 Apr 2021 14:44:00 -0400 Subject: [PATCH 2/2] Re-order setup.py elements Signed-off-by: Christophe Bedard --- ros2trace_analysis/setup.py | 2 +- tracetools_analysis/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ros2trace_analysis/setup.py b/ros2trace_analysis/setup.py index 5e6b24f..acd12d9 100644 --- a/ros2trace_analysis/setup.py +++ b/ros2trace_analysis/setup.py @@ -11,9 +11,9 @@ package_info = generate_setuptools_dict( ['resource/' + package_name]), ], install_requires=['ros2cli'], + tests_require=['pytest'], zip_safe=True, keywords=[], - tests_require=['pytest'], entry_points={ 'ros2cli.command': [ f'trace-analysis = {package_name}.command.trace_analysis:TraceAnalysisCommand', diff --git a/tracetools_analysis/setup.py b/tracetools_analysis/setup.py index 2112bcb..740036b 100644 --- a/tracetools_analysis/setup.py +++ b/tracetools_analysis/setup.py @@ -14,6 +14,7 @@ package_info = generate_setuptools_dict( ['resource/' + package_name]), ], install_requires=['setuptools'], + tests_require=['pytest'], keywords=[], entry_points={ 'console_scripts': [ @@ -24,6 +25,5 @@ package_info = generate_setuptools_dict( f'memory_usage = {package_name}.scripts.memory_usage:main', ], }, - tests_require=['pytest'], ) setup(**package_info)