From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BC67913835B for ; Fri, 4 Jun 2021 12:00:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4617AE087F; Fri, 4 Jun 2021 12:00:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 28DFCE087F for ; Fri, 4 Jun 2021 12:00:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 20DC1341146 for ; Fri, 4 Jun 2021 12:00:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E5767A4 for ; Fri, 4 Jun 2021 12:00:46 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1622808040.4ee7fe8463cfc40961934755ae9d9b2be09f533c.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/sphinx/, dev-python/sphinx/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/sphinx/files/sphinx-4.0.2-py310.patch dev-python/sphinx/sphinx-4.0.2.ebuild X-VCS-Directories: dev-python/sphinx/files/ dev-python/sphinx/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 4ee7fe8463cfc40961934755ae9d9b2be09f533c X-VCS-Branch: master Date: Fri, 4 Jun 2021 12:00:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 960a3e5e-623d-4a4e-94f7-e706bc0b0662 X-Archives-Hash: 9d2e733680972560b0ebd78355febf29 commit: 4ee7fe8463cfc40961934755ae9d9b2be09f533c Author: Michał Górny gentoo org> AuthorDate: Fri Jun 4 11:10:13 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jun 4 12:00:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ee7fe84 dev-python/sphinx: Enable py3.10 Signed-off-by: Michał Górny gentoo.org> dev-python/sphinx/files/sphinx-4.0.2-py310.patch | 28 ++++++++++++++++++++++++ dev-python/sphinx/sphinx-4.0.2.ebuild | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dev-python/sphinx/files/sphinx-4.0.2-py310.patch b/dev-python/sphinx/files/sphinx-4.0.2-py310.patch new file mode 100644 index 00000000000..db0facafed5 --- /dev/null +++ b/dev-python/sphinx/files/sphinx-4.0.2-py310.patch @@ -0,0 +1,28 @@ +From 531a5ae9ef855761407d44fb49064ae6227868f5 Mon Sep 17 00:00:00 2001 +From: Takeshi KOMIYA +Date: Wed, 5 May 2021 22:11:41 +0900 +Subject: [PATCH] test: Adjust type annotataions in python 3.10.0b1 + +--- + tests/test_util_inspect.py | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/tests/test_util_inspect.py b/tests/test_util_inspect.py +index 7b86c6ade..8df06a865 100644 +--- a/tests/test_util_inspect.py ++++ b/tests/test_util_inspect.py +@@ -183,10 +183,7 @@ def test_signature_annotations(): + + # Instance annotations + sig = inspect.signature(f11) +- if sys.version_info < (3, 10): +- assert stringify_signature(sig) == '(x: CustomAnnotation, y: 123) -> None' +- else: +- assert stringify_signature(sig) == '(x: CustomAnnotation(), y: 123) -> None' ++ assert stringify_signature(sig) == '(x: CustomAnnotation, y: 123) -> None' + + # tuple with more than two items + sig = inspect.signature(f12) +-- +2.31.1 + diff --git a/dev-python/sphinx/sphinx-4.0.2.ebuild b/dev-python/sphinx/sphinx-4.0.2.ebuild index 1c6f8a61729..7cc217f2e35 100644 --- a/dev-python/sphinx/sphinx-4.0.2.ebuild +++ b/dev-python/sphinx/sphinx-4.0.2.ebuild @@ -4,7 +4,7 @@ EAPI=7 DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..9} pypy3 ) +PYTHON_COMPAT=( python3_{7..10} pypy3 ) PYTHON_REQ_USE="threads(+)" inherit distutils-r1 @@ -60,6 +60,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-3.2.1-doc-link.patch" + "${FILESDIR}/${P}-py310.patch" ) distutils_enable_tests pytest