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

sphinx: 5.3.0 -> 7.2.6 #259350

Merged
merged 12 commits into from Oct 26, 2023
Merged

sphinx: 5.3.0 -> 7.2.6 #259350

merged 12 commits into from Oct 26, 2023

Conversation

natsukium
Copy link
Member

Description of changes

Diff: sphinx-doc/sphinx@v5.3.0...v7.2.6
Changelog: https://www.sphinx-doc.org/en/master/changes.html#release-7-2-6-released-sep-13-2023

A successor to #244625

The commit 1eb8fcf adds pythonNamespaces to all sphinxcontrib-* packages in order to fix the import error reported in the following comment.
#210338 (comment)
This is an existing approach that fixes the legacy setuptools namespace issue that @tjni investigated.

I also picked a commit to standardize the pname, as noted in this comment.
#244625 (comment)

related PRs

cc @AndersonTorres @mweinelt @ncfavier @SuperSandro2000 @tjni

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@natsukium
Copy link
Member Author

@ofborg build python311Packages.wrapt

ncfavier and others added 12 commits October 26, 2023 23:04
Diff: sphinx-doc/sphinx@v5.3.0...v7.2.6
Changelog: https://www.sphinx-doc.org/en/master/changes.html#release-7-2-6-released-sep-13-2023

Co-authored-by: Theodore Ni <3806110+tjni@users.noreply.github.com>
Co-authored-by: Anderson Torres <torres.anderson.85@protonmail.com>
Co-authored-by: OTABI Tomoya <tomoya.otabi@gmail.com>
….pth

This change fixes the import error reported in the following comment.
It is caused by the legacy setuptools namespace.
NixOS#210338 (comment)
@natsukium natsukium changed the base branch from staging to staging-next October 26, 2023 14:09
@natsukium natsukium marked this pull request as ready for review October 26, 2023 14:17
@mweinelt mweinelt merged commit af4584c into NixOS:staging-next Oct 26, 2023
4 of 5 checks passed
Staging automation moved this from WIP to Done Oct 26, 2023
@trofi
Copy link
Contributor

trofi commented Oct 27, 2023

git bisect says ce20997 sphinx: 5.3.0 -> 7.2.6 caused build failures in staging-next for at least python3.pkgs.breathe, libcamera, ghc.

libcamera fails as:

[153/158] Generating Documentation/documentation with a custom command
FAILED: Documentation/html
/nix/store/dzsd3p2zpvkdq4z72vh1yfqcysyhllim-python3.11-sphinx-7.2.6/bin/sphinx-build -D release=v0.0.5 -q -W -b html /build/libcamera/Documentation Documentation/html
/nix/store/m6b4x4a5dk83rhzf293xq5csjcj4nlgn-python3.11-sphinxcontrib-applehelp-1.0.2/lib/python3.11/site-packages/sphinxcontrib/applehelp/__init__.py:24: RemovedInSphinx80Warning: The alias 'sphinx.util.SkipProgressMessage' is deprecated, use 'sphinx.util.display.SkipProgressMessage' instead. Check CHANGES for Sphinx API modifications.
  from sphinx.util import SkipProgressMessage, progress_message
/nix/store/m6b4x4a5dk83rhzf293xq5csjcj4nlgn-python3.11-sphinxcontrib-applehelp-1.0.2/lib/python3.11/site-packages/sphinxcontrib/applehelp/__init__.py:24: RemovedInSphinx80Warning: The alias 'sphinx.util.progress_message' is deprecated, use 'sphinx.util.display.progress_message' instead. Check CHANGES for Sphinx API modifications.
  from sphinx.util import SkipProgressMessage, progress_message
/nix/store/kbwpk8fvpg3c7xz68cnh9cd46r69jx5c-python3.11-sphinxcontrib-htmlhelp-2.0.0/lib/python3.11/site-packages/sphinxcontrib/htmlhelp/__init__.py:26: RemovedInSphinx80Warning: The alias 'sphinx.util.progress_message' is deprecated, use 'sphinx.util.display.progress_message' instead. Check CHANGES for Sphinx API modifications.
  from sphinx.util import progress_message

Theme error:
An error happened in rendering the page api-html/index.
Reason: UndefinedError("'style' is undefined")

@vcunat
Copy link
Member

vcunat commented Oct 27, 2023

Hydra shows the same log for ghc:
https://hydra.nixos.org/build/239551789/nixlog/1/tail

@mweinelt
Copy link
Member

mweinelt commented Oct 27, 2023

cc @sternenseemann for ghc

We already had a patch for that iirc.

Edit: Looks like that was 2278f9e, and it still gets applied.

Looks like ghc is affected by the same change as libcamera: https://git.libcamera.org/libcamera/libcamera.git/commit/?id=6cb92b523bd60bd7718df134cc5b1eff51cf42e5

@sternenseemann
Copy link
Member

That's a new issue, I think, the patch was for 6.0 and is either applied in nixpkgs or upstreamed into GHC. I've opened https://gitlab.haskell.org/ghc/ghc/-/issues/24129 for now, since I can't look into it myself atm.

@vcunat
Copy link
Member

vcunat commented Oct 28, 2023

#263923

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Staging
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

7 participants