Skip to content

Commit 20a32b7

Browse files
mosfet80mosfet80
authored
fix setuptools deprecations (#547)
Signed-off-by: mosFet <[email protected]>
1 parent 1e737ea commit 20a32b7

File tree

15 files changed

+75
-29
lines changed

15 files changed

+75
-29
lines changed

‎ament_clang_format/setup.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
keywords=['ROS'],
2727
classifiers=[
2828
'Intended Audience :: Developers',
29-
'License :: OSI Approved :: Apache Software License',
3029
'Programming Language :: Python',
3130
'Topic :: Software Development',
3231
],
@@ -35,7 +34,11 @@
3534
The ability to check code against style conventions using clang-format
3635
and generate xUnit test result files.""",
3736
license='Apache License, Version 2.0, BSD',
38-
tests_require=['pytest'],
37+
extras_require={
38+
'test': [
39+
'pytest',
40+
],
41+
},
3942
entry_points={
4043
'console_scripts': [
4144
'ament_clang_format = ament_clang_format.main:main',

‎ament_clang_tidy/setup.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
keywords=['ROS'],
2727
classifiers=[
2828
'Intended Audience :: Developers',
29-
'License :: OSI Approved :: Apache Software License',
3029
'Programming Language :: Python',
3130
'Topic :: Software Development',
3231
],
@@ -35,7 +34,11 @@
3534
The ability to check code against style conventions using clang-tidy
3635
and generate xUnit test result files.""",
3736
license='Apache License, Version 2.0, BSD',
38-
tests_require=['pytest'],
37+
extras_require={
38+
'test': [
39+
'pytest',
40+
],
41+
},
3942
entry_points={
4043
'console_scripts': [
4144
'ament_clang_tidy = ament_clang_tidy.main:main',

‎ament_copyright/setup.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,18 @@
2626
keywords=['ROS'],
2727
classifiers=[
2828
'Intended Audience :: Developers',
29-
'License :: OSI Approved :: Apache Software License',
3029
'Programming Language :: Python',
3130
'Topic :: Software Development',
3231
],
3332
description='Check source files for copyright reference.',
3433
long_description="""\
3534
The ability to check sources file for copyright and license information.""",
3635
license='Apache License, Version 2.0',
37-
tests_require=['pytest'],
36+
extras_require={
37+
'test': [
38+
'pytest',
39+
],
40+
},
3841
entry_points={
3942
'ament_copyright.copyright_name': [
4043
'osrf = ament_copyright.copyright_names:osrf',

‎ament_cppcheck/setup.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
keywords=['ROS'],
2424
classifiers=[
2525
'Intended Audience :: Developers',
26-
'License :: OSI Approved :: Apache Software License',
2726
'Programming Language :: Python',
2827
'Topic :: Software Development',
2928
],
@@ -32,7 +31,11 @@
3231
The ability to perform static code analysis on C/C++ code using Cppcheck
3332
and generate xUnit test result files.""",
3433
license='Apache License, Version 2.0',
35-
tests_require=['pytest'],
34+
extras_require={
35+
'test': [
36+
'pytest',
37+
],
38+
},
3639
entry_points={
3740
'console_scripts': [
3841
'ament_cppcheck = ament_cppcheck.main:main',

‎ament_cpplint/setup.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
keywords=['ROS'],
2424
classifiers=[
2525
'Intended Audience :: Developers',
26-
'License :: OSI Approved :: Apache Software License',
2726
'Programming Language :: Python',
2827
'Topic :: Software Development',
2928
],
@@ -32,7 +31,11 @@
3231
The ability to check code against the Google style conventions using
3332
cpplint and generate xUnit test result files.""",
3433
license='Apache License, Version 2.0, BSD',
35-
tests_require=['pytest'],
34+
extras_require={
35+
'test': [
36+
'pytest',
37+
],
38+
},
3639
entry_points={
3740
'console_scripts': [
3841
'ament_cpplint = ament_cpplint.main:main',

‎ament_flake8/setup.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,18 @@
2626
keywords=['ROS'],
2727
classifiers=[
2828
'Intended Audience :: Developers',
29-
'License :: OSI Approved :: Apache Software License',
3029
'Programming Language :: Python',
3130
'Topic :: Software Development',
3231
],
3332
description='Check Python code style using flake8.',
3433
long_description="""\
3534
The ability to check code for syntax and style conventions with flake8.""",
3635
license='Apache License, Version 2.0',
37-
tests_require=['pytest'],
36+
extras_require={
37+
'test': [
38+
'pytest',
39+
],
40+
},
3841
entry_points={
3942
'console_scripts': [
4043
'ament_flake8 = ament_flake8.main:main',

‎ament_lint/setup.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
keywords=['ROS'],
2424
classifiers=[
2525
'Intended Audience :: Developers',
26-
'License :: OSI Approved :: Apache Software License',
2726
'Programming Language :: Python',
2827
'Topic :: Software Development',
2928
],
@@ -32,7 +31,11 @@
3231
Providing common API for ament linter packages, e.g. the `linter` marker for
3332
pytest.""",
3433
license='Apache License, Version 2.0',
35-
tests_require=['pytest'],
34+
extras_require={
35+
'test': [
36+
'pytest',
37+
],
38+
},
3639
entry_points={
3740
'pytest11': [
3841
'ament_lint = ament_lint.pytest_marker',

‎ament_lint_cmake/setup.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
keywords=['ROS'],
2424
classifiers=[
2525
'Intended Audience :: Developers',
26-
'License :: OSI Approved :: Apache Software License',
2726
'Programming Language :: Python',
2827
'Topic :: Software Development',
2928
],
@@ -32,7 +31,11 @@
3231
The ability to lint CMake code using cmakelint and generate xUnit test
3332
result files.""",
3433
license='Apache License, Version 2.0',
35-
tests_require=['pytest'],
34+
extras_require={
35+
'test': [
36+
'pytest',
37+
],
38+
},
3639
entry_points={
3740
'console_scripts': [
3841
'ament_lint_cmake = ament_lint_cmake.main:main',

‎ament_mypy/setup.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,18 @@
2626
keywords=['ROS'],
2727
classifiers=[
2828
'Intended Audience :: Developers',
29-
'License :: OSI Approved :: Apache Software License',
3029
'Programming Language :: Python',
3130
'Topic :: Software Development',
3231
],
3332
description='Check Python static typing using mypy.',
3433
long_description="""\
3534
The ability to check code for user specified static typing with mypy.""",
3635
license='Apache License, Version 2.0',
37-
tests_require=['pytest'],
36+
extras_require={
37+
'test': [
38+
'pytest',
39+
],
40+
},
3841
entry_points={
3942
'console_scripts': [
4043
'ament_mypy = ament_mypy.main:main',

‎ament_pclint/setup.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@
5353
The ability to perform static code analysis on C/C++ code using PC-lint
5454
and generate xUnit test result files.""",
5555
license='Apache License, Version 2.0',
56-
tests_require=['pytest'],
56+
extras_require={
57+
'test': [
58+
'pytest',
59+
],
60+
},
5761
test_suite='test',
5862
entry_points={
5963
'console_scripts': [

0 commit comments

Comments
 (0)