diff --git a/pylsp-pr340-pydocstyle-6.3.patch b/pylsp-pr340-pydocstyle-6.3.patch deleted file mode 100644 index de74e64..0000000 --- a/pylsp-pr340-pydocstyle-6.3.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/pylsp/plugins/pydocstyle_lint.py b/pylsp/plugins/pydocstyle_lint.py -index 0aa72b7..2e34ccc 100644 ---- a/pylsp/plugins/pydocstyle_lint.py -+++ b/pylsp/plugins/pydocstyle_lint.py -@@ -28,6 +28,7 @@ def pylsp_settings(): - - @hookimpl - def pylsp_lint(config, workspace, document): -+ # pylint: disable=too-many-locals - with workspace.report_progress("lint: pydocstyle"): - settings = config.plugin_settings('pydocstyle', document_path=document.path) - log.debug("Got pydocstyle settings: %s", settings) -@@ -66,9 +67,19 @@ def pylsp_lint(config, workspace, document): - - # Will only yield a single filename, the document path - diags = [] -- for filename, checked_codes, ignore_decorators, property_decorators in conf.get_files_to_check(): -+ for ( -+ filename, -+ checked_codes, -+ ignore_decorators, -+ property_decorators, -+ ignore_self_only_init, -+ ) in conf.get_files_to_check(): - errors = pydocstyle.checker.ConventionChecker().check_source( -- document.source, filename, ignore_decorators=ignore_decorators, property_decorators=property_decorators -+ document.source, -+ filename, -+ ignore_decorators=ignore_decorators, -+ property_decorators=property_decorators, -+ ignore_self_only_init=ignore_self_only_init, - ) - - try: -diff --git a/pyproject.toml b/pyproject.toml -index 8d38434..841638a 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -31,7 +31,7 @@ all = [ - "flake8>=5.0.0,<7", - "mccabe>=0.7.0,<0.8.0", - "pycodestyle>=2.9.0,<2.11.0", -- "pydocstyle>=6.2.0,<6.3.0", -+ "pydocstyle>=6.3.0,<6.4.0", - "pyflakes>=2.5.0,<3.1.0", - "pylint>=2.5.0,<3", - "rope>1.2.0", -@@ -42,7 +42,7 @@ autopep8 = ["autopep8>=1.6.0,<1.7.0"] - flake8 = ["flake8>=5.0.0,<7"] - mccabe = ["mccabe>=0.7.0,<0.8.0"] - pycodestyle = ["pycodestyle>=2.9.0,<2.11.0"] --pydocstyle = ["pydocstyle>=6.2.0,<6.3.0"] -+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"] diff --git a/pylsp-pr345-autopep8-2.patch b/pylsp-pr345-autopep8-2.patch deleted file mode 100644 index ee0df99..0000000 --- a/pylsp-pr345-autopep8-2.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index 8d38434..07c0345 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -27,7 +27,7 @@ Homepage = "https://github.com/python-lsp/python-lsp-server" - - [project.optional-dependencies] - all = [ -- "autopep8>=1.6.0,<1.7.0", -+ "autopep8>=1.6.0,<2.1.0", - "flake8>=5.0.0,<7", - "mccabe>=0.7.0,<0.8.0", - "pycodestyle>=2.9.0,<2.11.0", -@@ -38,7 +38,7 @@ all = [ - "yapf", - "whatthepatch>=1.0.2,<2.0.0" - ] --autopep8 = ["autopep8>=1.6.0,<1.7.0"] -+autopep8 = ["autopep8>=1.6.0,<2.1.0"] - flake8 = ["flake8>=5.0.0,<7"] - mccabe = ["mccabe>=0.7.0,<0.8.0"] - pycodestyle = ["pycodestyle>=2.9.0,<2.11.0"] diff --git a/python-lsp-server-1.7.1.tar.gz b/python-lsp-server-1.7.1.tar.gz deleted file mode 100644 index da078ca..0000000 --- a/python-lsp-server-1.7.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67473bb301f35434b5fa8b21fc5ed5fac27dc8a8446ccec8bae456af52a0aef6 -size 95731 diff --git a/python-lsp-server-1.7.2.tar.gz b/python-lsp-server-1.7.2.tar.gz new file mode 100644 index 0000000..8a76769 --- /dev/null +++ b/python-lsp-server-1.7.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2433467d0fcb8fd45828463ff1cc805837c08731fcea5d7d953d9be776881e1 +size 97050 diff --git a/python-python-lsp-server.changes b/python-python-lsp-server.changes index d0649db..ee80b3e 100644 --- a/python-python-lsp-server.changes +++ b/python-python-lsp-server.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Apr 27 15:15:13 UTC 2023 - Ben Greiner + +- Update to 1.7.2 + * Initializes LSP progress token before using it and remove + progress for sync plugins. + * Adds support for pydocstyle 6.3 + * Adds support for autopep8 2 +- Drop pylsp-pr340-pydocstyle-6.3.patch +- Drop pylsp-pr345-autopep8-2.patch + ------------------------------------------------------------------- Wed Jan 25 16:28:20 UTC 2023 - Ben Greiner diff --git a/python-python-lsp-server.spec b/python-python-lsp-server.spec index 626c65f..760654e 100644 --- a/python-python-lsp-server.spec +++ b/python-python-lsp-server.spec @@ -17,16 +17,12 @@ Name: python-python-lsp-server -Version: 1.7.1 +Version: 1.7.2 Release: 0 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 pylsp-pr340-pydocstyle-6.3.patch gh#python-lsp/python-lsp-server#340 -Patch1: pylsp-pr340-pydocstyle-6.3.patch -# PATCH-FIX-UPSTREAM pylsp-pr345-autopep8-2.patch.patch gh#python-lsp/python-lsp-server#345 -Patch2: pylsp-pr345-autopep8-2.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 61.2} @@ -53,7 +49,7 @@ BuildRequires: %{python_module rope >= 1.2.0} 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} +BuildRequires: %{python_module yapf < 0.32.1} # /SECTION BuildRequires: fdupes Requires: python-docstring-to-markdown @@ -70,6 +66,8 @@ 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-whatthepatch >= 1.0.2 Conflicts: python-whatthepatch >= 2 # SECTION flake8 pins