Misc tidying for ROS Noetic. #79
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Invoke wrappers with python -m instead of as scripts. - Drop logic not needed with CATKIN_ENV used. - Drop unneeded install of the cmake extra. - Print output as well as capturing in test wrapper.
mikepurvis
commented
Mar 16, 2020
| @@ -62,14 +62,14 @@ function(roslint_python) | |||
| file(GLOB_RECURSE ARGN *.py) | |||
| endif() | |||
| if (NOT DEFINED ROSLINT_PYTHON_CMD) | |||
| set(ROSLINT_PYTHON_CMD ${ROSLINT_SCRIPTS_DIR}/pycodestyle) | |||
| set(ROSLINT_PYTHON_CMD ${PYTHON_EXECUTABLE} -m roslint.pycodestyle_wrapper) | |||
There was a problem hiding this comment.
This cleans up the story for using roslint from the develspace on a Py3-only system.
mikepurvis
commented
Mar 16, 2020
| endif() | ||
| roslint_custom("${ROSLINT_PYTHON_CMD}" "${ROSLINT_PYTHON_OPTS}" ${ARGN}) | ||
| endfunction() | ||
|
|
||
| # Run roslint for this package as a test. | ||
| function(roslint_add_test) | ||
| catkin_run_tests_target("roslint" "package" "roslint-${PROJECT_NAME}.xml" | ||
| COMMAND ${ROSLINT_SCRIPTS_DIR}/test_wrapper ${CATKIN_TEST_RESULTS_DIR}/${PROJECT_NAME}/roslint-${PROJECT_NAME}.xml make roslint_${PROJECT_NAME} | ||
| COMMAND "${ROSLINT_SCRIPTS_DIR}/test_wrapper ${CATKIN_TEST_RESULTS_DIR}/${PROJECT_NAME}/roslint-${PROJECT_NAME}.xml make roslint_${PROJECT_NAME}" |
There was a problem hiding this comment.
These quotes are the fix to the issue that was messing with my testing before; I think there must have been a change in CMake behaviour triggered by #77.
|
Did this change how to invoke the linter from the command line? I used to always run |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CATKIN_ENVused.FYI @sloretz