diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-31 20:59:14 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-31 20:59:14 +0100 |
| commit | e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch) | |
| tree | 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /dev-python/colorclass | |
| parent | 908778078736bd36f7a60a2d576d415cb8e000fa (diff) | |
gentoo resync : 31.05.2021
Diffstat (limited to 'dev-python/colorclass')
| -rw-r--r-- | dev-python/colorclass/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/colorclass/colorclass-2.2.0-r1.ebuild | 7 | ||||
| -rw-r--r-- | dev-python/colorclass/files/colorclass-2.2.0-fix-py3.10.patch | 28 |
3 files changed, 34 insertions, 4 deletions
diff --git a/dev-python/colorclass/Manifest b/dev-python/colorclass/Manifest index d2f0d6d146ad..7c7dbcf5d1a8 100644 --- a/dev-python/colorclass/Manifest +++ b/dev-python/colorclass/Manifest @@ -1,4 +1,5 @@ +AUX colorclass-2.2.0-fix-py3.10.patch 1141 BLAKE2B 3ee06d510c39af677977203af1e1ac8f7de50ec93afc9540de45ae62e6ac480b5d0a58407845b92edb193ef014f42fa8132a141a8698bf5499fce4e71e9dca67 SHA512 70d7e9cfdc6647c77ca0e36407cea51f7ead276edf9e41201ca307a282ac36acf0d5bb622e2e76f76e58ec52d2e91c201b1b2490565e3698aff42852a9520acc AUX colorclass-2.2.0-tests.patch 483 BLAKE2B ea0a953102fcb693e451f837cd35b77a0a8430ed7f44e898a8c6b8862643c8f51ef6d793153af795862561df4cb6046c98e9658409aded87ef74073e0858a26f SHA512 f415192d9de61ee8d0d6ac39f33effdc4b107069cc9a9abc3c0b1ecdb903ebe9785036385bac59217a33a75c0bd267dab2a9f2e9b9127b00e4abf4e7632123f2 DIST colorclass-2.2.0.gh.tar.gz 486151 BLAKE2B d8f4c9e826cf284df47bf2aac4da71f448818858e2383b331b5bba791d9db3c5c11d5aff74b3eb740e657914137b2b74b217854ab589806a22a0ff6697cbde1c SHA512 c627cdf6abdb5a60e9ecc1fb3b669898edc027fdc3f8cde31be2e10402ee308c2067fcd50d1228759e93fc58c521b7fc12e6b259233a17cf99f55cda26279fed -EBUILD colorclass-2.2.0-r1.ebuild 568 BLAKE2B ecc8711e5b363305526d6a2044850caee04ab71de6fe2fb6b8d387d2a3c9840f4eaf196b7b7e1add47f7b9811c48e7e4a5207b88f728cbc022c253c21333caab SHA512 23b14673a2b884cd1a99253c97f667c21d8288c3ff91f865b400d6cbeed1739cf3fdf8883e23138a04b6fa685be5a6590bf04624ba9e7cbc2645cf2e4ab83264 +EBUILD colorclass-2.2.0-r1.ebuild 594 BLAKE2B 84541c2864698d0df1a5fba5cbbd810c9f0d7fbbc52cf57d87ba9d2983839a8a34df6d590351cc2d954f4be1c415c6948f971bf86a368ff72b1a2a00c6c293d7 SHA512 591c3ee088ffb41f135bb1962af3435b8da17d0ed8606a6e2a6c3c0440fb4f3d33c8216f4399aec330cfc81ce44ffdcb865d592b53f1cf7ee0ea1b1e68791766 MISC metadata.xml 374 BLAKE2B 1656d6f1d6a6d8bc75c1f2d9b790c85a5992ffb94f8bf56cac32dfd07833f8f8417b782f9418515c15bc0cac48659409a11a087ca8e839e1ec7743349727f511 SHA512 9ce3b60ea6e344f10daff59046d494090ef274cd905419dcfcc4f1e0a6f353d959d51ababd9744e9e1f0377452a5cebd52b5760a27fe55d3bf2b4e1500790551 diff --git a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild b/dev-python/colorclass/colorclass-2.2.0-r1.ebuild index 8f1559141ef3..fde6c8c536af 100644 --- a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild +++ b/dev-python/colorclass/colorclass-2.2.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} pypy3 ) +PYTHON_COMPAT=( python3_{7..10} pypy3 ) inherit distutils-r1 DESCRIPTION="Colorful worry-free console applications for multiple platforms" @@ -15,7 +15,8 @@ SLOT="0" KEYWORDS="amd64 ~arm64 x86" PATCHES=( - "${FILESDIR}/colorclass-2.2.0-tests.patch" + "${FILESDIR}/${P}-tests.patch" + "${FILESDIR}/${P}-fix-py3.10.patch" ) distutils_enable_tests pytest 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 new file mode 100644 index 000000000000..ee67d6d40bb3 --- /dev/null +++ b/dev-python/colorclass/files/colorclass-2.2.0-fix-py3.10.patch @@ -0,0 +1,28 @@ +From f8bbe9fdcff1d97b1d0e5dcb94680923cc43a507 Mon Sep 17 00:00:00 2001 +From: Ralph Broenink <ralph@ralphbroenink.net> +Date: Mon, 24 Aug 2020 14:49:24 +0200 +Subject: [PATCH] Make code forwards-compatible with Python 3.9 + +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 +--- + colorclass/codes.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/colorclass/codes.py b/colorclass/codes.py +index b0ecb03..8b6085d 100644 +--- a/colorclass/codes.py ++++ b/colorclass/codes.py +@@ -1,7 +1,12 @@ + """Handles mapping between color names and ANSI codes and determining auto color codes.""" + + import sys +-from collections import Mapping ++try: ++ # 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 ++ from collections.abc import Mapping ++except ImportError: ++ from collections import Mapping + + BASE_CODES = { + '/all': 0, 'b': 1, 'f': 2, 'i': 3, 'u': 4, 'flash': 5, 'outline': 6, 'negative': 7, 'invis': 8, 'strike': 9, |