From bd774a8fac39d62937ff80ff5646038217382568a0d688e96c5b808c66add47a Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Wed, 1 Nov 2023 16:17:46 +0000 Subject: [PATCH 1/2] Accepting request 1121659 from home:bnavigator:branches:devel:languages:python OBS-URL: https://build.opensuse.org/request/show/1121659 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-lsp-server?expand=0&rev=45 --- python-python-lsp-server.changes | 5 +++++ python-python-lsp-server.spec | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/python-python-lsp-server.changes b/python-python-lsp-server.changes index 661e781..28ee84f 100644 --- a/python-python-lsp-server.changes +++ b/python-python-lsp-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 1 16:06:21 UTC 2023 - Ben Greiner + +- Fix runtime requirements + ------------------------------------------------------------------- Sun Oct 29 13:15:28 UTC 2023 - Ben Greiner diff --git a/python-python-lsp-server.spec b/python-python-lsp-server.spec index aae2fbd..f92d043 100644 --- a/python-python-lsp-server.spec +++ b/python-python-lsp-server.spec @@ -35,6 +35,7 @@ BuildRequires: %{python_module PyQt5} BuildRequires: %{python_module autopep8 >= 2.0.4 with %python-autopep8 < 2.1.0} BuildRequires: %{python_module flake8 >= 6.1.0 with %python-flake8 < 7} BuildRequires: %{python_module flaky} +BuildRequires: %{python_module importlib_metadata > 4.8.3 if %python-base < 3.10} BuildRequires: %{python_module jedi >= 0.17.2 with %python-jedi < 0.20} BuildRequires: %{python_module matplotlib} BuildRequires: %{python_module numpy} @@ -43,7 +44,7 @@ BuildRequires: %{python_module pluggy} BuildRequires: %{python_module pydocstyle >= 6.3.0 with %python-pydocstyle < 6.4.0} BuildRequires: %{python_module pylint >= 2.5.0 with %python-pylint < 3.1} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module python-lsp-jsonrpc >= 1.0.0} +BuildRequires: %{python_module python-lsp-jsonrpc >= 1.0.0 with %python-python-lsp-jsonrpc < 2} BuildRequires: %{python_module rope >= 1.2.0} BuildRequires: %{python_module ujson >= 3.0.0} BuildRequires: %{python_module whatthepatch >= 1.0.2 with %python-whatthepatch < 2} @@ -52,9 +53,12 @@ BuildRequires: %{python_module yapf >= 0.33} BuildRequires: fdupes Requires: python-docstring-to-markdown Requires: python-pluggy >= 1.0.0 -Requires: python-python-lsp-jsonrpc >= 1.0.0 Requires: python-ujson >= 3.0.0 Requires: (python-jedi >= 0.17.2 with python-jedi < 0.20) +Requires: (python-python-lsp-jsonrpc >= 1.0.0 with python-python-lsp-jsonrpc < 2) +%if 0%{?python_version_nodots} < 310 +Requires: python-importlib_metadata >= 4.8.3 +%endif Suggests: python-autopep8 >= 2.0.4 Conflicts: python-autopep8 >= 2.1.0 Suggests: python-pydocstyle >= 6.3.0 From f1eefb0ea53bb2609ba47214bf1f526ffe3e88dc78617b82e5d16fc972cc3f32 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Wed, 1 Nov 2023 16:42:20 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-lsp-server?expand=0&rev=46 --- python-python-lsp-server.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-python-lsp-server.spec b/python-python-lsp-server.spec index f92d043..363fd31 100644 --- a/python-python-lsp-server.spec +++ b/python-python-lsp-server.spec @@ -44,7 +44,7 @@ BuildRequires: %{python_module pluggy} BuildRequires: %{python_module pydocstyle >= 6.3.0 with %python-pydocstyle < 6.4.0} BuildRequires: %{python_module pylint >= 2.5.0 with %python-pylint < 3.1} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module python-lsp-jsonrpc >= 1.0.0 with %python-python-lsp-jsonrpc < 2} +BuildRequires: %{python_module python-lsp-jsonrpc >= 1.1.0 with %python-python-lsp-jsonrpc < 2} BuildRequires: %{python_module rope >= 1.2.0} BuildRequires: %{python_module ujson >= 3.0.0} BuildRequires: %{python_module whatthepatch >= 1.0.2 with %python-whatthepatch < 2} @@ -55,7 +55,7 @@ Requires: python-docstring-to-markdown Requires: python-pluggy >= 1.0.0 Requires: python-ujson >= 3.0.0 Requires: (python-jedi >= 0.17.2 with python-jedi < 0.20) -Requires: (python-python-lsp-jsonrpc >= 1.0.0 with python-python-lsp-jsonrpc < 2) +Requires: (python-python-lsp-jsonrpc >= 1.1.0 with python-python-lsp-jsonrpc < 2) %if 0%{?python_version_nodots} < 310 Requires: python-importlib_metadata >= 4.8.3 %endif