Sphinx dependency conflict fix #740
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
Signed-off-by: Geibinger <[email protected]>
|
@mergify backport jazzy iron rolling |
✅ Backports have been created
|
mergify bot
pushed a commit
that referenced
this pull request
Oct 16, 2024
Signed-off-by: Geibinger <[email protected]> (cherry picked from commit 96ab3c1) # Conflicts: # config/zephyr/generic/create.sh
mergify bot
pushed a commit
that referenced
this pull request
Oct 16, 2024
Signed-off-by: Geibinger <[email protected]> (cherry picked from commit 96ab3c1)
mergify bot
pushed a commit
that referenced
this pull request
Oct 16, 2024
Signed-off-by: Geibinger <[email protected]> (cherry picked from commit 96ab3c1)
This was referenced Oct 16, 2024
pablogs9
added a commit
that referenced
this pull request
Oct 16, 2024
Signed-off-by: Geibinger <[email protected]> (cherry picked from commit 96ab3c1) Co-authored-by: Jakob Friedl <[email protected]>
pablogs9
added a commit
that referenced
this pull request
Oct 16, 2024
Signed-off-by: Geibinger <[email protected]> (cherry picked from commit 96ab3c1) Co-authored-by: Jakob Friedl <[email protected]>
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.
Description:
This pull request fixes the
docutilsversion conflict encountered when setting up a micro-ROS workspace with Zephyr, as reported in issue #739.Problem:
The issue arises because
sphinx-rtd-theme(version 0.5.2) requiresdocutils<0.17, but during the setup process,docutils 0.17.1is installed, causing the following error:Solution:
To resolve this, I modified the
create.shscript located atconfig/zephyr/generic/by pinning thedocutilsversion to0.16, which is compatible withsphinx-rtd-theme. The change is at line 70 of the script:Testing:
The solution was tested in both my local environment (Ubuntu 22.04.5 LTS) and in the official Humble Docker container. The issue was reproducible in both environments, and the fix successfully resolved the version conflict in both cases.
Related Issue:
This PR fixes issue #739.