diff --git a/packages/p/python-python-lsp-server/.files b/packages/p/python-python-lsp-server/.files index ca03938d734..27cc6064746 100644 Binary files a/packages/p/python-python-lsp-server/.files and b/packages/p/python-python-lsp-server/.files differ diff --git a/packages/p/python-python-lsp-server/.rev b/packages/p/python-python-lsp-server/.rev index f010778426e..9ed542c475e 100644 --- a/packages/p/python-python-lsp-server/.rev +++ b/packages/p/python-python-lsp-server/.rev @@ -222,4 +222,14 @@ 1083326 + + 5d3805dc7ae90425119bb6d742321cc0 + 1.7.2 + + dimstar_suse + - Unpin yapf + * Add python-lsp-server-pr377-unpin-yapf.patch + * gh#python-lsp/python-lsp-server#377 + 1085800 + diff --git a/packages/p/python-python-lsp-server/python-lsp-server-pr377-unpin-yapf.patch b/packages/p/python-python-lsp-server/python-lsp-server-pr377-unpin-yapf.patch new file mode 100644 index 00000000000..5bd95bbaf3a --- /dev/null +++ b/packages/p/python-python-lsp-server/python-lsp-server-pr377-unpin-yapf.patch @@ -0,0 +1,32 @@ +From b2df1b92559a07defed27f26a364acc5a6837fce Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Tue, 9 May 2023 22:02:43 +0200 +Subject: [PATCH] Update yapf requirement + +--- + pyproject.toml | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 1dc01fa..7e62d24 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -35,8 +35,7 @@ all = [ + "pyflakes>=2.5.0,<3.1.0", + "pylint>=2.5.0,<3", + "rope>1.2.0", +- "yapf<=0.32.0", +- "toml", ++ "yapf>=0.33.0", + "whatthepatch>=1.0.2,<2.0.0" + ] + autopep8 = ["autopep8>=1.6.0,<2.1.0"] +@@ -47,7 +46,7 @@ pydocstyle = ["pydocstyle>=6.3.0,<6.4.0"] + pyflakes = ["pyflakes>=2.5.0,<3.1.0"] + pylint = ["pylint>=2.5.0,<3"] + rope = ["rope>1.2.0"] +-yapf = ["yapf<=0.32.0", "whatthepatch>=1.0.2,<2.0.0", "toml"] ++yapf = ["yapf>=0.33.0", "whatthepatch>=1.0.2,<2.0.0"] + websockets = ["websockets>=10.3"] + test = [ + "pylint>=2.5.0,<3", diff --git a/packages/p/python-python-lsp-server/python-python-lsp-server.changes b/packages/p/python-python-lsp-server/python-python-lsp-server.changes index e011ab3765a..ec3d3ea68da 100644 --- a/packages/p/python-python-lsp-server/python-python-lsp-server.changes +++ b/packages/p/python-python-lsp-server/python-python-lsp-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 9 20:07:36 UTC 2023 - Ben Greiner + +- Unpin yapf + * Add python-lsp-server-pr377-unpin-yapf.patch + * gh#python-lsp/python-lsp-server#377 + ------------------------------------------------------------------- Thu Apr 27 15:15:13 UTC 2023 - Ben Greiner diff --git a/packages/p/python-python-lsp-server/python-python-lsp-server.spec b/packages/p/python-python-lsp-server/python-python-lsp-server.spec index e03c0e5d1f5..171b6a04f5c 100644 --- a/packages/p/python-python-lsp-server/python-python-lsp-server.spec +++ b/packages/p/python-python-lsp-server/python-python-lsp-server.spec @@ -23,6 +23,8 @@ Summary: Python Language Server for the Language Server Protocol License: MIT URL: https://github.com/python-lsp/python-lsp-server Source: https://files.pythonhosted.org/packages/source/p/python-lsp-server/python-lsp-server-%{version}.tar.gz +# PATCH-FIX-UPSTREAM python-lsp-server-pr377-unpin-yapf.patch gh#python-lsp/python-lsp-server#377 +Patch0: python-lsp-server-pr377-unpin-yapf.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 61.2} @@ -45,11 +47,9 @@ BuildRequires: %{python_module pylint >= 2.5.0 with %python-pylint < 3} BuildRequires: %{python_module pytest} BuildRequires: %{python_module python-lsp-jsonrpc >= 1.0.0} BuildRequires: %{python_module rope >= 1.2.0} -# gh#python-lsp/python-lsp-server#346 -BuildRequires: %{python_module toml if %python-yapf <= 0.32.0 else %python-tomli} BuildRequires: %{python_module ujson >= 3.0.0} BuildRequires: %{python_module whatthepatch >= 1.0.2 with %python-whatthepatch < 2} -BuildRequires: %{python_module yapf < 0.32.1} +BuildRequires: %{python_module yapf >= 0.33} # /SECTION BuildRequires: fdupes Requires: python-docstring-to-markdown @@ -65,9 +65,7 @@ Conflicts: python-pydocstyle >= 6.4.0 Suggests: python-pylint >= 2.5.0 Conflicts: python-pylint >= 3 Suggests: python-rope >= 1.2.0 -Suggests: python-yapf -Conflicts: python-yapf >= 0.32.1 -Suggests: python-toml +Suggests: python-yapf >= 0.33 Suggests: python-whatthepatch >= 1.0.2 Conflicts: python-whatthepatch >= 2 # SECTION flake8 pins