Skip to content

Commit 8a90dbe

Browse files
authored
fix setuptools deprecations (#1066)
Signed-off-by: mosFet <[email protected]>
1 parent 87e88c8 commit 8a90dbe

File tree

14 files changed

+68
-27
lines changed

14 files changed

+68
-27
lines changed

ros2action/setup.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,17 @@
2525
classifiers=[
2626
'Environment :: Console',
2727
'Intended Audience :: Developers',
28-
'License :: OSI Approved :: Apache Software License',
2928
'Programming Language :: Python',
3029
],
3130
description='The action command for ROS 2 command line tools.',
3231
long_description="""\
3332
The package provides the action command for the ROS 2 command line tools.""",
3433
license='Apache License, Version 2.0',
35-
tests_require=['pytest'],
34+
extras_require={
35+
'test': [
36+
'pytest',
37+
],
38+
},
3639
entry_points={
3740
'ros2cli.command': [
3841
'action = ros2action.command.action:ActionCommand',

ros2cli/setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
packages=find_packages(exclude=['test']),
88
extras_require={
99
'completion': ['argcomplete'],
10+
'test': [
11+
'pytest',
12+
],
1013
},
1114
data_files=[
1215
('share/ament_index/resource_index/packages', [
@@ -33,15 +36,13 @@
3336
classifiers=[
3437
'Environment :: Console',
3538
'Intended Audience :: Developers',
36-
'License :: OSI Approved :: Apache Software License',
3739
'Programming Language :: Python',
3840
],
3941
description='Framework for ROS 2 command line tools.',
4042
long_description="""\
4143
The framework provides a single command line script which can be extended with
4244
commands and verbs.""",
4345
license='Apache License, Version 2.0',
44-
tests_require=['pytest'],
4546
entry_points={
4647
'ros2cli.command': [
4748
'daemon = ros2cli.command.daemon:DaemonCommand',

ros2component/setup.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,17 @@
2525
classifiers=[
2626
'Environment :: Console',
2727
'Intended Audience :: Developers',
28-
'License :: OSI Approved :: Apache Software License',
2928
'Programming Language :: Python',
3029
],
3130
description='The component command for ROS 2 command line tools.',
3231
long_description="""\
3332
The package provides the component command for the ROS 2 command line tools.""",
3433
license='Apache License, Version 2.0',
35-
tests_require=['pytest'],
34+
extras_require={
35+
'test': [
36+
'pytest',
37+
],
38+
},
3639
entry_points={
3740
'ros2cli.command': [
3841
'component = ros2component.command.component:ComponentCommand',

ros2doctor/setup.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,17 @@
2525
classifiers=[
2626
'Environment :: Console',
2727
'Intended Audience :: Developers',
28-
'License :: OSI Approved :: Apache Software License',
2928
'Programming Language :: Python',
3029
],
3130
description='The doctor command for ROS 2 command line tools',
3231
long_description="""\
3332
The package provides a cli tool to check potential issues in a ROS 2 system""",
3433
license='Apache License, Version 2.0',
35-
tests_require=['pytest'],
34+
extras_require={
35+
'test': [
36+
'pytest',
37+
],
38+
},
3639
entry_points={
3740
'ros2cli.command': [
3841
'doctor = ros2doctor.command.doctor:DoctorCommand',

ros2interface/setup.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,17 @@
2525
classifiers=[
2626
'Environment :: Console',
2727
'Intended Audience :: Developers',
28-
'License :: OSI Approved :: Apache Software License',
2928
'Programming Language :: Python',
3029
],
3130
description='The interface command for ROS 2 command line tools.',
3231
long_description="""\
3332
The package provides the interface command for the ROS 2 command line tools.""",
3433
license='Apache License, Version 2.0',
35-
tests_require=['pytest'],
34+
extras_require={
35+
'test': [
36+
'pytest',
37+
],
38+
},
3639
entry_points={
3740
'ros2cli.command': [
3841
'interface = ros2interface.command.interface:InterfaceCommand',

ros2lifecycle/setup.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,17 @@
2525
classifiers=[
2626
'Environment :: Console',
2727
'Intended Audience :: Developers',
28-
'License :: OSI Approved :: Apache Software License',
2928
'Programming Language :: Python',
3029
],
3130
description='The lifecycle command for ROS 2 command line tools.',
3231
long_description="""\
3332
The package provides the lifecycle command for the ROS 2 command line tools.""",
3433
license='Apache License, Version 2.0',
35-
tests_require=['pytest'],
34+
extras_require={
35+
'test': [
36+
'pytest',
37+
],
38+
},
3639
entry_points={
3740
'ros2cli.command': [
3841
'lifecycle = ros2lifecycle.command.lifecycle:LifecycleCommand',

ros2multicast/setup.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,17 @@
2525
classifiers=[
2626
'Environment :: Console',
2727
'Intended Audience :: Developers',
28-
'License :: OSI Approved :: Apache Software License',
2928
'Programming Language :: Python',
3029
],
3130
description='The multicast command for ROS 2 command line tools.',
3231
long_description="""\
3332
The package provides the multicast command for the ROS 2 command line tools.""",
3433
license='Apache License, Version 2.0',
35-
tests_require=['pytest'],
34+
extras_require={
35+
'test': [
36+
'pytest',
37+
],
38+
},
3639
entry_points={
3740
'ros2cli.command': [
3841
'multicast = ros2multicast.command.multicast:MulticastCommand',

ros2node/setup.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,17 @@
2525
classifiers=[
2626
'Environment :: Console',
2727
'Intended Audience :: Developers',
28-
'License :: OSI Approved :: Apache Software License',
2928
'Programming Language :: Python',
3029
],
3130
description='The node command for ROS 2 command line tools.',
3231
long_description="""\
3332
The package provides the node command for the ROS 2 command line tools.""",
3433
license='Apache License, Version 2.0',
35-
tests_require=['pytest'],
34+
extras_require={
35+
'test': [
36+
'pytest',
37+
],
38+
},
3639
entry_points={
3740
'ros2cli.command': [
3841
'node = ros2node.command.node:NodeCommand',

ros2param/setup.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,17 @@
2525
classifiers=[
2626
'Environment :: Console',
2727
'Intended Audience :: Developers',
28-
'License :: OSI Approved :: Apache Software License',
2928
'Programming Language :: Python',
3029
],
3130
description='The param command for ROS 2 command line tools.',
3231
long_description="""\
3332
The package provides the param command for the ROS 2 command line tools.""",
3433
license='Apache License, Version 2.0',
35-
tests_require=['pytest'],
34+
extras_require={
35+
'test': [
36+
'pytest',
37+
],
38+
},
3639
entry_points={
3740
'ros2cli.command': [
3841
'param = ros2param.command.param:ParamCommand',

ros2pkg/ros2pkg/resource/ament_python/setup.py.em

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ setup(
1717
maintainer_email='@maintainer_email',
1818
description='@package_description',
1919
license='@package_license',
20-
tests_require=['pytest'],
20+
extras_require={
21+
'test': [
22+
'pytest',
23+
],
24+
},
2125
entry_points={
2226
'console_scripts': [
2327
@[if node_name]@

0 commit comments

Comments
 (0)