Merge in changes from latest development #1
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
* use python -m to ensure correct interpreter Signed-off-by: William Woodall <william@osrfoundation.org> * remove special cases for homebrew Signed-off-by: William Woodall <william@osrfoundation.org> * also python -m for codecov Signed-off-by: William Woodall <william@osrfoundation.org>
…rastructure#627) This test only applies to rpm_expand_cmd - if they RPM python module is installed, that will be used instead, which makes this test break on those systems (when %fedora doesn't expand to 27). If we want to cover redhat.rpm_expand or redhat.rpm_expand_py, we should devise a different approach.
I think that I'm seeing this because doc builds are happening with
python 3 on Fedora. Here is the error I'm seeing:
```
...
File "./rosdep_doc_utils.py", line 38, in run
nodes.literal_block(text=re.sub(escaped_capitalized_usage, '', out))
File "/usr/lib64/python3.6/re.py", line 191, in sub
return _compile(pattern, flags).sub(repl, string, count)
TypeError: cannot use a string pattern on a bytes-like object
```
…e W504 (ros-infrastructure#636) * format_map is python 3.2 or later only (see also ros-infrastructure#602) * Ignore new pycodestyle rule W504 Was introduced in PyCQA/pycodestyle#502 it seems. Makes travis on master fail https://travis-ci.org/ros-infrastructure/rosdep/jobs/445522297
Two classes of changes here: 1. `catkin_support.py` is executable, but has no shebang, so I removed the executable bit. 2. `main.py` has a shebang and `__main__` handler, and I removed it. It can still be executed directly using the python executable, but like with ros-infrastructure/rospkg#159, it doesn't make sense to have executable scripts in the module.
|
I should mention that I have not yet tested this merge on an alpine system or container. |
Codecov Report
@@ Coverage Diff @@
## alpine-installer #1 +/- ##
===================================================
Coverage ? 75.59%
===================================================
Files ? 31
Lines ? 2918
Branches ? 0
===================================================
Hits ? 2206
Misses ? 712
Partials ? 0
Continue to review full report at Codecov.
|
|
oops, merge on github UI didn't worked as I expected. |
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.
This merges the latest changes from ros-infrastructure/rosdep master to fix CI and test the Alpine installer with other recent changes.