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 2D8F21382C5 for ; Wed, 23 Jun 2021 13:19:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5380DE08E8; Wed, 23 Jun 2021 13:19:28 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 39F7CE08E8 for ; Wed, 23 Jun 2021 13:19:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 102EA33C1EB for ; Wed, 23 Jun 2021 13:19:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CDC467A1 for ; Wed, 23 Jun 2021 13:19:24 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1624454357.c1e4dab588c8140daf2ea43d2b7f998bb1171943.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/traitlets/, dev-python/traitlets/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/traitlets/files/traitlets-5.0.5-python3_10.patch dev-python/traitlets/traitlets-5.0.5.ebuild X-VCS-Directories: dev-python/traitlets/files/ dev-python/traitlets/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: c1e4dab588c8140daf2ea43d2b7f998bb1171943 X-VCS-Branch: master Date: Wed, 23 Jun 2021 13:19:24 +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: 1955f9f9-1389-4860-87c5-3f9dcf3a1ae5 X-Archives-Hash: 86aafd74635ce62ac2f23c98e337d1be commit: c1e4dab588c8140daf2ea43d2b7f998bb1171943 Author: Andrew Ammerlaan gentoo org> AuthorDate: Wed Jun 23 13:14:05 2021 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Wed Jun 23 13:19:17 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e4dab5 dev-python/traitlets: enable py3.10 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan gentoo.org> .../files/traitlets-5.0.5-python3_10.patch | 33 ++++++++++++++++++++++ dev-python/traitlets/traitlets-5.0.5.ebuild | 9 ++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dev-python/traitlets/files/traitlets-5.0.5-python3_10.patch b/dev-python/traitlets/files/traitlets-5.0.5-python3_10.patch new file mode 100644 index 00000000000..53ade693a3a --- /dev/null +++ b/dev-python/traitlets/files/traitlets-5.0.5-python3_10.patch @@ -0,0 +1,33 @@ +From dbb604946745ed90c6e9f6ed17f2bde253042d52 Mon Sep 17 00:00:00 2001 +From: Olga +Date: Fri, 7 May 2021 17:27:09 +0100 +Subject: [PATCH] Fix string assertion for python3.10 + +--- + traitlets/tests/test_traitlets_enum.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/traitlets/tests/test_traitlets_enum.py b/traitlets/tests/test_traitlets_enum.py +index 769e830b..a87dd705 100644 +--- a/traitlets/tests/test_traitlets_enum.py ++++ b/traitlets/tests/test_traitlets_enum.py +@@ -5,6 +5,7 @@ + + import unittest + import enum ++import sys + from traitlets import HasTraits, TraitError, Enum, UseEnum, CaselessStrEnum, FuzzyEnum + + +@@ -87,7 +88,10 @@ def test_assign_scoped_enum_value_name(self): + example = self.Example() + example.color = value + self.assertIsInstance(example.color, Color) +- self.assertEqual(str(example.color), value) ++ if sys.version_info < (3, 10): ++ self.assertEqual(str(example.color), value) ++ else: ++ self.assertEqual(repr(example.color), value) + + def test_assign_bad_enum_value_name__raises_error(self): + # -- CONVERT: string => Enum value (item) diff --git a/dev-python/traitlets/traitlets-5.0.5.ebuild b/dev-python/traitlets/traitlets-5.0.5.ebuild index 75a741049c5..d1bd74f7d5f 100644 --- a/dev-python/traitlets/traitlets-5.0.5.ebuild +++ b/dev-python/traitlets/traitlets-5.0.5.ebuild @@ -3,7 +3,8 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) +DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 @@ -17,7 +18,11 @@ KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86" RDEPEND=" dev-python/ipython_genutils[${PYTHON_USEDEP}] - " +" + +PATCHES=( + "${FILESDIR}/${P}-python3_10.patch" +) distutils_enable_sphinx docs/source \ dev-python/ipython_genutils \