Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/colorclass/files/, dev-python/colorclass/
Date: Sat, 08 Jan 2022 18:23:52
Message-Id: 1641666146.10f462be656df85eebfde36ccf2fcaaac0cd7c99.mgorny@gentoo
1 commit: 10f462be656df85eebfde36ccf2fcaaac0cd7c99
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 8 18:22:26 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 8 18:22:26 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f462be
7
8 dev-python/colorclass: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/colorclass/Manifest | 1 -
13 dev-python/colorclass/colorclass-2.2.0-r1.ebuild | 22 -----------------
14 .../files/colorclass-2.2.0-fix-py3.10.patch | 28 ----------------------
15 .../colorclass/files/colorclass-2.2.0-tests.patch | 12 ----------
16 4 files changed, 63 deletions(-)
17
18 diff --git a/dev-python/colorclass/Manifest b/dev-python/colorclass/Manifest
19 index a1c3916f4544..a72fca89d8ca 100644
20 --- a/dev-python/colorclass/Manifest
21 +++ b/dev-python/colorclass/Manifest
22 @@ -1,2 +1 @@
23 -DIST colorclass-2.2.0.gh.tar.gz 486151 BLAKE2B d8f4c9e826cf284df47bf2aac4da71f448818858e2383b331b5bba791d9db3c5c11d5aff74b3eb740e657914137b2b74b217854ab589806a22a0ff6697cbde1c SHA512 c627cdf6abdb5a60e9ecc1fb3b669898edc027fdc3f8cde31be2e10402ee308c2067fcd50d1228759e93fc58c521b7fc12e6b259233a17cf99f55cda26279fed
24 DIST colorclass-2.2.2.gh.tar.gz 490884 BLAKE2B e03c1a7091c133cea67c595363029121083d9a9d70a27f5803b20bb810b105ea9cb95aa68114ba98526b8a3b0e8365eadd7b375443215a5e0b636f0bd4cce632 SHA512 c38b58d4122e794654a8ac71adb2be0fb679eb10bd70c9d8f5dee06b3c978c1530bb3fb8fd6530d88aa35311a46a2590b709e4dcc6e3a81d14b90bf8cb74ebc1
25
26 diff --git a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild b/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
27 deleted file mode 100644
28 index fde6c8c536af..000000000000
29 --- a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
30 +++ /dev/null
31 @@ -1,22 +0,0 @@
32 -# Copyright 2019-2021 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -PYTHON_COMPAT=( python3_{7..10} pypy3 )
38 -inherit distutils-r1
39 -
40 -DESCRIPTION="Colorful worry-free console applications for multiple platforms"
41 -HOMEPAGE="https://pypi.org/project/colorclass/ https://github.com/Robpol86/colorclass"
42 -SRC_URI="https://github.com/Robpol86/colorclass/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
43 -
44 -LICENSE="MIT"
45 -SLOT="0"
46 -KEYWORDS="amd64 ~arm64 x86"
47 -
48 -PATCHES=(
49 - "${FILESDIR}/${P}-tests.patch"
50 - "${FILESDIR}/${P}-fix-py3.10.patch"
51 -)
52 -
53 -distutils_enable_tests pytest
54
55 diff --git a/dev-python/colorclass/files/colorclass-2.2.0-fix-py3.10.patch b/dev-python/colorclass/files/colorclass-2.2.0-fix-py3.10.patch
56 deleted file mode 100644
57 index ee67d6d40bb3..000000000000
58 --- a/dev-python/colorclass/files/colorclass-2.2.0-fix-py3.10.patch
59 +++ /dev/null
60 @@ -1,28 +0,0 @@
61 -From f8bbe9fdcff1d97b1d0e5dcb94680923cc43a507 Mon Sep 17 00:00:00 2001
62 -From: Ralph Broenink <ralph@×××××××××××××.net>
63 -Date: Mon, 24 Aug 2020 14:49:24 +0200
64 -Subject: [PATCH] Make code forwards-compatible with Python 3.9
65 -
66 -Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated since Python 3.3, and in 3.9 it will stop working
67 ----
68 - colorclass/codes.py | 7 ++++++-
69 - 1 file changed, 6 insertions(+), 1 deletion(-)
70 -
71 -diff --git a/colorclass/codes.py b/colorclass/codes.py
72 -index b0ecb03..8b6085d 100644
73 ---- a/colorclass/codes.py
74 -+++ b/colorclass/codes.py
75 -@@ -1,7 +1,12 @@
76 - """Handles mapping between color names and ANSI codes and determining auto color codes."""
77 -
78 - import sys
79 --from collections import Mapping
80 -+try:
81 -+ # Using or importing the ABCs from 'collections' instead of from 'collections.abc' is
82 -+ # deprecated since Python 3.3, and in 3.9 it will stop working
83 -+ from collections.abc import Mapping
84 -+except ImportError:
85 -+ from collections import Mapping
86 -
87 - BASE_CODES = {
88 - '/all': 0, 'b': 1, 'f': 2, 'i': 3, 'u': 4, 'flash': 5, 'outline': 6, 'negative': 7, 'invis': 8, 'strike': 9,
89
90 diff --git a/dev-python/colorclass/files/colorclass-2.2.0-tests.patch b/dev-python/colorclass/files/colorclass-2.2.0-tests.patch
91 deleted file mode 100644
92 index f25dd0440aa7..000000000000
93 --- a/dev-python/colorclass/files/colorclass-2.2.0-tests.patch
94 +++ /dev/null
95 @@ -1,12 +0,0 @@
96 -diff --git a/tests/test_example.py b/tests/test_example.py
97 -index 7ee8c05..3516460 100644
98 ---- a/tests/test_example.py
99 -+++ b/tests/test_example.py
100 -@@ -10,6 +10,7 @@ from tests.conftest import PROJECT_ROOT
101 - from tests.screenshot import RunNewConsole, screenshot_until_match
102 -
103 -
104 -+@×××××××××××.skip(reason="test fails on all platforms")
105 - @pytest.mark.parametrize('colors', [True, False, None])
106 - @pytest.mark.parametrize('light_bg', [True, False, None])
107 - def test_piped(colors, light_bg):