From 0858d1f3aab91a3078ac485097f36ad72e962cba Mon Sep 17 00:00:00 2001 From: desert-sailor Date: Tue, 20 May 2025 11:59:22 +0800 Subject: [PATCH] Modify the deps(lunr) version range for lunr upgrade --- 0001-Allow-installation-with-lunr-0.8.patch | 26 +++++++++++++++++++++ python-pydoctor.spec | 7 ++++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 0001-Allow-installation-with-lunr-0.8.patch diff --git a/0001-Allow-installation-with-lunr-0.8.patch b/0001-Allow-installation-with-lunr-0.8.patch new file mode 100644 index 0000000..a7889d6 --- /dev/null +++ b/0001-Allow-installation-with-lunr-0.8.patch @@ -0,0 +1,26 @@ +From 84b5863be672417846780222b1b398722eef4dbb Mon Sep 17 00:00:00 2001 +From: Carl George +Date: Mon, 17 Mar 2025 22:50:11 -0500 +Subject: [PATCH] Allow installation with lunr 0.8 + +Lunr has released version 0.8.0. It is still compatible with lunr.js +version 2.3.9 that is bundled in this project. + +https://github.com/yeraydiazdiaz/lunr.py/blob/0.8.0/lunr/__init__.py#L6 +--- + setup.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.cfg b/setup.cfg +index 1337184d2..d1cc8eacd 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -42,7 +42,7 @@ install_requires = + requests + attrs + docutils>=0.17 +- lunr>=0.6.2,<0.8.0 ++ lunr>=0.6.2,<0.9.0 + configargparse + + toml; python_version < "3.11" diff --git a/python-pydoctor.spec b/python-pydoctor.spec index 420f88a..ed9d01c 100644 --- a/python-pydoctor.spec +++ b/python-pydoctor.spec @@ -2,11 +2,12 @@ Name: python-%{srcname} Version: 24.11.2 -Release: 1 +Release: 2 Summary: This is an API documentation generator that works by static analysis License: MIT URL: https://github.com/twisted/pydoctor Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz +Patch1: 0001-Allow-installation-with-lunr-0.8.patch BuildArch: noarch BuildRequires: python3-devel @@ -26,7 +27,6 @@ BuildRequires: python%{python3_pkgversion}-devel %prep %autosetup -p1 -n %{srcname}-%{version} -sed -i 's/lunr==0.6.2/lunr\>=0.6.2/g' setup.cfg %build %py3_build @@ -42,6 +42,9 @@ sed -i 's/lunr==0.6.2/lunr\>=0.6.2/g' setup.cfg %changelog +* Tue May 20 2025 Dongxing Wang - 24.11.2-2 +- Modify the deps(lunr) version range for lunr upgrade + * Tue May 20 2025 Dongxing Wang - 24.11.2-1 - Update package with version 24.11.2 Replace deprecated timestamp call -- Gitee