Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/traitlets/, dev-python/traitlets/files/
Date: Wed, 23 Jun 2021 13:19:29
Message-Id: 1624454357.c1e4dab588c8140daf2ea43d2b7f998bb1171943.andrewammerlaan@gentoo
1 commit: c1e4dab588c8140daf2ea43d2b7f998bb1171943
2 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 23 13:14:05 2021 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 23 13:19:17 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e4dab5
7
8 dev-python/traitlets: enable py3.10
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
12
13 .../files/traitlets-5.0.5-python3_10.patch | 33 ++++++++++++++++++++++
14 dev-python/traitlets/traitlets-5.0.5.ebuild | 9 ++++--
15 2 files changed, 40 insertions(+), 2 deletions(-)
16
17 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
18 new file mode 100644
19 index 00000000000..53ade693a3a
20 --- /dev/null
21 +++ b/dev-python/traitlets/files/traitlets-5.0.5-python3_10.patch
22 @@ -0,0 +1,33 @@
23 +From dbb604946745ed90c6e9f6ed17f2bde253042d52 Mon Sep 17 00:00:00 2001
24 +From: Olga <olgamatoula@×××××.com>
25 +Date: Fri, 7 May 2021 17:27:09 +0100
26 +Subject: [PATCH] Fix string assertion for python3.10
27 +
28 +---
29 + traitlets/tests/test_traitlets_enum.py | 6 +++++-
30 + 1 file changed, 5 insertions(+), 1 deletion(-)
31 +
32 +diff --git a/traitlets/tests/test_traitlets_enum.py b/traitlets/tests/test_traitlets_enum.py
33 +index 769e830b..a87dd705 100644
34 +--- a/traitlets/tests/test_traitlets_enum.py
35 ++++ b/traitlets/tests/test_traitlets_enum.py
36 +@@ -5,6 +5,7 @@
37 +
38 + import unittest
39 + import enum
40 ++import sys
41 + from traitlets import HasTraits, TraitError, Enum, UseEnum, CaselessStrEnum, FuzzyEnum
42 +
43 +
44 +@@ -87,7 +88,10 @@ def test_assign_scoped_enum_value_name(self):
45 + example = self.Example()
46 + example.color = value
47 + self.assertIsInstance(example.color, Color)
48 +- self.assertEqual(str(example.color), value)
49 ++ if sys.version_info < (3, 10):
50 ++ self.assertEqual(str(example.color), value)
51 ++ else:
52 ++ self.assertEqual(repr(example.color), value)
53 +
54 + def test_assign_bad_enum_value_name__raises_error(self):
55 + # -- CONVERT: string => Enum value (item)
56
57 diff --git a/dev-python/traitlets/traitlets-5.0.5.ebuild b/dev-python/traitlets/traitlets-5.0.5.ebuild
58 index 75a741049c5..d1bd74f7d5f 100644
59 --- a/dev-python/traitlets/traitlets-5.0.5.ebuild
60 +++ b/dev-python/traitlets/traitlets-5.0.5.ebuild
61 @@ -3,7 +3,8 @@
62
63 EAPI=7
64
65 -PYTHON_COMPAT=( python3_{7..9} )
66 +PYTHON_COMPAT=( python3_{7..10} )
67 +DISTUTILS_USE_SETUPTOOLS=no
68
69 inherit distutils-r1
70
71 @@ -17,7 +18,11 @@ KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
72
73 RDEPEND="
74 dev-python/ipython_genutils[${PYTHON_USEDEP}]
75 - "
76 +"
77 +
78 +PATCHES=(
79 + "${FILESDIR}/${P}-python3_10.patch"
80 +)
81
82 distutils_enable_sphinx docs/source \
83 dev-python/ipython_genutils \