diff --git a/Whoosh-2.7.4.tar.gz b/Whoosh-2.7.4.tar.gz deleted file mode 100644 index 19d96b7..0000000 --- a/Whoosh-2.7.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ca5633dbfa9e0e0fa400d3151a8a0c4bec53bd2ecedc0a67705b17565c31a83 -size 968741 diff --git a/docs-Update-intersphinx_mapping.patch b/docs-Update-intersphinx_mapping.patch deleted file mode 100644 index 35f16b5..0000000 --- a/docs-Update-intersphinx_mapping.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 46b1be3b6fff90d854f234e83aba849201e15d0e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= -Date: Wed, 4 Sep 2024 17:29:05 +0200 -Subject: [PATCH] docs: Update intersphinx_mapping - ---- - docs/source/conf.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/docs/source/conf.py b/docs/source/conf.py -index e106a33..9d76ec5 100644 ---- a/docs/source/conf.py -+++ b/docs/source/conf.py -@@ -192,7 +192,7 @@ latex_documents = [ - - - # Example configuration for intersphinx: refer to the Python standard library. --intersphinx_mapping = {'http://docs.python.org/': None} -+intersphinx_mapping = {'python': ('https://docs.python.org/3', None)} - - # Autodoc config - autoclass_content = "both" --- -2.46.0 - diff --git a/py2encoding.patch b/py2encoding.patch deleted file mode 100644 index b181a59..0000000 --- a/py2encoding.patch +++ /dev/null @@ -1,57 +0,0 @@ -From f5a777572fb9c91fa10be3c1ffd5f65cc9323653 Mon Sep 17 00:00:00 2001 -From: fortable1999 -Date: Wed, 12 Dec 2018 11:18:50 +0900 -Subject: [PATCH] Fixed test case for ListCorrector; Fixed FSA __eq__ function - ---- - src/whoosh/automata/fsa.py | 7 +------ - tests/test_reading.py | 1 + - tests/test_spelling.py | 7 ++++++- - 5 files changed, 12 insertions(+), 8 deletions(-) - create mode 100644 .gitignore - -diff --git a/src/whoosh/automata/fsa.py b/src/whoosh/automata/fsa.py -index 280ddb50..54d23f2f 100644 ---- a/src/whoosh/automata/fsa.py -+++ b/src/whoosh/automata/fsa.py -@@ -44,12 +44,7 @@ def __eq__(self, other): - return False - st = self.transitions - ot = other.transitions -- if list(st) != list(ot): -- return False -- for key in st: -- if st[key] != ot[key]: -- return False -- return True -+ return st == ot - - def all_states(self): - stateset = set(self.transitions) -diff --git a/tests/test_reading.py b/tests/test_reading.py -index e2c2b71d..9fefc41c 100644 ---- a/tests/test_reading.py -+++ b/tests/test_reading.py -@@ -1,3 +1,4 @@ -+# coding=utf-8 - from __future__ import with_statement - import random, threading, time - -diff --git a/tests/test_spelling.py b/tests/test_spelling.py -index ce5284f1..440c2d02 100644 ---- a/tests/test_spelling.py -+++ b/tests/test_spelling.py -@@ -20,7 +20,12 @@ def test_list_corrector(): - corr = spelling.ListCorrector(_wordlist) - typo = "reoction" - sugs = list(corr.suggest(typo, maxdist=2)) -- target = [w for w in _wordlist if levenshtein(typo, w) <= 2] -+ target = [] -+ for lev_dist in range(1, 3): -+ # sugs will return suggest first ordered by levenshtein distance -+ # then second order by dictionary order -+ target += [w for w in _wordlist -+ if levenshtein(typo, w) <= lev_dist and w not in target] - assert sugs == target - - diff --git a/pytest4.patch b/pytest4.patch deleted file mode 100644 index fb72f88..0000000 --- a/pytest4.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Whoosh-2.7.4/setup.cfg -=================================================================== ---- Whoosh-2.7.4.orig/setup.cfg -+++ Whoosh-2.7.4/setup.cfg -@@ -15,7 +15,7 @@ formats = zip,gztar - push = sdist bdist_wheel upload - pushdocs = build_sphinx upload_sphinx - --[pytest] -+[tool:pytest] - addopts = -rs --tb=native - norecursedirs = .hg .tox _build tmp* env* benchmark stress - minversion = 2.0 diff --git a/python-Whoosh.changes b/python-Whoosh.changes index 7b475d7..29444cf 100644 --- a/python-Whoosh.changes +++ b/python-Whoosh.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu Aug 14 10:19:14 UTC 2025 - Matej Cepl + +- Silence reporting unavoidable duplicates. + +------------------------------------------------------------------- +Wed Aug 13 16:28:13 UTC 2025 - Markéta Machová + +- Switch to fork under development and update to 2.7.5 + * test_bigfacet.py: print() is a function in Python 3 + * remove duplicate_plugin WhitespacePlugin + * [RFC] Give SegmentWriter a cachable Searcher + * Add support for wildcard regex tokenization + * Fixed several errors and added support for the Sweep AI and + Codecov bots + * Update Python version in setup.py classifiers & fix indent + * Improved documentation deployment and added additional locations + where it can be found as backup +- Drop merged patches: + * pytest4.patch + * py2encoding.patch + * docs-Update-intersphinx_mapping.patch + ------------------------------------------------------------------- Fri Jun 13 02:44:41 UTC 2025 - Steve Kowalik diff --git a/python-Whoosh.rpmlintrc b/python-Whoosh.rpmlintrc new file mode 100644 index 0000000..6d3daa0 --- /dev/null +++ b/python-Whoosh.rpmlintrc @@ -0,0 +1 @@ +addFilter("files-duplicate\s*/usr/share/doc/packages/python-Whoosh-doc/html") diff --git a/python-Whoosh.spec b/python-Whoosh.spec index 56e3282..6eaa58a 100644 --- a/python-Whoosh.spec +++ b/python-Whoosh.spec @@ -1,7 +1,7 @@ # # spec file for package python-Whoosh # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,28 +18,26 @@ %{?sle15_python_module_pythons} Name: python-Whoosh -Version: 2.7.4 +Version: 2.7.5 Release: 0 Summary: Pure-Python full text indexing, search, and spell checking library License: BSD-2-Clause -URL: https://github.com/whoosh-community/whoosh/ -Source: https://files.pythonhosted.org/packages/source/W/Whoosh/Whoosh-%{version}.tar.gz -# upstream in completely unrelated https://github.com/whoosh-community/whoosh/commit/b43e5a432109 -Patch0: pytest4.patch -# upstream in https://github.com/whoosh-community/whoosh/commit/f5a777572fb9 -Patch1: py2encoding.patch +URL: https://github.com/Sygil-Dev/whoosh-reloaded +Source0: https://github.com/Sygil-Dev/whoosh-reloaded/archive/refs/tags/v%{version}.tar.gz +Source99: python-Whoosh.rpmlintrc # PATCH-FIX-UPSTREAM NullMatcherClass-hashable.patch gh#whoosh-community/whoosh#570 mcepl@suse.com # NullMatcherClass needs __hash__ method as well for Sphinx4 compatiblity. -Patch2: NullMatcherClass-hashable.patch -# PATCH-FIX-UPSTREAM docs-Update-intersphinx_mapping.patch gh#whoosh-community/whoosh#582 -# fix intersphinx_mapping -Patch3: docs-Update-intersphinx_mapping.patch +Patch0: NullMatcherClass-hashable.patch +BuildRequires: %{python_module cached-property} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-Sphinx +BuildRequires: python3-sphinx-jsonschema +BuildRequires: python3-sphinx_rtd_theme +Requires: python-cached-property BuildArch: noarch # SECTION the testing dependencies BuildRequires: %{python_module pytest} @@ -72,7 +70,7 @@ This package contains the documentation. %endif %prep -%autosetup -p1 -n Whoosh-%{version} +%autosetup -p1 -n whoosh-reloaded-%{version} # Fix CRLF->LF sed -i -e 's/\r$//' docs/source/api/filedb/{filestore,filetables,structfile}.rst @@ -87,14 +85,13 @@ sphinx-build -b html -d docs/build/doctrees docs/source docs/build/html %check export LANG=en_US.UTF8 -# test_list_corrector - depends on dict sorting thats in py3+ only -%pytest -k 'not test_list_corrector' +%pytest %files %{python_files} %license LICENSE.txt -%doc README.txt +%doc README.md %{python_sitelib}/whoosh -%{python_sitelib}/[Ww]hoosh-%{version}.dist-info +%{python_sitelib}/[Ww]hoosh_[Rr]eloaded-%{version}.dist-info %if 0%{?suse_version} > 1500 %files -n python-Whoosh-doc diff --git a/v2.7.5.tar.gz b/v2.7.5.tar.gz new file mode 100644 index 0000000..6849305 --- /dev/null +++ b/v2.7.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e84ffc271c9daf9a22bc9ab576b9c4f7ad5cfdc0e096872b0ae32edc4b5c424d +size 1072856