PR#44: Update to 5.0.2 - rpms/python-sphinx

rpms / python-sphinx

#44 Update to 5.0.2

Merged 2 years ago by ksurma. Opened 2 years ago by ksurma.

rpms/ ksurma/python-sphinx sphinx-5 into rawhide

Karolina Surma • 2 years ago

a0cc515

.gitignore

file modified

		`@@ -37,3 +37,4 @@`
		`/Sphinx-4.3.1.tar.gz`
		`/Sphinx-4.4.0.tar.gz`
		`/Sphinx-4.5.0.tar.gz`
		`+ /Sphinx-5.0.2.tar.gz`

10336.patch

file removed

-23

		`@@ -1,23 +0,0 @@`
		`- From a314927e7451c255f7d4678feef32048dab5f9b2 Mon Sep 17 00:00:00 2001`
		`- From: Adam Turner <9087854+aa-turner@users.noreply.github.com>`
		`- Date: Sat, 9 Apr 2022 20:38:47 +0100`
		`- Subject: [PATCH] Fix test_restify`
		`-`
		`- ---`
		`- sphinx/util/typing.py \| 3 +++`
		`- 1 file changed, 3 insertions(+)`
		`-`
		`- diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py`
		`- index 1534b2c8ee..8e48b184bc 100644`
		`- --- a/sphinx/util/typing.py`
		`- +++ b/sphinx/util/typing.py`
		`- @@ -215,6 +215,9 @@ def _restify_py37(cls: Optional[Type], mode: str = 'fully-qualified-except-typin`
		`- return text`
		`- elif isinstance(cls, typing._SpecialForm):`
		- return ':py:obj:`~%s.%s`' % (cls.__module__, cls._name)
		`- + elif sys.version_info >= (3, 11) and cls is typing.Any:`
		`- + # handle bpo-46998`
		- + return f':py:obj:`~{cls.__module__}.{cls.__name__}`'
		`- elif hasattr(cls, '__qualname__'):`
		`- if cls.__module__ == 'typing':`
		- return ':py:class:`~%s.%s`' % (cls.__module__, cls.__qualname__)

python-sphinx.spec

file modified

+5 -6

		`@@ -24,11 +24,11 @@`
		`%global upstream_name Sphinx`

		`Name: python-sphinx`
		`- %global general_version 4.5.0`
		`+ %global general_version 5.0.2`
		`#global prerel ...`
		`%global upstream_version %{general_version}%{?prerel}`
		`Version: %{general_version}%{?prerel:~%{prerel}}`
		`- Release: 3%{?dist}`
		`+ Release: 1%{?dist}`
		`Epoch: 1`
		`Summary: Python documentation generator`

		`@@ -45,10 +45,6 @@`
		`# which causes that test to fail.`
		`Patch1: sphinx-test_theming.diff`

		`- # Fix test_restify for Python 3.11`
		`- # https://github.com/sphinx-doc/sphinx/pull/10336`
		`- Patch2: https://github.com/sphinx-doc/sphinx/pull/10336.patch`
		`-`
		`BuildArch: noarch`

		`BuildRequires: make`
		`@@ -368,6 +364,9 @@`


		`%changelog`
		`+ * Tue Jun 21 2022 Karolina Surma <ksurma@redhat.com> - 1:5.0.2-1`
		`+ - Update to 5.0.2`
		`+`
		`* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1:4.5.0-3`
		`- Rebuilt for Python 3.11`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (Sphinx-4.5.0.tar.gz) = b44d2a81ed67adaefe16a07ae0cf053b5e6c775023aaa6c57d7b3950f171deac410e8004f787b151c3c2fc350650aa69a4dc2dc7239d1fd3d351e5194617cb2c`
		`+ SHA512 (Sphinx-5.0.2.tar.gz) = d564697f0b82a9a59dd6a81e7822dbeac00fb6cc98cdc2422f04ec87c5133b5e03057ccdfdcfe38dccff41f6c53262d49f4ee6f77047c579aa2e55370bfe2dc6`

sphinx-test_theming.diff

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`diff -ru Sphinx-1.7.6/tests/test_theming.py Sphinx-1.7.6_patched/tests/test_theming.py`
		`--- Sphinx-1.7.6/tests/test_theming.py 2018-07-16 11:24:40.000000000 +0200`
		`+++ Sphinx-1.7.6_patched/tests/test_theming.py 2018-07-20 15:17:35.049263077 +0200`
		`- @@ -31,7 +31,7 @@`
		`+ @@ -25,7 +25,7 @@`
		`themes.append('alabaster')`

		`# test Theme class API`

ksurma commented 2 years ago

Impact check ongoing: https://copr.fedorainfracloud.org/coprs/ksurma/sphinx-5/
Biggest blocker so far: python-breathe (10 more packages FTB because of it)

Packages with pinned deps to Sphinx < 5:

Sphinx < 5:
python-breathe-0:4.33.1-2.fc37.src
python-h2-0:4.1.0-7.fc37.src
~~python-myst-parser-0:0.17.2-2.fc37.src~~ - PR to update to 0.18.0 in dist-git
python-priority-0:2.0.0-7.fc37.src
python-sphinx-panels-0:0.6.0-3.fc37.src
python-sphinx-tabs-0:3.1.0-7.fc37.src
python3-sphinxcontrib-zopeext-0:0.3.2-3.fc37.noarch

defolos commented 2 years ago

I've just pushed an update to breathe which removes the restriction of Sphinx < 5

ksurma commented 2 years ago

@defolos, thank you!

zuul commented 2 years ago

Build succeeded.

check-for-arches : SUCCESS in 1m 07s
rpm-scratch-build : SUCCESS in 11m 41s
rpm-scratch-build-s390x : SKIPPED (non-voting)
rpm-scratch-build-ppc64le : SKIPPED (non-voting)
rpm-scratch-build-i686 : SKIPPED (non-voting)
rpm-scratch-build-aarch64 : SKIPPED (non-voting)
rpm-linter : SUCCESS in 2m 23s (non-voting)
rpm-rpminspect : SUCCESS in 4m 38s (non-voting)
check-for-tests : SUCCESS in 26s
check-for-sti-tests : SUCCESS in 23s
check-for-fmf-tests : SUCCESS in 24s
rpm-install-test : SUCCESS in 3m 10s
rpm-test : SKIPPED
rpm-tmt-test : SKIPPED
rpm-sti-test : SKIPPED

ksurma commented 2 years ago

List of problematic packages as of today:

Require Sphinx < 5:
python-sphinx-tabs-0:3.1.0-7.fc37.src - can be updated to a version that supports Sphinx 5
python-sphinx-panels-0:0.6.0-3.fc37.src - won't be ported to Sphinx 5, BZ open
python3-sphinxcontrib-zopeext-0:0.3.2-3.fc37.noarch - isn't yet ported to Sphinx 5, BZ open
python3-pydata-sphinx-theme - BZ open, found later than others because it was FTBFS with Python 3.11 (impacts python-ipyparallel, python-mplcursors, python-networkx)

copr-keygen - BZ open on python-sphinxcontrib-httpdomain

language = None issue hit those:
coq
kea
libcamera
liblognorm

I'll continue to mitigate the impact/open BZs on the remaining packages.

ksurma commented 2 years ago

Status update

Open PRs
https://src.fedoraproject.org/rpms/coq/pull-request/1
https://src.fedoraproject.org/rpms/python-sphinx-tabs/pull-request/4 (will only work after this is merged)
https://src.fedoraproject.org/rpms/python-django/pull-request/28
https://src.fedoraproject.org/rpms/python-sphinx_rtd_theme/pull-request/9
https://src.fedoraproject.org/rpms/python-myst-parser/pull-request/9

All created BZ's are linked to the Sphinx ticket as blockers (https://bugzilla.redhat.com/show_bug.cgi?id=2082944)

Biggest problems
python3-sphinxcontrib-zopeext-0:0.3.2-3.fc37.noarch - BZ open, this needs porting to Sphinx 5 upstream - python-ZODB-0:5.7.0-2.fc37.src depends on it
python3-pydata-sphinx-theme - BZ open, needs sphinx-design in Fedora, Package review pending - three more packages depend on it

Pull-Request has been merged by ksurma

2 years ago