From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 68C10158083 for ; Thu, 26 Sep 2024 09:57:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 228F2E2B48; Thu, 26 Sep 2024 09:57:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05371E2B48 for ; Thu, 26 Sep 2024 09:57:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 07C7F343269 for ; Thu, 26 Sep 2024 09:57:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 65B4C27E9 for ; Thu, 26 Sep 2024 09:57:52 +0000 (UTC) From: "Bernard Cafarelli" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Bernard Cafarelli" Message-ID: <1727344448.ab51059a6aa37b6b05a8000b467fb7b55a219d5c.voyageur@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/paperwork-backend/files/, app-text/paperwork-backend/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/paperwork-backend/Manifest app-text/paperwork-backend/files/paperwork-backend-2.2.2-scipy.patch app-text/paperwork-backend/paperwork-backend-2.2.2.ebuild X-VCS-Directories: app-text/paperwork-backend/files/ app-text/paperwork-backend/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: ab51059a6aa37b6b05a8000b467fb7b55a219d5c X-VCS-Branch: master Date: Thu, 26 Sep 2024 09:57:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c4c04ce2-9324-49ce-9321-0b597a2f24c3 X-Archives-Hash: bfab69c0e4c4ea65426dbbcf944fddf3 commit: ab51059a6aa37b6b05a8000b467fb7b55a219d5c Author: Bernard Cafarelli gentoo org> AuthorDate: Thu Sep 26 09:54:08 2024 +0000 Commit: Bernard Cafarelli gentoo org> CommitDate: Thu Sep 26 09:54:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab51059a app-text/paperwork-backend: drop 2.2.2 Signed-off-by: Bernard Cafarelli gentoo.org> app-text/paperwork-backend/Manifest | 2 - .../files/paperwork-backend-2.2.2-scipy.patch | 55 ------------------- .../paperwork-backend-2.2.2.ebuild | 63 ---------------------- 3 files changed, 120 deletions(-) diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest index 9f6c193ed7f0..29962c5280e3 100644 --- a/app-text/paperwork-backend/Manifest +++ b/app-text/paperwork-backend/Manifest @@ -1,4 +1,2 @@ -DIST paperwork-2.2.2.tar.bz2 2531134 BLAKE2B 760d5fdc949ed44993c9845232e3f92b26b8dcb84ef82b08be7dbb0b262461feaf06f930f3fce0b94fdd8412a8264969bac117e3ea7aef70e1b47436a9dba3c0 SHA512 e0d3c24a0d611ffea231e129461d2925dc8318aaade185e83361bca8d1757e4601510db6122dc412863e617a387eb1c6008d0974c2b37be7ac4e4c3e68bc450b DIST paperwork-2.2.3.tar.bz2 2531208 BLAKE2B 6259a9b7a916ad71fc0f0747ce0c17e874dbff962c3d8b46c4c25c2a119de6d27f0ce7ce262dfbf7290fa436726fc538d9bead2664d7f158d51634eece768620 SHA512 68bad3ccc9ed2fdea2b1336945ca4f11de5b0a2249d5f043dc34d620ae5bf6627c0255d4776a5c19e9d266972403023f0b63eb3bf694d7a33051b53239c017bf -DIST paperwork-data-2.2.2.tar.gz 5206588 BLAKE2B 7dd15d31b0b3b59900556d78b271f36cc1cab533d273948a7d0eb364028ec0d1c26b2743a10565e2fc1d65786a11a1589c776c2ec1df6030efe8a79b2fba53a0 SHA512 aaf8e4174504eed7b33b2a0d3ad1b0af489d70bd9a425cf9363011fc6e24dd42a6822a5d078898279e78bbe15b4e36075c5a57a5ec74eabb3c2af7b9c3cc3e76 DIST paperwork-data-2.2.3.tar.gz 5206588 BLAKE2B 7dd15d31b0b3b59900556d78b271f36cc1cab533d273948a7d0eb364028ec0d1c26b2743a10565e2fc1d65786a11a1589c776c2ec1df6030efe8a79b2fba53a0 SHA512 aaf8e4174504eed7b33b2a0d3ad1b0af489d70bd9a425cf9363011fc6e24dd42a6822a5d078898279e78bbe15b4e36075c5a57a5ec74eabb3c2af7b9c3cc3e76 diff --git a/app-text/paperwork-backend/files/paperwork-backend-2.2.2-scipy.patch b/app-text/paperwork-backend/files/paperwork-backend-2.2.2-scipy.patch deleted file mode 100644 index 9add28626a23..000000000000 --- a/app-text/paperwork-backend/files/paperwork-backend-2.2.2-scipy.patch +++ /dev/null @@ -1,55 +0,0 @@ -From abcebfe9714644d4e259e53b10e0e9417b5b864f Mon Sep 17 00:00:00 2001 -From: Jerome Flesch -Date: Sun, 21 Apr 2024 13:31:03 +0200 -Subject: [PATCH] backend/guesswork/labels/sklearn: fix use of - scipy.sparse.hstack() + numpy.zeros() - -Closes #1111 ---- - .../paperwork_backend/guesswork/label/sklearn/__init__.py | 5 +++-- - paperwork-backend/src/paperwork_backend/model/fake.py | 6 ++++++ - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/paperwork-backend/src/paperwork_backend/guesswork/label/sklearn/__init__.py b/paperwork-backend/src/paperwork_backend/guesswork/label/sklearn/__init__.py -index b2af4350..8633211f 100644 ---- a/paperwork-backend/src/paperwork_backend/guesswork/label/sklearn/__init__.py -+++ b/paperwork-backend/src/paperwork_backend/guesswork/label/sklearn/__init__.py -@@ -191,7 +191,8 @@ class UpdatableVectorizer(object): - ) - if required_padding > 0: - doc_vector = numpy.hstack([ -- doc_vector, numpy.zeros((required_padding,)) -+ doc_vector, -+ numpy.zeros((required_padding,)) - ]) - if sum_features is None: - sum_features = doc_vector -@@ -339,7 +340,7 @@ class Corpus(object): - if required_padding > 0: - doc_vector = scipy.sparse.hstack([ - scipy.sparse.csr_matrix(doc_vector), -- numpy.zeros((required_padding,)) -+ numpy.zeros((1, required_padding)) - ]) - else: - doc_vector = scipy.sparse.csr_matrix(doc_vector) -diff --git a/paperwork-backend/src/paperwork_backend/model/fake.py b/paperwork-backend/src/paperwork_backend/model/fake.py -index 29beae97..f06fe18e 100644 ---- a/paperwork-backend/src/paperwork_backend/model/fake.py -+++ b/paperwork-backend/src/paperwork_backend/model/fake.py -@@ -125,6 +125,12 @@ class Plugin(openpaperwork_core.PluginBase): - if doc['url'] == doc_url: - out.update(doc['labels']) - -+ def doc_has_labels_by_url(self, doc_url): -+ for doc in self.docs: -+ if doc['url'] == doc_url: -+ return True if len(doc["labels"]) > 0 else None -+ return None -+ - def doc_add_label_by_url(self, doc_url, label, color=None): - if color is None: - all_labels = set() --- -GitLab - diff --git a/app-text/paperwork-backend/paperwork-backend-2.2.2.ebuild b/app-text/paperwork-backend/paperwork-backend-2.2.2.ebuild deleted file mode 100644 index 738513e7b1a6..000000000000 --- a/app-text/paperwork-backend/paperwork-backend-2.2.2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 - -DESCRIPTION="Backend part of Paperwork (Python API, no UI)" -HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork" -# Update from release hash at: -# https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/tags -REL_HASH="3f51346f" -SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2 - https://download.openpaper.work/data/paperwork/master_${REL_HASH}/data.tar.gz -> paperwork-data-${PV}.tar.gz" -S=${WORKDIR}/paperwork-${PV}/${PN} - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - app-text/openpaperwork-core[${PYTHON_USEDEP}] - app-text/openpaperwork-gtk[${PYTHON_USEDEP}] - app-text/poppler[introspection] - dev-python/distro[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pycountry[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/scikit-learn[${PYTHON_USEDEP}] - dev-python/termcolor[${PYTHON_USEDEP}] - dev-python/whoosh[${PYTHON_USEDEP}] -" -BDEPEND=" - ${RDEPEND} - dev-python/setuptools-scm[${PYTHON_USEDEP}] - sys-apps/which - sys-devel/gettext - test? ( - dev-python/libpillowfight[${PYTHON_USEDEP}] - media-libs/libinsane - ) -" - -distutils_enable_tests unittest - -export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} - -src_prepare() { - default - cd "${WORKDIR}"/paperwork-${PV} || die - eapply "${FILESDIR}"/${P}-scipy.patch -} - -python_compile() { - emake l10n_compile - - distutils-r1_python_compile -}