public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/rapidfuzz/, dev-python/rapidfuzz/files/
@ 2022-09-18 13:46 Michał Górny
  0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2022-09-18 13:46 UTC (permalink / raw
  To: gentoo-commits

commit:     cee9b5214a4f1e4cc33315b04aa1075a2d1d71e8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 06:14:20 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 13:46:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee9b521

dev-python/rapidfuzz: New package, v2.9.0

Bug: https://bugs.gentoo.org/871339
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/rapidfuzz/Manifest                      |  1 +
 .../files/rapidfuzz-2.9.0-test-pandas.patch        | 35 ++++++++++++++++
 dev-python/rapidfuzz/metadata.xml                  | 12 ++++++
 dev-python/rapidfuzz/rapidfuzz-2.9.0.ebuild        | 47 ++++++++++++++++++++++
 4 files changed, 95 insertions(+)

diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
new file mode 100644
index 000000000000..3b7b068f2c6b
--- /dev/null
+++ b/dev-python/rapidfuzz/Manifest
@@ -0,0 +1 @@
+DIST rapidfuzz-2.9.0.tar.gz 780939 BLAKE2B c43dfd89d18dc1f5b4738930f1d0d9c4956f66479217b4400844b50636e2b0bb13f15d8b9a6edc0ce30fc943f35a44dad802ecf90107556ed2dee7f70fcc16ac SHA512 b8f83cc35e84a4ed95e2086eb7bfbc6e7e2e25a05accc965092b8b51012c79e86e2af15397577bb91aadfa9a257a62d6f3d6bb9bf928a9c767d53468904a12be

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
new file mode 100644
index 000000000000..fa73c8f3ef3b
--- /dev/null
+++ b/dev-python/rapidfuzz/files/rapidfuzz-2.9.0-test-pandas.patch
@@ -0,0 +1,35 @@
+From 1df09fb54c466efddfc62ed630fddd5fb34cab3f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 18 Sep 2022 15:37:39 +0200
+Subject: [PATCH] tests: handle missing pandas gracefully
+
+Pandas is not yet ready for Python 3.11.  Use pytest.importorskip()
+to skip that one regression test that requires it when it's not
+available to unblock rapidfuzz on py3.11 on Gentoo.
+---
+ tests/test_process.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_process.py b/tests/test_process.py
+index ca5afee..b786d2d 100644
+--- a/tests/test_process.py
++++ b/tests/test_process.py
+@@ -5,7 +5,6 @@ import unittest
+ import pytest
+ 
+ from rapidfuzz import process_py, process_cpp, fuzz
+-import pandas as pd
+ 
+ 
+ class process:
+@@ -298,6 +297,7 @@ class ProcessTest(unittest.TestCase):
+ 
+     def testIssue81(self):
+         # this mostly tests whether this segfaults due to incorrect ref counting
++        pd = pytest.importorskip("pandas")
+         choices = pd.Series(
+             ["test color brightness", "test lemon", "test lavender"],
+             index=[67478, 67479, 67480],
+-- 
+2.37.3
+

diff --git a/dev-python/rapidfuzz/metadata.xml b/dev-python/rapidfuzz/metadata.xml
new file mode 100644
index 000000000000..91cac0023d89
--- /dev/null
+++ b/dev-python/rapidfuzz/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">maxbachmann/RapidFuzz</remote-id>
+		<remote-id type="pypi">rapidfuzz</remote-id>
+	</upstream>
+</pkgmetadata>

diff --git a/dev-python/rapidfuzz/rapidfuzz-2.9.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.9.0.ebuild
new file mode 100644
index 000000000000..d61dc5c429e4
--- /dev/null
+++ b/dev-python/rapidfuzz/rapidfuzz-2.9.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# custom wrapper over setuptools
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
+HOMEPAGE="
+	https://github.com/maxbachmann/RapidFuzz/
+	https://pypi.org/project/rapidfuzz/
+"
+SRC_URI="
+	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	<dev-python/jarowinkler-2[${PYTHON_USEDEP}]
+"
+# all these are header-only libraries
+DEPEND="
+	>=dev-cpp/taskflow-3.0.0
+	>=dev-cpp/jarowinkler-cpp-1.0.0
+	>=dev-cpp/rapidfuzz-cpp-1.0.1
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
+	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export RAPIDFUZZ_BUILD_EXTENSION=1
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test-pandas.patch
+)


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/rapidfuzz/, dev-python/rapidfuzz/files/
@ 2022-10-01  9:36 Michał Górny
  0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2022-10-01  9:36 UTC (permalink / raw
  To: gentoo-commits

commit:     c084621e76d7d8ec1aa6a2d180c620f4a28c8a96
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  1 09:35:46 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct  1 09:35:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c084621e

dev-python/rapidfuzz: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/rapidfuzz/Manifest                      |  3 --
 .../files/rapidfuzz-2.9.0-test-pandas.patch        | 35 ---------------
 dev-python/rapidfuzz/rapidfuzz-2.10.0.ebuild       | 46 --------------------
 dev-python/rapidfuzz/rapidfuzz-2.10.1.ebuild       | 45 -------------------
 dev-python/rapidfuzz/rapidfuzz-2.9.0.ebuild        | 50 ----------------------
 5 files changed, 179 deletions(-)

diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
index c4036bf45fa9..73a52b2bb27c 100644
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@@ -1,4 +1 @@
-DIST rapidfuzz-2.10.0.tar.gz 782698 BLAKE2B f2b4ead136162fd3592b16978a58cd3a2d66489f05aefdf58fd137ebf34f347368f437b3ee836b36122b00863f0c238c8191307f6b586676db59ebfa2d370e1c SHA512 b704a535021924e436a1cebe397e747d3e39b6a4ec12718bbb2a91c326d1977c51bd7ca9a4b2c2d380fdc27ea76b1549d61dea511ed86054aceb1d2180716627
-DIST rapidfuzz-2.10.1.tar.gz 782833 BLAKE2B a8be0ad8c617d8389b5fd22bff06e3887665dedd73580ac6ed29c3f5b895c399ffa0ac6ea983cb0a12d279d5312514e645f75d1a09a40be7108097b74e78c2d5 SHA512 006c714c4c2b86d77682042c7bd3e7a19328a56ff12b42f01e96712c4a94db654d63607363cf68b746416f107927bdee9dee9d7d29c80eda7c7fa74e0c21b75d
 DIST rapidfuzz-2.10.2.tar.gz 788167 BLAKE2B 91264d83159ce91cac33138c2589d468ffb079daef06f1917596892b3c5fbb99f2012d79ca05f728e6d49c2241d83f68e0d3a44956cfdfafd38cae428496f507 SHA512 3d7610a2e4b32fbfaa0ac043847829bfc436e61c2d0c76d526fc0827cca4fd10a0b6ae659bd61ed48604695c4782bcb0984d2becaf84494b84a5d8e71c22e97a
-DIST rapidfuzz-2.9.0.tar.gz 780939 BLAKE2B c43dfd89d18dc1f5b4738930f1d0d9c4956f66479217b4400844b50636e2b0bb13f15d8b9a6edc0ce30fc943f35a44dad802ecf90107556ed2dee7f70fcc16ac SHA512 b8f83cc35e84a4ed95e2086eb7bfbc6e7e2e25a05accc965092b8b51012c79e86e2af15397577bb91aadfa9a257a62d6f3d6bb9bf928a9c767d53468904a12be

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
deleted file mode 100644
index fa73c8f3ef3b..000000000000
--- a/dev-python/rapidfuzz/files/rapidfuzz-2.9.0-test-pandas.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1df09fb54c466efddfc62ed630fddd5fb34cab3f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 18 Sep 2022 15:37:39 +0200
-Subject: [PATCH] tests: handle missing pandas gracefully
-
-Pandas is not yet ready for Python 3.11.  Use pytest.importorskip()
-to skip that one regression test that requires it when it's not
-available to unblock rapidfuzz on py3.11 on Gentoo.
----
- tests/test_process.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_process.py b/tests/test_process.py
-index ca5afee..b786d2d 100644
---- a/tests/test_process.py
-+++ b/tests/test_process.py
-@@ -5,7 +5,6 @@ import unittest
- import pytest
- 
- from rapidfuzz import process_py, process_cpp, fuzz
--import pandas as pd
- 
- 
- class process:
-@@ -298,6 +297,7 @@ class ProcessTest(unittest.TestCase):
- 
-     def testIssue81(self):
-         # this mostly tests whether this segfaults due to incorrect ref counting
-+        pd = pytest.importorskip("pandas")
-         choices = pd.Series(
-             ["test color brightness", "test lemon", "test lavender"],
-             index=[67478, 67479, 67480],
--- 
-2.37.3
-

diff --git a/dev-python/rapidfuzz/rapidfuzz-2.10.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.10.0.ebuild
deleted file mode 100644
index 878047045596..000000000000
--- a/dev-python/rapidfuzz/rapidfuzz-2.10.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# custom wrapper over setuptools
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
-HOMEPAGE="
-	https://github.com/maxbachmann/RapidFuzz/
-	https://pypi.org/project/rapidfuzz/
-"
-SRC_URI="
-	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	<dev-python/jarowinkler-2[${PYTHON_USEDEP}]
-"
-# all these are header-only libraries
-DEPEND="
-	>=dev-cpp/taskflow-3.0.0
-	>=dev-cpp/jarowinkler-cpp-1.0.0
-	>=dev-cpp/rapidfuzz-cpp-1.0.1
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
-	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export RAPIDFUZZ_BUILD_EXTENSION=1

diff --git a/dev-python/rapidfuzz/rapidfuzz-2.10.1.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.10.1.ebuild
deleted file mode 100644
index 3a1dc1af36a6..000000000000
--- a/dev-python/rapidfuzz/rapidfuzz-2.10.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# custom wrapper over setuptools
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
-HOMEPAGE="
-	https://github.com/maxbachmann/RapidFuzz/
-	https://pypi.org/project/rapidfuzz/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	<dev-python/jarowinkler-2[${PYTHON_USEDEP}]
-	>=dev-python/jarowinkler-1.2.2[${PYTHON_USEDEP}]
-"
-# all these are header-only libraries
-DEPEND="
-	>=dev-cpp/taskflow-3.0.0
-	>=dev-cpp/jarowinkler-cpp-1.0.0
-	>=dev-cpp/rapidfuzz-cpp-1.0.1
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
-	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export RAPIDFUZZ_BUILD_EXTENSION=1

diff --git a/dev-python/rapidfuzz/rapidfuzz-2.9.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.9.0.ebuild
deleted file mode 100644
index 85d55ed22576..000000000000
--- a/dev-python/rapidfuzz/rapidfuzz-2.9.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# custom wrapper over setuptools
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
-HOMEPAGE="
-	https://github.com/maxbachmann/RapidFuzz/
-	https://pypi.org/project/rapidfuzz/
-"
-SRC_URI="
-	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	<dev-python/jarowinkler-2[${PYTHON_USEDEP}]
-"
-# all these are header-only libraries
-DEPEND="
-	>=dev-cpp/taskflow-3.0.0
-	>=dev-cpp/jarowinkler-cpp-1.0.0
-	>=dev-cpp/rapidfuzz-cpp-1.0.1
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
-	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export RAPIDFUZZ_BUILD_EXTENSION=1
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-pandas.patch
-)


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-10-01  9:36 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-18 13:46 [gentoo-commits] repo/gentoo:master commit in: dev-python/rapidfuzz/, dev-python/rapidfuzz/files/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2022-10-01  9:36 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox