Merge upstream version 0.8.2 #9
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
* fixup! argument parser: use None instead of [] for empty jobs args (catkin#575) * add test that asserts that job flags do not disappear
* fix cleaning of jobs args * add test
* escape whitespaces in `catkin config` printout In the `catkin config` printout, the cmake-args line changes from ``` Additional CMake Args: -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_CXX_FLAGS=-g -fno-omit-frame-pointer -O3 -DNDEBUG -DENABLE_TIMING=0 ``` to ``` Additional CMake Args: -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_CXX_FLAGS=-g\ -fno-omit-frame-pointer\ -O3\ -DNDEBUG -DENABLE_TIMING=0 ``` thereby the printout can be copy and pasted to `catkin config --cmake-args` without changing the configuration. In the above example the last element `-DENABLE_TIMING` is a cmake option and not a gcc preprocessor definition. Before this patch, this is indistinguishable from the printout. * review suggestion * edge cases * add comment
* fix catkin config --copy * make extending profiles possible from the command line
* evaluate conditional dependencies * add tests * cleanup in common.py
* fix line breaks in CMakeIOBufferProtocol.colorize_cmake * replace all \r with \n * rstrip event data and append with \n * rstrip and append \n to interleaved lines * Fix line ending appending Co-authored-by: Mathias Lüdtke <[email protected]>
Co-authored-by: jack.mo <[email protected]>
* fix stdeb for python 3 * do not use catkin-pkg-modules in setup.py * only require catkin-pkg when not building deb * 0.6.0 Signed-off-by: William Woodall <[email protected]> * changelog for 0.7.0 * make ros_release_python skip python2 release * increase version to 0.7.1 Co-authored-by: William Woodall <[email protected]>
* Add GitHub actions configuration * Remove travis configuration * Update CI badge in README
…atkin#683) * Make it possible to clean individual packages with isolated layout * update changelog
Add `catkin test` verb
* Fix typo * Use install property * Use https * Remove unused sphinxcontrib-programoutput doc requirement * Simplify environment get * Replace more dunder vars by their property * Fix verb in test
* replace http by https * Fix unfilled parameter * Fix update_active_metadata * Remove redundant parentheses * Fix typo's * Convert methods to static methods * Fix styling in test_jobs * Cleanup docstrings
Just noticed a couple of words out-of-order.
* Add SPACE_missing subs dynamically * Make catkin locate accept other spaces than default ones * Make catkin clean accept other spaces than default ones * clean: use get_metadata_root_path * (clean) set context.packages * context: Add package_source_space * context: add package_SPACE_space dynamically if not existing * Align messages in spaces to clean Co-authored-by: Timon Engelke <[email protected]> Co-authored-by: Timon Engelke <[email protected]>
* add back flags that were removed in catkin#691 * put the short flag before the long flag
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.
There have been many changes since version 0.5.0, which is what we are currently using (#5). I did not review all of them in detail, but I was using slightly older version 0.7.2 now locally for a while already and did not encounter any issue so far.
Diff to current
master(Intermodalics version0.5.0):d6bc67c...merge/upstream/0.8.2 (this pull request)
Diff of our version against upstream version
0.8.2:0.8.2...merge/upstream/0.8.2
.catkin_toolsfolders in Git submodules (Detect nested workspaces and use the outermost workspace by default #3 and some follow-ups..., submitted to upstream as Detect nested workspaces and use the outermost workspace by default catkin/catkin_tools#705)catkin cd(Enable bash completion for catkin cd #4, submitted to upstream as Enable bash completion for the catkin cd verb catkin/catkin_tools#703)--skip-installargument forcatkin build(Add an option for catkin build to skip the installation step catkin/catkin_tools#593), but that one became obsolete with the addition of thecatkin testverb (comment).So overall there are not many reasons anymore to not use the upstream version directly.