From 92d6dbd286b7d65433e5537b09f424f7b76bce6c Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Wed, 14 Apr 2021 17:01:34 -0400 Subject: [PATCH 1/4] Revert "Switch to for ament_package" This reverts commit 8941f95b5730b05b64bf7a057a37a410a4f84a7a. Signed-off-by: Christophe Bedard --- ros2trace_analysis/package.xml | 4 ++-- tracetools_analysis/package.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ros2trace_analysis/package.xml b/ros2trace_analysis/package.xml index 8188c3c..57da50e 100644 --- a/ros2trace_analysis/package.xml +++ b/ros2trace_analysis/package.xml @@ -11,11 +11,11 @@ https://gitlab.com/ros-tracing/tracetools_analysis/-/issues Christophe Bedard - ament_package - ros2cli tracetools_analysis + ament_package + ament_copyright ament_flake8 ament_mypy diff --git a/tracetools_analysis/package.xml b/tracetools_analysis/package.xml index abba068..679cd0f 100644 --- a/tracetools_analysis/package.xml +++ b/tracetools_analysis/package.xml @@ -13,11 +13,11 @@ Ingo Lütkebohle Christophe Bedard - ament_package - tracetools_read python3-pandas + ament_package + jupyter-notebook ament_copyright From fa68df0dac7f0b1a2bd47413d481f715e89f7920 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Wed, 14 Apr 2021 14:44:00 -0400 Subject: [PATCH 2/4] Revert "Re-order setup.py elements" This reverts commit 18a8ff28b569c63a8e0f3534d3c902b47aa11b07. 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 acd12d9..5e6b24f 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 740036b..2112bcb 100644 --- a/tracetools_analysis/setup.py +++ b/tracetools_analysis/setup.py @@ -14,7 +14,6 @@ package_info = generate_setuptools_dict( ['resource/' + package_name]), ], install_requires=['setuptools'], - tests_require=['pytest'], keywords=[], entry_points={ 'console_scripts': [ @@ -25,5 +24,6 @@ package_info = generate_setuptools_dict( f'memory_usage = {package_name}.scripts.memory_usage:main', ], }, + tests_require=['pytest'], ) setup(**package_info) From dc6a0214c98643309b8c1125d9bbdd82d2243ec1 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Wed, 14 Apr 2021 14:34:01 -0400 Subject: [PATCH 3/4] Revert "Update Python packages to use generate_setuptools_dict" This reverts commit b181a68b0a511a78735015d87e1526fcdac297ea. 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, 46 insertions(+), 10 deletions(-) diff --git a/ros2trace_analysis/package.xml b/ros2trace_analysis/package.xml index 57da50e..ffa26fb 100644 --- a/ros2trace_analysis/package.xml +++ b/ros2trace_analysis/package.xml @@ -14,8 +14,6 @@ ros2cli tracetools_analysis - ament_package - ament_copyright ament_flake8 ament_mypy diff --git a/ros2trace_analysis/setup.py b/ros2trace_analysis/setup.py index 5e6b24f..f1498ea 100644 --- a/ros2trace_analysis/setup.py +++ b/ros2trace_analysis/setup.py @@ -1,9 +1,11 @@ -from ament_package.generate_setuptools_dict import generate_setuptools_dict from setuptools import find_packages from setuptools import setup package_name = 'ros2trace_analysis' -package_info = generate_setuptools_dict( + +setup( + name=package_name, + version='2.0.0', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), @@ -12,7 +14,22 @@ package_info = generate_setuptools_dict( ], 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': [ @@ -27,4 +44,3 @@ package_info = generate_setuptools_dict( ], } ) -setup(**package_info) diff --git a/tracetools_analysis/package.xml b/tracetools_analysis/package.xml index 679cd0f..c9e4700 100644 --- a/tracetools_analysis/package.xml +++ b/tracetools_analysis/package.xml @@ -16,8 +16,6 @@ tracetools_read python3-pandas - ament_package - jupyter-notebook ament_copyright diff --git a/tracetools_analysis/setup.py b/tracetools_analysis/setup.py index 2112bcb..3d4412d 100644 --- a/tracetools_analysis/setup.py +++ b/tracetools_analysis/setup.py @@ -1,11 +1,13 @@ 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' -package_info = generate_setuptools_dict( + +setup( + name=package_name, + version='2.0.0', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), @@ -14,7 +16,29 @@ package_info = generate_setuptools_dict( ['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', @@ -24,6 +48,6 @@ package_info = generate_setuptools_dict( f'memory_usage = {package_name}.scripts.memory_usage:main', ], }, + license='Apache 2.0', tests_require=['pytest'], ) -setup(**package_info) From 1c3d8a539aea157621fcc7b08f41059438230706 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Thu, 15 Apr 2021 14:20:59 -0400 Subject: [PATCH 4/4] Update package versions in setup.py 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 f1498ea..3025c93 100644 --- a/ros2trace_analysis/setup.py +++ b/ros2trace_analysis/setup.py @@ -5,7 +5,7 @@ package_name = 'ros2trace_analysis' setup( name=package_name, - version='2.0.0', + version='2.0.2', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/tracetools_analysis/setup.py b/tracetools_analysis/setup.py index 3d4412d..6cf146f 100644 --- a/tracetools_analysis/setup.py +++ b/tracetools_analysis/setup.py @@ -7,7 +7,7 @@ package_name = 'tracetools_analysis' setup( name=package_name, - version='2.0.0', + version='2.0.2', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']),