sphinx: 5.3.0 -> 6.1.3#210338
Merged
mweinelt merged 0 commit intoNixOS:python-updatesfrom Feb 26, 2023
Merged
Conversation
github-actions
bot
added
the
6.topic: python
13 tasks
ofborg
bot
added
10.rebuild-darwin: 501+
Member
Author
|
@ofborg build sphinx |
Member
|
ghc's doc is not yet compatible with sphinx 6: |
Member
Author
|
@sternenseemann should we patch GHC with https://gitlab.haskell.org/ghc/ghc/-/commit/00dc51060881df81258ba3b3bdf447294618a4de? |
Member
|
Removed from python-updates, because it caused breakage, where the upstream wasn't ready. This honestly needs more time. |
Member
Yes, can probably be applied before the sphinx update already on |
mweinelt
reviewed
Feb 26, 2023
Member
|
Please add an anchor to the relevant version in the changelog url. https://www.sphinx-doc.org/en/master/changes.html#release-6-1-3-released-jan-10-2023 |
Member
|
We will likely have to revert to a version before 6.0, given a serious regression about importing extension modules. A simpler reproducer is building diff --git a/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix
index dd2efe81fd1..c9fa2a10e63 100644
--- a/pkgs/development/python-modules/sphinx-notfound-page/default.nix
+++ b/pkgs/development/python-modules/sphinx-notfound-page/default.nix
@@ -9,6 +9,7 @@
, sphinx-rtd-theme
, sphinx-tabs
, sphinxcontrib-autoapi
+, sphinxcontrib-jquery
, sphinxemoji
# runtime dependencies
, sphinx
@@ -35,6 +36,7 @@ buildPythonPackage rec {
sphinx-rtd-theme
sphinx-tabs
sphinxcontrib-autoapi
+ sphinxcontrib-jquery
sphinxemoji
];The build log below prints diff --git a/sphinx/registry.py b/sphinx/registry.py
index 5a39c3546..b64959c36 100644
--- a/sphinx/registry.py
+++ b/sphinx/registry.py
@@ -442,6 +442,8 @@ class SphinxComponentRegistry:
try:
mod = import_module(extname)
except ImportError as err:
+ import sys
+ print(sys.path)
logger.verbose(__('Original exception:\n') + traceback.format_exc())
raise ExtensionError(__('Could not import extension %s') % extname,
err) from errWhen taking that I'm out of ideas at this point. |
Member
Author
|
Is this relevant?
|
Member
|
No, our failure happens while trying to import sphinxcontrib-jquery from within sphinx. |
mweinelt
added a commit
that referenced
this pull request
Feb 28, 2023
This reverts commit 96fc61b. Sphinx versions >=6.0 fail to import extensions, which represents a severe regression. Details about this issue have been posted at #210338 (comment).
mweinelt
added a commit
that referenced
this pull request
Feb 28, 2023
This reverts commit 96fc61b. Sphinx versions >=6.0 fail to import extensions, which represents a severe regression. Details about this issue have been posted at #210338 (comment).
mweinelt
added a commit
that referenced
this pull request
Feb 28, 2023
This reverts commit 96fc61b. Sphinx versions >=6.0 fail to import extensions, which represents a severe regression. Details about this issue have been posted at #210338 (comment).
mweinelt
added a commit
that referenced
this pull request
Mar 2, 2023
This reverts commit 96fc61b. Sphinx versions >=6.0 fail to import extensions, which represents a severe regression. Details about this issue have been posted at #210338 (comment).
mweinelt
added a commit
that referenced
this pull request
Mar 3, 2023
This reverts commit 96fc61b. Sphinx versions >=6.0 fail to import extensions, which represents a severe regression. Details about this issue have been posted at #210338 (comment).
mweinelt
added a commit
that referenced
this pull request
Mar 3, 2023
This reverts commit 96fc61b. Sphinx versions >=6.0 fail to import extensions, which represents a severe regression. Details about this issue have been posted at #210338 (comment).
natsukium
added a commit
to natsukium/nixpkgs
that referenced
this pull request
Oct 26, 2023
….pth This change fixes the import error reported in the following comment. It is caused by the legacy setuptools namespace. NixOS#210338 (comment)
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.
https://www.sphinx-doc.org/en/master/changes.html#release-6-1-3-released-jan-10-2023
Unblocks #208594 (comment)
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes