From: "Arthur Zamarin" <arthurzam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/sphinx/, dev-python/sphinx/files/
Date: Fri, 23 May 2025 12:57:21 +0000 (UTC) [thread overview]
Message-ID: <1748004989.6bf5e1e6730a7342b2d1db282b7a2a5ca0b36ecf.arthurzam@gentoo> (raw)
commit: 6bf5e1e6730a7342b2d1db282b7a2a5ca0b36ecf
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri May 23 12:54:02 2025 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri May 23 12:56:29 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf5e1e6
dev-python/sphinx: enable py3.14
Needed 3 patches from upstream master, which fix tests with py3.14.
Those patches modify tests only, so no impact for other compats and no
need for revbump.
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.../sphinx/files/sphinx-8.2.3-fix-python3.14.patch | 125 +++++++++++++++++++++
dev-python/sphinx/sphinx-8.2.3.ebuild | 9 +-
2 files changed, 128 insertions(+), 6 deletions(-)
diff --git a/dev-python/sphinx/files/sphinx-8.2.3-fix-python3.14.patch b/dev-python/sphinx/files/sphinx-8.2.3-fix-python3.14.patch
new file mode 100644
index 000000000000..56d567355710
--- /dev/null
+++ b/dev-python/sphinx/files/sphinx-8.2.3-fix-python3.14.patch
@@ -0,0 +1,125 @@
+https://github.com/sphinx-doc/sphinx/commit/8962398b761c3d85a7c74b6f789b3ffb127bde0c
+From: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
+Date: Thu, 6 Mar 2025 16:03:44 +0000
+Subject: [PATCH] autosummary: Update test for Python 3.14.0a5+ (#13418)
+
+`types.UnionType` and `typing.Union` have been merged.
+--- a/tests/test_extensions/test_ext_autosummary.py
++++ b/tests/test_extensions/test_ext_autosummary.py
+@@ -447,8 +447,12 @@ def test_autosummary_generate_content_for_module_imported_members(app):
+ ]
+ assert context['functions'] == ['bar']
+ assert context['all_functions'] == ['_quux', 'bar']
+- assert context['classes'] == ['Class', 'Foo']
+- assert context['all_classes'] == ['Class', 'Foo', '_Baz']
++ if sys.version_info >= (3, 14, 0, 'alpha', 5):
++ assert context['classes'] == ['Class', 'Foo', 'Union']
++ assert context['all_classes'] == ['Class', 'Foo', 'Union', '_Baz']
++ else:
++ assert context['classes'] == ['Class', 'Foo']
++ assert context['all_classes'] == ['Class', 'Foo', '_Baz']
+ assert context['exceptions'] == ['Exc']
+ assert context['all_exceptions'] == ['Exc', '_Exc']
+ assert context['attributes'] == ['CONSTANT1', 'qux', 'quuz', 'non_imported_member']
+https://github.com/sphinx-doc/sphinx/commit/e01e42f5fc738815b8499c4ede30c6caf130f0a4
+From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
+Date: Wed, 19 Mar 2025 20:11:35 +0000
+Subject: [PATCH] Fix ``INVALID_BUILTIN_CLASSES`` test for Python 3.14.0a6+
+
+--- a/tests/test_util/test_util_typing.py
++++ b/tests/test_util/test_util_typing.py
+@@ -205,7 +205,7 @@ def test_is_invalid_builtin_class() -> None:
+ zipfile.Path,
+ zipfile.CompleteDirs,
+ )
+- if sys.version_info[:2] >= (3, 13):
++ if sys.version_info[:2] == (3, 13):
+ invalid_types += (
+ # pathlib
+ Path,
+@@ -217,7 +217,7 @@ def test_is_invalid_builtin_class() -> None:
+ )
+
+ invalid_names = {(cls.__module__, cls.__qualname__) for cls in invalid_types}
+- if sys.version_info[:2] < (3, 13):
++ if sys.version_info[:2] != (3, 13):
+ invalid_names |= {
+ ('pathlib._local', 'Path'),
+ ('pathlib._local', 'PosixPath'),
+@@ -231,7 +231,7 @@ def test_is_invalid_builtin_class() -> None:
+ ('zipfile._path', 'Path'),
+ ('zipfile._path', 'CompleteDirs'),
+ }
+- assert _INVALID_BUILTIN_CLASSES.keys() == invalid_names
++ assert set(_INVALID_BUILTIN_CLASSES) == invalid_names
+
+
+ def test_restify_type_hints_containers():
+https://github.com/sphinx-doc/sphinx/commit/0227606e71dc765ed60cd0ad2c580a43b5ffca4f
+From: James Addison <55152140+jayaddison@users.noreply.github.com>
+Date: Mon, 12 May 2025 16:52:52 +0000
+Subject: [PATCH] Fix tests for Python 3.14.0a7 (#13527)
+
+Authored-by: Adam Turner <9087854+aa-turner@users.noreply.github.com>
+Co-authored-by: Adam Turner <9087854+aa-turner@users.noreply.github.com>
+Co-authored-by: James Addison <55152140+jayaddison@users.noreply.github.com>
+--- a/tests/test_extensions/test_ext_autodoc.py
++++ b/tests/test_extensions/test_ext_autodoc.py
+@@ -938,10 +938,14 @@ def test_autodoc_special_members(app):
+ }
+ if sys.version_info >= (3, 13, 0, 'alpha', 5):
+ options['exclude-members'] = '__static_attributes__,__firstlineno__'
++ if sys.version_info >= (3, 14, 0, 'alpha', 7):
++ ann_attr_name = '__annotations_cache__'
++ else:
++ ann_attr_name = '__annotations__'
+ actual = do_autodoc(app, 'class', 'target.Class', options)
+ assert list(filter(lambda l: '::' in l, actual)) == [
+ '.. py:class:: Class(arg)',
+- ' .. py:attribute:: Class.__annotations__',
++ f' .. py:attribute:: Class.{ann_attr_name}',
+ ' .. py:attribute:: Class.__dict__',
+ ' .. py:method:: Class.__init__(arg)',
+ ' .. py:attribute:: Class.__module__',
+--- a/tests/test_extensions/test_ext_autodoc_configs.py
++++ b/tests/test_extensions/test_ext_autodoc_configs.py
+@@ -1348,6 +1348,10 @@ def test_autodoc_type_aliases(app: SphinxTestApp) -> None:
+ # default
+ options = {'members': None}
+ actual = do_autodoc(app, 'module', 'target.autodoc_type_aliases', options)
++ if sys.version_info >= (3, 14, 0, 'alpha', 7):
++ attr2_typeinfo = ()
++ else:
++ attr2_typeinfo = (' :type: int',)
+ assert list(actual) == [
+ '',
+ '.. py:module:: target.autodoc_type_aliases',
+@@ -1368,7 +1372,7 @@ def test_autodoc_type_aliases(app: SphinxTestApp) -> None:
+ '',
+ ' .. py:attribute:: Foo.attr2',
+ ' :module: target.autodoc_type_aliases',
+- ' :type: int',
++ *attr2_typeinfo,
+ '',
+ ' docstring',
+ '',
+@@ -1421,6 +1425,10 @@ def test_autodoc_type_aliases(app: SphinxTestApp) -> None:
+ 'io.StringIO': 'my.module.StringIO',
+ }
+ actual = do_autodoc(app, 'module', 'target.autodoc_type_aliases', options)
++ if sys.version_info >= (3, 14, 0, 'alpha', 7):
++ attr2_typeinfo = ()
++ else:
++ attr2_typeinfo = (' :type: myint',)
+ assert list(actual) == [
+ '',
+ '.. py:module:: target.autodoc_type_aliases',
+@@ -1441,7 +1449,7 @@ def test_autodoc_type_aliases(app: SphinxTestApp) -> None:
+ '',
+ ' .. py:attribute:: Foo.attr2',
+ ' :module: target.autodoc_type_aliases',
+- ' :type: myint',
++ *attr2_typeinfo,
+ '',
+ ' docstring',
+ '',
diff --git a/dev-python/sphinx/sphinx-8.2.3.ebuild b/dev-python/sphinx/sphinx-8.2.3.ebuild
index 611d7da3265f..e686bff12650 100644
--- a/dev-python/sphinx/sphinx-8.2.3.ebuild
+++ b/dev-python/sphinx/sphinx-8.2.3.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{11..13} pypy3_11 )
+PYTHON_COMPAT=( python3_{11..14} pypy3_11 )
PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
@@ -72,7 +72,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
- #"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
+ "${FILESDIR}/${P}-fix-python3.14.patch" # patch collection, merged upstream
)
distutils_enable_tests pytest
@@ -111,10 +111,7 @@ python_test() {
tests/test_util/test_util_typing.py::test_restify
tests/test_util/test_util_typing.py::test_stringify_annotation
tests/test_util/test_util_typing.py::test_stringify_type_union_operator
- )
- ;&
- pypy3)
- EPYTEST_DESELECT+=(
+ # from pypy3 era
tests/test_extensions/test_ext_autodoc.py::test_autodoc_exception
tests/test_extensions/test_ext_autodoc.py::test_autodoc_ignore_module_all
tests/test_extensions/test_ext_autodoc.py::test_autodoc_inherited_members_None
next reply other threads:[~2025-05-23 12:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-23 12:57 Arthur Zamarin [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-10 11:24 [gentoo-commits] repo/gentoo:master commit in: dev-python/sphinx/, dev-python/sphinx/files/ Michał Górny
2025-08-31 19:05 Eli Schwartz
2021-10-16 6:09 Michał Górny
2021-08-03 8:52 Michał Górny
2021-06-04 12:00 Michał Górny
2020-12-01 10:12 Sam James
2018-10-16 0:45 Virgil Dupras
2017-01-19 0:49 David Seifert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1748004989.6bf5e1e6730a7342b2d1db282b7a2a5ca0b36ecf.arthurzam@gentoo \
--to=arthurzam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox