diff --git a/python-lsp-server-1.7.4.tar.gz b/python-lsp-server-1.7.4.tar.gz deleted file mode 100644 index a1af702..0000000 --- a/python-lsp-server-1.7.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c84254485a4d9431b24ecefd59741d21c00165611bcf6037bd7d54d0ed06a197 -size 97864 diff --git a/python-lsp-server-1.8.2.tar.gz b/python-lsp-server-1.8.2.tar.gz new file mode 100644 index 0000000..78a7efc --- /dev/null +++ b/python-lsp-server-1.8.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd85e1c6ad95c1d276c82a33c2c85898f110afc3c7bfeaced79c0df095076fd1 +size 107104 diff --git a/python-lsp-server-pr415-flake8deps.patch b/python-lsp-server-pr415-flake8deps.patch deleted file mode 100644 index 7e9ab15..0000000 --- a/python-lsp-server-pr415-flake8deps.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 181db703d6fad6baa5c57ee24a07068f5101f5d1 Mon Sep 17 00:00:00 2001 -From: Chih-Hsuan Yen <645432-yan12125@users.noreply.gitlab.com> -Date: Sat, 12 Aug 2023 12:41:38 +0800 -Subject: [PATCH 1/4] Add support for pyflakes 3.1 - -`ContinueInFinally` is dropped in pyflakes 3.1 [1]. - -flake8 is bumped to a version that supports pyflakes 3.1 [2]. - -Closes https://github.com/python-lsp/python-lsp-server/issues/412 - -[1] https://github.com/PyCQA/pyflakes/pull/752 -[2] https://flake8.pycqa.org/en/latest/release-notes/6.1.0.html ---- - pylsp/plugins/pyflakes_lint.py | 1 - - pyproject.toml | 8 ++++---- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/pylsp/plugins/pyflakes_lint.py b/pylsp/plugins/pyflakes_lint.py -index 72e16a2e..2c3c3293 100644 ---- a/pylsp/plugins/pyflakes_lint.py -+++ b/pylsp/plugins/pyflakes_lint.py -@@ -15,7 +15,6 @@ - messages.YieldOutsideFunction, - messages.ContinueOutsideLoop, - messages.BreakOutsideLoop, -- messages.ContinueInFinally, - messages.TwoStarredExpressions, - ) - -diff --git a/pyproject.toml b/pyproject.toml -index 7e62d24c..c69f92f6 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -28,22 +28,22 @@ Homepage = "https://github.com/python-lsp/python-lsp-server" - [project.optional-dependencies] - all = [ - "autopep8>=1.6.0,<2.1.0", -- "flake8>=5.0.0,<7", -+ "flake8>=6.1.0,<7", - "mccabe>=0.7.0,<0.8.0", - "pycodestyle>=2.9.0,<2.11.0", - "pydocstyle>=6.3.0,<6.4.0", -- "pyflakes>=2.5.0,<3.1.0", -+ "pyflakes>=3.1.0,<3.2.0", - "pylint>=2.5.0,<3", - "rope>1.2.0", - "yapf>=0.33.0", - "whatthepatch>=1.0.2,<2.0.0" - ] - autopep8 = ["autopep8>=1.6.0,<2.1.0"] --flake8 = ["flake8>=5.0.0,<7"] -+flake8 = ["flake8>=6.1.0,<7"] - mccabe = ["mccabe>=0.7.0,<0.8.0"] - pycodestyle = ["pycodestyle>=2.9.0,<2.11.0"] - pydocstyle = ["pydocstyle>=6.3.0,<6.4.0"] --pyflakes = ["pyflakes>=2.5.0,<3.1.0"] -+pyflakes = ["pyflakes>=3.1.0,<3.2.0"] - pylint = ["pylint>=2.5.0,<3"] - rope = ["rope>1.2.0"] - yapf = ["yapf>=0.33.0", "whatthepatch>=1.0.2,<2.0.0"] - -From fe31435d83d3a25c92cf0d974b09f1ee7d7b94eb Mon Sep 17 00:00:00 2001 -From: Chih-Hsuan Yen <1937689+yan12125@users.noreply.github.com> -Date: Sun, 13 Aug 2023 01:10:51 +0800 -Subject: [PATCH 2/4] Update pyproject.toml - -Co-authored-by: Carlos Cordoba ---- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index c69f92f6..2379ce2b 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -30,7 +30,7 @@ all = [ - "autopep8>=1.6.0,<2.1.0", - "flake8>=6.1.0,<7", - "mccabe>=0.7.0,<0.8.0", -- "pycodestyle>=2.9.0,<2.11.0", -+ "pycodestyle>=2.11.0,<2.12.0", - "pydocstyle>=6.3.0,<6.4.0", - "pyflakes>=3.1.0,<3.2.0", - "pylint>=2.5.0,<3", - -From 952a73d2fdbbc8ad42f22aa29a10697d32155a3c Mon Sep 17 00:00:00 2001 -From: Chih-Hsuan Yen <1937689+yan12125@users.noreply.github.com> -Date: Sun, 13 Aug 2023 01:10:57 +0800 -Subject: [PATCH 3/4] Update pyproject.toml - -Co-authored-by: Carlos Cordoba ---- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index 2379ce2b..60a36b99 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -41,7 +41,7 @@ all = [ - autopep8 = ["autopep8>=1.6.0,<2.1.0"] - flake8 = ["flake8>=6.1.0,<7"] - mccabe = ["mccabe>=0.7.0,<0.8.0"] --pycodestyle = ["pycodestyle>=2.9.0,<2.11.0"] -+pycodestyle = ["pycodestyle>=2.11.0,<2.12.0"] - pydocstyle = ["pydocstyle>=6.3.0,<6.4.0"] - pyflakes = ["pyflakes>=3.1.0,<3.2.0"] - pylint = ["pylint>=2.5.0,<3"] - -From 295e4df835bc7025699c59ee303662b02959e2c2 Mon Sep 17 00:00:00 2001 -From: Chih-Hsuan Yen <645432-yan12125@users.noreply.gitlab.com> -Date: Sun, 13 Aug 2023 01:15:26 +0800 -Subject: [PATCH 4/4] Use newer Python for static ananlysis - -New flake8 requires Python 3.8 [1]. - -[1] https://flake8.pycqa.org/en/latest/release-notes/6.0.0.html ---- - .github/workflows/static.yml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml -index 7a398c0b..3eefea21 100644 ---- a/.github/workflows/static.yml -+++ b/.github/workflows/static.yml -@@ -32,7 +32,7 @@ jobs: - with: - # TODO: check with Python 3, but need to fix the - # errors first -- python-version: '3.7' -+ python-version: '3.8' - architecture: 'x64' - - run: python -m pip install --upgrade pip setuptools jsonschema - - run: pip install -e .[pylint,pycodestyle,pyflakes] diff --git a/python-lsp-server-pr416-jedi-0.19.patch b/python-lsp-server-pr416-jedi-0.19.patch deleted file mode 100644 index fd2bd1f..0000000 --- a/python-lsp-server-pr416-jedi-0.19.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index 7e62d24..e0b6e07 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -13,7 +13,7 @@ readme = "README.md" - license = {text = "MIT"} - requires-python = ">=3.7" - dependencies = [ -- "jedi>=0.17.2,<0.19.0", -+ "jedi>=0.17.2,<0.20.0", - "python-lsp-jsonrpc>=1.0.0", - "pluggy>=1.0.0", - "docstring-to-markdown", diff --git a/python-python-lsp-server.changes b/python-python-lsp-server.changes index 4473487..661e781 100644 --- a/python-python-lsp-server.changes +++ b/python-python-lsp-server.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Sun Oct 29 13:15:28 UTC 2023 - Ben Greiner + +- Update to 1.8.2 + * Fixes the notebook document selector property not being a list in the server capabilities. +- Release 1.8.1 + * Fixes go-to-definition for Numpy methods. + * Allows Jedi to perform multiple hops for "go to definition". + * Fixes an error with Flake8 when deleting lines. +- Raise pylint upper pin to 3.1 + +------------------------------------------------------------------- +Wed Sep 13 07:56:57 UTC 2023 - Ben Greiner + +- Update to 1.8.0 + * Add support for notebooks and make go-to-definition work for + them. + * Add support for Pyflakes 3.1, Pycodestyle 2.11 and Jedi 0.19. + * Drop support for Python 3.7. +- Drop patches upstreeam + * Drop python-lsp-server-pr415-flake8deps.patch + * Drop python-lsp-server-pr416-jedi-0.19.patch + ------------------------------------------------------------------- Sat Aug 12 18:01:40 UTC 2023 - Ben Greiner diff --git a/python-python-lsp-server.spec b/python-python-lsp-server.spec index a47be7f..aae2fbd 100644 --- a/python-python-lsp-server.spec +++ b/python-python-lsp-server.spec @@ -17,14 +17,12 @@ Name: python-python-lsp-server -Version: 1.7.4 +Version: 1.8.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 -Patch0: python-lsp-server-pr415-flake8deps.patch -Patch1: python-lsp-server-pr416-jedi-0.19.patch BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 61.2} @@ -34,7 +32,7 @@ BuildRequires: python-rpm-macros >= 20210628 # SECTION test requirements BuildRequires: %{python_module docstring-to-markdown} BuildRequires: %{python_module PyQt5} -BuildRequires: %{python_module autopep8 >= 1.6.0 with %python-autopep8 < 2.1.0} +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 jedi >= 0.17.2 with %python-jedi < 0.20} @@ -43,7 +41,7 @@ BuildRequires: %{python_module numpy} BuildRequires: %{python_module pandas} 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} +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 rope >= 1.2.0} @@ -55,15 +53,14 @@ BuildRequires: fdupes Requires: python-docstring-to-markdown Requires: python-pluggy >= 1.0.0 Requires: python-python-lsp-jsonrpc >= 1.0.0 -Requires: python-setuptools >= 39.0.0 Requires: python-ujson >= 3.0.0 Requires: (python-jedi >= 0.17.2 with python-jedi < 0.20) -Suggests: python-autopep8 >= 1.6.0 +Suggests: python-autopep8 >= 2.0.4 Conflicts: python-autopep8 >= 2.1.0 Suggests: python-pydocstyle >= 6.3.0 Conflicts: python-pydocstyle >= 6.4.0 Suggests: python-pylint >= 2.5.0 -Conflicts: python-pylint >= 3 +Conflicts: python-pylint >= 3.1 Suggests: python-rope >= 1.2.0 Suggests: python-yapf >= 0.33 Suggests: python-whatthepatch >= 1.0.2 @@ -104,6 +101,8 @@ will be enabled: %autosetup -p1 -n python-lsp-server-%{version} # Remove pytest addopts sed -i '/addopts/d' pyproject.toml +# increase pylint upper pin +sed -i '/pylint/ s/<3"/<3.1"/' pyproject.toml %build %pyproject_wheel