Gentoo Archives: gentoo-commits

From: Arthur Zamarin <arthurzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/leather/files/, dev-python/leather/
Date: Sat, 09 Oct 2021 06:34:38
Message-Id: 1633761247.599c45a061bfe0d4aada5da435768814c0a70377.arthurzam@gentoo
1 commit: 599c45a061bfe0d4aada5da435768814c0a70377
2 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 8 20:27:11 2021 +0000
4 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 9 06:34:07 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=599c45a0
7
8 dev-python/leather: drop 0.3.3-r2
9
10 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
11
12 dev-python/leather/Manifest | 1 -
13 .../leather/files/leather-0.3.3-fix-py3.10.patch | 40 -----------------
14 dev-python/leather/leather-0.3.3-r2.ebuild | 51 ----------------------
15 3 files changed, 92 deletions(-)
16
17 diff --git a/dev-python/leather/Manifest b/dev-python/leather/Manifest
18 index c91e23b5c9f..e5864e33e63 100644
19 --- a/dev-python/leather/Manifest
20 +++ b/dev-python/leather/Manifest
21 @@ -1,2 +1 @@
22 -DIST leather-0.3.3-src.tar.gz 40522 BLAKE2B 3c7e6a48615751b310b7f066f2a78a2494e00256cae2ebfb4633c9389cca2477c2265fcf8c68f37733568ef729db1a5daf02ddc640bf2a60f2b39127c9a38d91 SHA512 30ea50ac6f97c55ee695b0e175a27e1e64fd17da7b0686ca8595fe0e5067932e19e59368fe6441f8f291ec52be3e597a80f8e04a3fcc0eeae33b3a5b3030e1d6
23 DIST leather-0.3.4.gh.tar.gz 41368 BLAKE2B a1181da5904234677290134726da33a71e0f37e6f0161beb0ec7a73efca1b2b26e973221f2f42b72fd2640ef503a8adc905273885deef212ee9d1aae6d91f804 SHA512 0547adf5d455afe9397cf9c597cc7edbcdbe25bb56e32d764c67119bfe1329d959834f2a41720adb51ec926065e044feb27f7a5e3f800c8636a22d4f96752212
24
25 diff --git a/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch b/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch
26 deleted file mode 100644
27 index 8ec9e1767a4..00000000000
28 --- a/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch
29 +++ /dev/null
30 @@ -1,40 +0,0 @@
31 -From 5dd1d3cc82d426388c66db8e3761ca2bf99a3991 Mon Sep 17 00:00:00 2001
32 -From: Brian <brian@×××××××××××.com>
33 -Date: Fri, 27 Mar 2020 17:08:50 -0400
34 -Subject: [PATCH] import from collections.abc to suppress python 3.7 warning
35 -
36 ----
37 - leather/series/base.py | 5 ++++-
38 - leather/series/category.py | 5 ++++-
39 - 2 files changed, 8 insertions(+), 2 deletions(-)
40 -
41 -diff --git a/leather/series/base.py b/leather/series/base.py
42 -index c5790e5..959e827 100644
43 ---- a/leather/series/base.py
44 -+++ b/leather/series/base.py
45 -@@ -1,6 +1,9 @@
46 - #!/usr/bin/env python
47 -
48 --from collections import Iterable, Sequence, Mapping
49 -+try:
50 -+ from collections.abc import Iterable, Sequence, Mapping
51 -+except ImportError:
52 -+ from collections import Iterable, Sequence, Mapping
53 - from functools import partial
54 -
55 - import six
56 -diff --git a/leather/series/category.py b/leather/series/category.py
57 -index c575308..3678377 100644
58 ---- a/leather/series/category.py
59 -+++ b/leather/series/category.py
60 -@@ -1,6 +1,9 @@
61 - #!/usr/bin/env python
62 -
63 --from collections import Iterable, Sequence, Mapping
64 -+try:
65 -+ from collections.abc import Iterable, Sequence, Mapping
66 -+except ImportError:
67 -+ from collections import Iterable, Sequence, Mapping
68 - from functools import partial
69 -
70 - import six
71
72 diff --git a/dev-python/leather/leather-0.3.3-r2.ebuild b/dev-python/leather/leather-0.3.3-r2.ebuild
73 deleted file mode 100644
74 index e2397fc3ccf..00000000000
75 --- a/dev-python/leather/leather-0.3.3-r2.ebuild
76 +++ /dev/null
77 @@ -1,51 +0,0 @@
78 -# Copyright 2021 Gentoo Authors
79 -# Distributed under the terms of the GNU General Public License v2
80 -
81 -EAPI=8
82 -
83 -PYTHON_COMPAT=( python3_{8..10} )
84 -
85 -inherit distutils-r1
86 -
87 -DESCRIPTION="Python charting for 80% of humans."
88 -HOMEPAGE="https://github.com/wireservice/leather https://pypi.org/project/leather/"
89 -SRC_URI="https://github.com/wireservice/leather/archive/refs/tags/${PV}.tar.gz -> ${P}-src.tar.gz"
90 -
91 -LICENSE="MIT"
92 -SLOT="0"
93 -KEYWORDS="~amd64"
94 -IUSE="+xml"
95 -
96 -# Other packages have BDEPEND="test? ( dev-python/leather[xml] )"
97 -TEST_AGAINST_RDEPEND="xml? ( dev-python/lxml[${PYTHON_USEDEP}] )"
98 -RDEPEND="
99 - ${TEST_AGAINST_RDEPEND}
100 - dev-python/cssselect[${PYTHON_USEDEP}]
101 - dev-python/six[${PYTHON_USEDEP}]
102 -"
103 -
104 -PATCHES=(
105 - "${FILESDIR}/${P}-fix-py3.10.patch"
106 -)
107 -
108 -distutils_enable_tests pytest
109 -distutils_enable_sphinx docs \
110 - dev-python/sphinx_rtd_theme
111 -
112 -python_prepare_all() {
113 - local requirements_files sed_args
114 -
115 - sed_args=(
116 - -e '/coverage/d'
117 - -e '/lxml/d' # lxml is required only when leather is used as a test dependency
118 - -e '/nose/d'
119 - -e '/tox/d'
120 - -e '/Sphinx/d'
121 - -e '/sphinx_rtd_theme/d'
122 - -e '/unittest2/d'
123 - )
124 -
125 - requirements_files+=(requirements*.txt)
126 - sed "${sed_args[@]}" -i "${requirements_files[@]}" || die
127 - distutils-r1_python_prepare_all
128 -}