update Sphinx to 3.5.4, jQuery to 3.5.1#7832
Merged
kcondon merged 2 commits intoIQSS:developfrom May 3, 2021
Merged
Conversation
Contributor
|
Thanks @donsizemore - this is great! We'll review. |
scolapasta
reviewed
Apr 30, 2021
Contributor
scolapasta
left a comment
scolapasta
left a comment
There was a problem hiding this comment.
One small comment on something you commented out; if there's reason to leave, just let me know and I can approve.
doc/sphinx-guides/source/conf.py
Outdated
| html_js_files = [ | ||
| 'js/jquery-3.4.1.min.js', | ||
| ] | ||
| # this breaks $ |
Contributor
There was a problem hiding this comment.
should we consider just removing this, if it's not needed?
Contributor
Author
There was a problem hiding this comment.
I commented out that setting and left it as pseudo-documentation in case anyone wondered why it was removed, and in case it needed to be put back in the future for whatever reason. Happy to remove it if you think I should.
Contributor
There was a problem hiding this comment.
I honestly don't know what it would need to be there for - we always have version control if we need, so I'd vote just remove.
scolapasta
approved these changes
Apr 30, 2021
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
What this PR does / why we need it: We've currently pegged Sphinx at 1.5.6 because upgrading broke search. This PR updates Sphinx and jQuery without breaking search (or at least, "it's working for me locally").
Which issue(s) this PR closes:
Closes #7233
Special notes for your reviewer: none
Suggestions on how to test this:
make htmlDoes this PR introduce a user interface change? If mockups are available, please link/include them here: no
Is there a release notes update needed for this change?: no
Additional documentation: will need to upgrade Sphinx on the Jenkins nodes when the time comes, though this PR should allow us to start automatically building guide branches by pull request trigger in GitHub Actions.