Bug 257116 - textproc/py-sphinx: Update to 4.3.1
Summary: textproc/py-sphinx: Update to 4.3.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Many People
Assignee: Yasuhiro Kimura
URL: https://github.com/sphinx-doc/sphinx/...
Keywords: needs-qa
Depends on: 257410 257411
Blocks:
  Show dependency treegraph
 
Reported: 2021-07-11 18:38 UTC by Danilo G. Baio
Modified: 2022-01-11 02:57 UTC (History)
5 users (show)

See Also:
dbaio: maintainer-feedback+
thierry: maintainer-feedback+
antoine: exp-run+


Attachments
py-sphinx-4.0.4-exp1.patch (5.92 KB, patch)
2021-07-11 18:38 UTC, Danilo G. Baio
no flags Details | Diff
py-sphinx-4.1.2-exp2.patch (13.22 KB, patch)
2021-08-07 19:51 UTC, Danilo G. Baio
no flags Details | Diff
Updated patch file (15.62 KB, patch)
2021-12-14 04:41 UTC, Yasuhiro Kimura
no flags Details | Diff
Updated patch file (16.06 KB, patch)
2021-12-14 23:17 UTC, Yasuhiro Kimura
no flags Details | Diff
Updated patch file (10.76 KB, patch)
2021-12-15 16:48 UTC, Yasuhiro Kimura
no flags Details | Diff
Updated patch file (11.36 KB, patch)
2021-12-19 00:52 UTC, Yasuhiro Kimura
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Danilo G. Baio freebsd_committer freebsd_triage 2021-07-11 18:38:33 UTC
Created attachment 226374 [details]
py-sphinx-4.0.4-exp1.patch

textproc/py-sphinx: Update to 4.0.3

Changelog:	https://github.com/sphinx-doc/sphinx/blob/v4.0.3/CHANGES

`make test` with similar results as previous versions:
  1664 passed, 26 skipped, 1 deselected, 2 warnings in 130.02 seconds
Comment 1 Kubilay Kocak freebsd_committer freebsd_triage 2021-07-12 01:40:09 UTC
@Danilo exp-run ? is sufficient for portmgr to recieve exp-run request notifications until the flag is ack'd

 - Are there any consumer ports that pin sphinx to <4 or similar?
 - docutils and alabaster version spec (<) should be matched in our *_DEPENDS
Comment 2 Antoine Brodin freebsd_committer freebsd_triage 2021-07-12 08:52:40 UTC
Don't assign ticket to "nobody"
Comment 3 Kubilay Kocak freebsd_committer freebsd_triage 2021-07-13 03:26:15 UTC
(In reply to Antoine Brodin from comment #2)

It's assigned to a team until resolution. Please go away Antoine.
Comment 4 Antoine Brodin freebsd_committer freebsd_triage 2021-07-13 06:58:56 UTC
(In reply to Kubilay Kocak from comment #3)
Exp-run are portmgr terroritory,  please get off our lawn and stop being toxic with the project.
Comment 6 Danilo G. Baio freebsd_committer freebsd_triage 2021-07-14 22:54:05 UTC
(In reply to Antoine Brodin from comment #5)

Thanks Antoine. I'll need some time to check those.

lang/asis and textproc/castxml will be easier to fix.

textproc/py-rstfmt (which was added recently) is completely broken.

And a new Sphinx version was released. I will take a look at it as well.
https://pypi.org/project/Sphinx/#history
Comment 7 Danilo G. Baio freebsd_committer freebsd_triage 2021-08-07 19:51:36 UTC
Created attachment 227009 [details]
py-sphinx-4.1.2-exp2.patch

- Update Sphinx to 4.1.2.
- Fix lang/asis and textproc/castxml.
- Set textproc/py-rstfmt as broken (talked with Mateusz 0mp@).
- Repocopy the current Sphinx version (3.5.2) to textproc-py-sphinx3 and mark it as deprecated.
- math/sage: Use textproc-py-sphinx3 (Because it's just a build dependency).
Comment 9 Danilo G. Baio freebsd_committer freebsd_triage 2021-08-11 00:30:29 UTC
(In reply to Antoine Brodin from comment #8)

Oh, too many dependencies. I thought we wouldn't see a conflict here.

pkg-static: py38-sphinx-4.1.2,1 conflicts with py38-sphinx3-3.5.2,1 (installs files into the same place).  Problematic file: /usr/local/bin/sphinx-apidoc-3.8

I'll go to another path, checking if there is a way to disable sage's documentation build.

Thanks.
Comment 10 Thierry Thomas freebsd_committer freebsd_triage 2021-08-11 17:17:01 UTC
(Sorry for the delay, I have been traveling abroad)

Sage has an option for DOC, but sphinx is required anyways.

ATM, I've not been able to port the release candidates of Sage-9.4: strangely, it fails with the same kind of errors. Still investigating if I can fix it…
Comment 11 Yasuhiro Kimura freebsd_committer freebsd_triage 2021-09-18 16:30:26 UTC
New version 4.2.0 is released.

https://github.com/sphinx-doc/sphinx/blob/v4.2.0/CHANGES

This includes fix of runtime error with Python 3.10.
Comment 12 Yasuhiro Kimura freebsd_committer freebsd_triage 2021-12-14 04:41:35 UTC
Created attachment 230098 [details]
Updated patch file

Update sphinx to newer version 4.3.1.

This patch is same as Danilo's latest one except that textproc/py-sphinx is updated to newer version 4.3.1.
Comment 13 Yasuhiro Kimura freebsd_committer freebsd_triage 2021-12-14 23:17:02 UTC
Created attachment 230124 [details]
Updated patch file

Connect textproc/py-sphinx3 to ports tree.
Comment 14 Danilo G. Baio freebsd_committer freebsd_triage 2021-12-14 23:25:56 UTC
(In reply to Yasuhiro Kimura from comment #13)

The textproc/py-sphinx3 was only a test for math/sage, but it triggered conflicts, so you can remove it and just update text proc/py-sphinx.

IMHO we should focus on fix math/sage.

Regards.
Comment 15 Yasuhiro Kimura freebsd_committer freebsd_triage 2021-12-15 16:48:19 UTC
Created attachment 230142 [details]
Updated patch file

Remove textproc/py-sphinx3.
Comment 17 Yasuhiro Kimura freebsd_committer freebsd_triage 2021-12-19 00:52:50 UTC
Created attachment 230231 [details]
Updated patch file

* Fix build of devel/py-pysdl2.
* Remove needless CONFLICTS_INSTALL from textproc/py-sphinx/Makefile. It should have been removed with textproc/py-sphinx3.

I tried test build of math/maxima and sysutils/modules with poudriere and 13.0-RELEASE amd64 jail and both of them are built successfully as following.

https://people.freebsd.org/~yasu/poudriere/data/logs/bulk/130amd64-default-sphinx/2021-12-18_16h55m09s/logs/maxima-5.44.0_20.log
https://people.freebsd.org/~yasu/poudriere/data/logs/bulk/130amd64-default-sphinx/2021-12-18_19h46m18s/logs/modules-4.6.0.log
Comment 18 Antoine Brodin freebsd_committer freebsd_triage 2021-12-19 08:50:41 UTC
(In reply to Yasuhiro Kimura from comment #17)
Can you try modules on 13.0 i386 ?
Comment 19 Yasuhiro Kimura freebsd_committer freebsd_triage 2021-12-19 12:49:52 UTC
(In reply to Antoine Brodin from comment #18)

I mistook that build error of sysutils/modules is also 13.0-RELEASE amd64, and confirmed build fails with 13.0-RELEASE i386. According to the web page of Environment Modules there are some newer versions. So I try to update the port and check if build error is fixed.
Comment 20 Yasuhiro Kimura freebsd_committer freebsd_triage 2021-12-20 00:40:09 UTC
(In reply to Yasuhiro Kimura from comment #19)

Build error of sysutils/modules may have nothing to do with update of sphinx. This morning I rebooted my PC and after that build of sysutils/modules succeeds on 13.0-RELEASE i386 with sphinx 4.3.1.

https://people.freebsd.org/~yasu/poudriere/data/logs/bulk/130i386-default-sphinx/2021-12-20_09h16m44s/logs/modules-4.6.0.log
Comment 21 Antoine Brodin freebsd_committer freebsd_triage 2021-12-26 19:55:29 UTC
Exp-run looks fine
Comment 22 tech-lists 2021-12-29 22:25:32 UTC
are the issues described in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=260809 and https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257412 caused by the issues in this ticket?
Comment 23 Danilo G. Baio freebsd_committer freebsd_triage 2022-01-10 23:26:41 UTC
yasu@ as you prepared the last patch, you can commit it if you want.
Thanks.
Comment 24 Yasuhiro Kimura freebsd_committer freebsd_triage 2022-01-11 02:47:54 UTC
Take.
Comment 25 commit-hook freebsd_committer freebsd_triage 2022-01-11 02:50:59 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=21fd9a9ed6faf24e1befc1240a0cf91a609349c4

commit 21fd9a9ed6faf24e1befc1240a0cf91a609349c4
Author:     Danilo G. Baio <dbaio@freebsd.org>
AuthorDate: 2021-12-14 04:29:03 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2022-01-11 02:48:50 +0000

    textproc/py-sphinx: Update to 4.3.1

    ChangeLog:      https://github.com/sphinx-doc/sphinx/blob/v4.3.1/CHANGES
    PR:             257116
    Approved by:    python (dbaio)

 .../files/patch-doc_conf.py (new)                  | 10 ++++
 .../py-paperless/files/patch-docs_conf.py (new)    | 13 +++++
 devel/py-pysdl2/pkg-plist                          |  2 +-
 lang/asis/files/patch-doc_share_conf.py (new)      | 40 +++++++++++++++
 textproc/castxml/files/patch-doc_conf.py.in (new)  | 11 ++++
 textproc/py-rstfmt/Makefile                        |  2 +
 textproc/py-sphinx/Makefile                        | 13 ++---
 textproc/py-sphinx/distinfo                        |  6 +--
 .../files/patch-sphinx_util_typing.py (gone)       | 58 ----------------------
 9 files changed, 85 insertions(+), 70 deletions(-)
Comment 26 Yasuhiro Kimura freebsd_committer freebsd_triage 2022-01-11 02:57:56 UTC
Committed.