Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAINT: Fixes for sphinx 7.3 #12574

Merged
merged 3 commits into from
Apr 24, 2024
Merged

MAINT: Fixes for sphinx 7.3 #12574

merged 3 commits into from
Apr 24, 2024

Conversation

larsoner
Copy link
Member

Fix for latest Sphinx leveraging sphinx-gallery/sphinx-gallery#1289

The solution is just to move a bunch of code to sphinxext/mne_doc_utils.py and then pass "mne_doc_utils.<whatever>" as str config values to sphinx_gallery_conf

@larsoner
Copy link
Member Author

@drammock should be ready for manual merge since I skipped azure and actions

Copy link
Member

@drammock drammock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should also really update line 82 of conf.py (needs_sphinx = "2.0") to match pyproject.toml (which says >=6). It's too far outside the diff to change via GH gui though :(

@drammock
Copy link
Member

@larsoner I pushed a commit to update the needs_sphinx variable, and broke this PR in a way I've never seen before: linter CI says "error during mergeable check" and circle says fatal: Not possible to fast-forward, aborting. But AFAICT there is no conflict with upstream... GH glitch?

@larsoner
Copy link
Member Author

GitHub is having a really bad day

https://www.githubstatus.com/

@larsoner larsoner enabled auto-merge (squash) April 24, 2024 16:01
@larsoner larsoner merged commit 7c0c07a into mne-tools:main Apr 24, 2024
30 checks passed
@larsoner larsoner deleted the doc branch April 24, 2024 16:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants