west manifest imports changes #283
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
|
All checks are passing now. Tip: The bot edits this comment instead of posting a new one, so you can check the comment's history to see earlier messages. |
mbolivar
force-pushed
the
fix-west-setting
branch
2 times, most recently
from
70b59fb
to
5730414
Compare
|
this needs a rebase on master to fix the compilation on NRF patch. |
This reverts commit 870fc37, which includes a change to west that is unrelated to sphinx, and which is interfering with use of manifest imports. Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
mbolivar
force-pushed
the
fix-west-setting
branch
from
5730414
to
91c00cc
Compare
carlescufi
force-pushed
the
fix-west-setting
branch
from
91c00cc
to
6a94e27
Compare
- sphinx==2.4.0 released yesterday with a bug that breaks the build - Remove west requirement since this is enforced in nrf/scripts/requirements.txt Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This is just a prep work commit for documenting ``west manifest --merge``. Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no> (cherry picked from commit 1dafe7a)
This is supported but undocumented. Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no> (cherry picked from commit 9008578)
By request, for clarity. Suggested-by: Carles Cufí <carles.cufi@nordicsemi.no> Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no> (cherry picked from commit 957476c)
West now supports importing other manifest files. Document the basic behavior. Add a local table of contents for HTML output, to get a quick index of the subsections of the "Manifest Imports" section. Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no> (cherry picked from commit c20a081)
Reflect changes in the APIs made since 0.6.0. These will also need to be added to the release notes. Some automatic directives weren't generating the desired output, so either do it by hand or let new 0.7.0 docstrings supply the information. Try to better group the content into sections. Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no> (cherry picked from commit b4fde33)
carlescufi
force-pushed
the
fix-west-setting
branch
from
6a94e27
to
25b2879
Compare
carlescufi
approved these changes
Mar 26, 2020
mbolivar-nordic
changed the title
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.
Replace the OOT patch touching sphinx and west in requirements.txt with one that just touches sphinx.
Backport the west 0.7 documentation.
Needed by nrfconnect/sdk-nrf#1942.