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/rapidfuzz/, dev-python/rapidfuzz/files/
Date: Sat, 01 Oct 2022 09:36:42
Message-Id: 1664616946.c084621e76d7d8ec1aa6a2d180c620f4a28c8a96.mgorny@gentoo
1 commit: c084621e76d7d8ec1aa6a2d180c620f4a28c8a96
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 1 09:35:46 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 1 09:35:46 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c084621e
7
8 dev-python/rapidfuzz: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/rapidfuzz/Manifest | 3 --
13 .../files/rapidfuzz-2.9.0-test-pandas.patch | 35 ---------------
14 dev-python/rapidfuzz/rapidfuzz-2.10.0.ebuild | 46 --------------------
15 dev-python/rapidfuzz/rapidfuzz-2.10.1.ebuild | 45 -------------------
16 dev-python/rapidfuzz/rapidfuzz-2.9.0.ebuild | 50 ----------------------
17 5 files changed, 179 deletions(-)
18
19 diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
20 index c4036bf45fa9..73a52b2bb27c 100644
21 --- a/dev-python/rapidfuzz/Manifest
22 +++ b/dev-python/rapidfuzz/Manifest
23 @@ -1,4 +1 @@
24 -DIST rapidfuzz-2.10.0.tar.gz 782698 BLAKE2B f2b4ead136162fd3592b16978a58cd3a2d66489f05aefdf58fd137ebf34f347368f437b3ee836b36122b00863f0c238c8191307f6b586676db59ebfa2d370e1c SHA512 b704a535021924e436a1cebe397e747d3e39b6a4ec12718bbb2a91c326d1977c51bd7ca9a4b2c2d380fdc27ea76b1549d61dea511ed86054aceb1d2180716627
25 -DIST rapidfuzz-2.10.1.tar.gz 782833 BLAKE2B a8be0ad8c617d8389b5fd22bff06e3887665dedd73580ac6ed29c3f5b895c399ffa0ac6ea983cb0a12d279d5312514e645f75d1a09a40be7108097b74e78c2d5 SHA512 006c714c4c2b86d77682042c7bd3e7a19328a56ff12b42f01e96712c4a94db654d63607363cf68b746416f107927bdee9dee9d7d29c80eda7c7fa74e0c21b75d
26 DIST rapidfuzz-2.10.2.tar.gz 788167 BLAKE2B 91264d83159ce91cac33138c2589d468ffb079daef06f1917596892b3c5fbb99f2012d79ca05f728e6d49c2241d83f68e0d3a44956cfdfafd38cae428496f507 SHA512 3d7610a2e4b32fbfaa0ac043847829bfc436e61c2d0c76d526fc0827cca4fd10a0b6ae659bd61ed48604695c4782bcb0984d2becaf84494b84a5d8e71c22e97a
27 -DIST rapidfuzz-2.9.0.tar.gz 780939 BLAKE2B c43dfd89d18dc1f5b4738930f1d0d9c4956f66479217b4400844b50636e2b0bb13f15d8b9a6edc0ce30fc943f35a44dad802ecf90107556ed2dee7f70fcc16ac SHA512 b8f83cc35e84a4ed95e2086eb7bfbc6e7e2e25a05accc965092b8b51012c79e86e2af15397577bb91aadfa9a257a62d6f3d6bb9bf928a9c767d53468904a12be
28
29 diff --git a/dev-python/rapidfuzz/files/rapidfuzz-2.9.0-test-pandas.patch b/dev-python/rapidfuzz/files/rapidfuzz-2.9.0-test-pandas.patch
30 deleted file mode 100644
31 index fa73c8f3ef3b..000000000000
32 --- a/dev-python/rapidfuzz/files/rapidfuzz-2.9.0-test-pandas.patch
33 +++ /dev/null
34 @@ -1,35 +0,0 @@
35 -From 1df09fb54c466efddfc62ed630fddd5fb34cab3f Mon Sep 17 00:00:00 2001
36 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
37 -Date: Sun, 18 Sep 2022 15:37:39 +0200
38 -Subject: [PATCH] tests: handle missing pandas gracefully
39 -
40 -Pandas is not yet ready for Python 3.11. Use pytest.importorskip()
41 -to skip that one regression test that requires it when it's not
42 -available to unblock rapidfuzz on py3.11 on Gentoo.
43 ----
44 - tests/test_process.py | 2 +-
45 - 1 file changed, 1 insertion(+), 1 deletion(-)
46 -
47 -diff --git a/tests/test_process.py b/tests/test_process.py
48 -index ca5afee..b786d2d 100644
49 ---- a/tests/test_process.py
50 -+++ b/tests/test_process.py
51 -@@ -5,7 +5,6 @@ import unittest
52 - import pytest
53 -
54 - from rapidfuzz import process_py, process_cpp, fuzz
55 --import pandas as pd
56 -
57 -
58 - class process:
59 -@@ -298,6 +297,7 @@ class ProcessTest(unittest.TestCase):
60 -
61 - def testIssue81(self):
62 - # this mostly tests whether this segfaults due to incorrect ref counting
63 -+ pd = pytest.importorskip("pandas")
64 - choices = pd.Series(
65 - ["test color brightness", "test lemon", "test lavender"],
66 - index=[67478, 67479, 67480],
67 ---
68 -2.37.3
69 -
70
71 diff --git a/dev-python/rapidfuzz/rapidfuzz-2.10.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.10.0.ebuild
72 deleted file mode 100644
73 index 878047045596..000000000000
74 --- a/dev-python/rapidfuzz/rapidfuzz-2.10.0.ebuild
75 +++ /dev/null
76 @@ -1,46 +0,0 @@
77 -# Copyright 2022 Gentoo Authors
78 -# Distributed under the terms of the GNU General Public License v2
79 -
80 -EAPI=8
81 -
82 -# custom wrapper over setuptools
83 -DISTUTILS_USE_PEP517=standalone
84 -PYTHON_COMPAT=( python3_{8..11} )
85 -
86 -inherit distutils-r1
87 -
88 -DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
89 -HOMEPAGE="
90 - https://github.com/maxbachmann/RapidFuzz/
91 - https://pypi.org/project/rapidfuzz/
92 -"
93 -SRC_URI="
94 - mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
95 -"
96 -
97 -LICENSE="MIT"
98 -SLOT="0"
99 -KEYWORDS="~amd64"
100 -
101 -RDEPEND="
102 - <dev-python/jarowinkler-2[${PYTHON_USEDEP}]
103 -"
104 -# all these are header-only libraries
105 -DEPEND="
106 - >=dev-cpp/taskflow-3.0.0
107 - >=dev-cpp/jarowinkler-cpp-1.0.0
108 - >=dev-cpp/rapidfuzz-cpp-1.0.1
109 - dev-python/numpy[${PYTHON_USEDEP}]
110 -"
111 -BDEPEND="
112 - dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
113 - >=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
114 - dev-python/setuptools[${PYTHON_USEDEP}]
115 - test? (
116 - dev-python/hypothesis[${PYTHON_USEDEP}]
117 - )
118 -"
119 -
120 -distutils_enable_tests pytest
121 -
122 -export RAPIDFUZZ_BUILD_EXTENSION=1
123
124 diff --git a/dev-python/rapidfuzz/rapidfuzz-2.10.1.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.10.1.ebuild
125 deleted file mode 100644
126 index 3a1dc1af36a6..000000000000
127 --- a/dev-python/rapidfuzz/rapidfuzz-2.10.1.ebuild
128 +++ /dev/null
129 @@ -1,45 +0,0 @@
130 -# Copyright 2022 Gentoo Authors
131 -# Distributed under the terms of the GNU General Public License v2
132 -
133 -EAPI=8
134 -
135 -# custom wrapper over setuptools
136 -DISTUTILS_USE_PEP517=standalone
137 -PYTHON_COMPAT=( python3_{8..11} )
138 -
139 -inherit distutils-r1
140 -
141 -DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
142 -HOMEPAGE="
143 - https://github.com/maxbachmann/RapidFuzz/
144 - https://pypi.org/project/rapidfuzz/
145 -"
146 -SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
147 -
148 -LICENSE="MIT"
149 -SLOT="0"
150 -KEYWORDS="~amd64"
151 -
152 -RDEPEND="
153 - <dev-python/jarowinkler-2[${PYTHON_USEDEP}]
154 - >=dev-python/jarowinkler-1.2.2[${PYTHON_USEDEP}]
155 -"
156 -# all these are header-only libraries
157 -DEPEND="
158 - >=dev-cpp/taskflow-3.0.0
159 - >=dev-cpp/jarowinkler-cpp-1.0.0
160 - >=dev-cpp/rapidfuzz-cpp-1.0.1
161 - dev-python/numpy[${PYTHON_USEDEP}]
162 -"
163 -BDEPEND="
164 - dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
165 - >=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
166 - dev-python/setuptools[${PYTHON_USEDEP}]
167 - test? (
168 - dev-python/hypothesis[${PYTHON_USEDEP}]
169 - )
170 -"
171 -
172 -distutils_enable_tests pytest
173 -
174 -export RAPIDFUZZ_BUILD_EXTENSION=1
175
176 diff --git a/dev-python/rapidfuzz/rapidfuzz-2.9.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.9.0.ebuild
177 deleted file mode 100644
178 index 85d55ed22576..000000000000
179 --- a/dev-python/rapidfuzz/rapidfuzz-2.9.0.ebuild
180 +++ /dev/null
181 @@ -1,50 +0,0 @@
182 -# Copyright 2022 Gentoo Authors
183 -# Distributed under the terms of the GNU General Public License v2
184 -
185 -EAPI=8
186 -
187 -# custom wrapper over setuptools
188 -DISTUTILS_USE_PEP517=standalone
189 -PYTHON_COMPAT=( python3_{8..11} )
190 -
191 -inherit distutils-r1
192 -
193 -DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
194 -HOMEPAGE="
195 - https://github.com/maxbachmann/RapidFuzz/
196 - https://pypi.org/project/rapidfuzz/
197 -"
198 -SRC_URI="
199 - mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
200 -"
201 -
202 -LICENSE="MIT"
203 -SLOT="0"
204 -KEYWORDS="~amd64"
205 -
206 -RDEPEND="
207 - <dev-python/jarowinkler-2[${PYTHON_USEDEP}]
208 -"
209 -# all these are header-only libraries
210 -DEPEND="
211 - >=dev-cpp/taskflow-3.0.0
212 - >=dev-cpp/jarowinkler-cpp-1.0.0
213 - >=dev-cpp/rapidfuzz-cpp-1.0.1
214 - dev-python/numpy[${PYTHON_USEDEP}]
215 -"
216 -BDEPEND="
217 - dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
218 - >=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
219 - dev-python/setuptools[${PYTHON_USEDEP}]
220 - test? (
221 - dev-python/hypothesis[${PYTHON_USEDEP}]
222 - )
223 -"
224 -
225 -distutils_enable_tests pytest
226 -
227 -export RAPIDFUZZ_BUILD_EXTENSION=1
228 -
229 -PATCHES=(
230 - "${FILESDIR}"/${P}-test-pandas.patch
231 -)