From 9194a44777441d0aa346efdc033d49fde1d1ac7535af6d4feb8687be81dea520 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sun, 1 Jan 2023 10:41:21 +0000 Subject: [PATCH] Accepting request 1045987 from home:bnavigator:branches:devel:languages:python:numeric - Update to 1.7.0 * Add a new plugin to provide autoimport functionality (disabled by default). * Add progress reporting. * Make jedi_definition plugin follow definitions to pyi files. * Add support for flake8 version 6. * Add support for Yapf ignore patterns. * Add mccabe setting to flake8 plugin. - Drop python-lsp-server-pr316-flake8v6.patch upstreamed * gh#python-lsp/python-lsp-server#316 - Add python-lsp-server-pr327-sys-executable.patch * gh#python-lsp/python-lsp-server#327 OBS-URL: https://build.opensuse.org/request/show/1045987 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-lsp-server?expand=0&rev=29 --- python-lsp-server-1.6.0.tar.gz | 3 - python-lsp-server-1.7.0.tar.gz | 3 + python-lsp-server-pr316-flake8v6.patch | 101 ------------------- python-lsp-server-pr327-sys-executable.patch | 13 +++ python-python-lsp-server.changes | 16 +++ python-python-lsp-server.spec | 14 +-- 6 files changed, 39 insertions(+), 111 deletions(-) delete mode 100644 python-lsp-server-1.6.0.tar.gz create mode 100644 python-lsp-server-1.7.0.tar.gz delete mode 100644 python-lsp-server-pr316-flake8v6.patch create mode 100644 python-lsp-server-pr327-sys-executable.patch diff --git a/python-lsp-server-1.6.0.tar.gz b/python-lsp-server-1.6.0.tar.gz deleted file mode 100644 index e6442c5..0000000 --- a/python-lsp-server-1.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d75cdff9027c4212e5b9e861e9a0219219c8e2c69508d9f24949951dabd0dc1b -size 85242 diff --git a/python-lsp-server-1.7.0.tar.gz b/python-lsp-server-1.7.0.tar.gz new file mode 100644 index 0000000..9b1e894 --- /dev/null +++ b/python-lsp-server-1.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:401ce78ea2e98cadd02d94962eb32c92879caabc8055b9a2f36d7ef44acc5435 +size 95085 diff --git a/python-lsp-server-pr316-flake8v6.patch b/python-lsp-server-pr316-flake8v6.patch deleted file mode 100644 index ddb1175..0000000 --- a/python-lsp-server-pr316-flake8v6.patch +++ /dev/null @@ -1,101 +0,0 @@ -Index: python-lsp-server-1.6.0/.github/workflows/static.yml -=================================================================== ---- python-lsp-server-1.6.0.orig/.github/workflows/static.yml -+++ python-lsp-server-1.6.0/.github/workflows/static.yml -@@ -21,7 +21,7 @@ jobs: - - uses: actions/cache@v1 - with: - path: ~/.cache/pip -- key: static-pip-${{ hashFiles('setup.py') }} -+ key: static-pip-${{ hashFiles('pyproject.toml') }} - restore-keys: static-pip- - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 -Index: python-lsp-server-1.6.0/.github/workflows/test-linux.yml -=================================================================== ---- python-lsp-server-1.6.0.orig/.github/workflows/test-linux.yml -+++ python-lsp-server-1.6.0/.github/workflows/test-linux.yml -@@ -26,7 +26,7 @@ jobs: - - uses: actions/cache@v1 - with: - path: ~/.cache/pip -- key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('setup.py') }} -+ key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('pyproject.toml') }} - restore-keys: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip- - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 -@@ -34,7 +34,6 @@ jobs: - python-version: ${{ matrix.PYTHON_VERSION }} - architecture: 'x64' - - name: Create Jedi environment for testing -- if: matrix.PYTHON_VERSION != '2.7' - run: | - python3 -m venv /tmp/pyenv - /tmp/pyenv/bin/python -m pip install loghub -Index: python-lsp-server-1.6.0/.github/workflows/test-mac.yml -=================================================================== ---- python-lsp-server-1.6.0.orig/.github/workflows/test-mac.yml -+++ python-lsp-server-1.6.0/.github/workflows/test-mac.yml -@@ -26,7 +26,7 @@ jobs: - - uses: actions/cache@v1 - with: - path: ~/Library/Caches/pip -- key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('setup.py') }} -+ key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('pyproject.toml') }} - restore-keys: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip- - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 -@@ -34,7 +34,6 @@ jobs: - python-version: ${{ matrix.PYTHON_VERSION }} - architecture: 'x64' - - name: Create Jedi environment for testing -- if: matrix.PYTHON_VERSION != '2.7' - run: | - python3 -m venv /tmp/pyenv - /tmp/pyenv/bin/python -m pip install loghub -Index: python-lsp-server-1.6.0/.github/workflows/test-win.yml -=================================================================== ---- python-lsp-server-1.6.0.orig/.github/workflows/test-win.yml -+++ python-lsp-server-1.6.0/.github/workflows/test-win.yml -@@ -26,7 +26,7 @@ jobs: - - uses: actions/cache@v1 - with: - path: ~\AppData\Local\pip\Cache -- key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('setup.py') }} -+ key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('pyproject.toml') }} - restore-keys: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip- - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 -Index: python-lsp-server-1.6.0/pyproject.toml -=================================================================== ---- python-lsp-server-1.6.0.orig/pyproject.toml -+++ python-lsp-server-1.6.0/pyproject.toml -@@ -28,22 +28,22 @@ Homepage = "https://github.com/python-ls - [project.optional-dependencies] - all = [ - "autopep8>=1.6.0,<1.7.0", -- "flake8>=5.0.0,<5.1.0", -+ "flake8>=5.0.0,<7", - "mccabe>=0.7.0,<0.8.0", -- "pycodestyle>=2.9.0,<2.10.0", -+ "pycodestyle>=2.9.0,<2.11.0", - "pydocstyle>=2.0.0", -- "pyflakes>=2.5.0,<2.6.0", -+ "pyflakes>=2.5.0,<3.1.0", - "pylint>=2.5.0", - "rope>=0.10.5", - "yapf", - "whatthepatch" - ] - autopep8 = ["autopep8>=1.6.0,<1.7.0"] --flake8 = ["flake8>=5.0.0,<5.1.0"] -+flake8 = ["flake8>=5.0.0,<7"] - mccabe = ["mccabe>=0.7.0,<0.8.0"] --pycodestyle = ["pycodestyle>=2.9.0,<2.10.0"] -+pycodestyle = ["pycodestyle>=2.9.0,<2.11.0"] - pydocstyle = ["pydocstyle>=2.0.0"] --pyflakes = ["pyflakes>=2.5.0,<2.6.0"] -+pyflakes = ["pyflakes>=2.5.0,<3.1.0"] - pylint = ["pylint>=2.5.0"] - rope = ["rope>0.10.5"] - yapf = ["yapf", "whatthepatch>=1.0.2,<2.0.0"] diff --git a/python-lsp-server-pr327-sys-executable.patch b/python-lsp-server-pr327-sys-executable.patch new file mode 100644 index 0000000..d0688ab --- /dev/null +++ b/python-lsp-server-pr327-sys-executable.patch @@ -0,0 +1,13 @@ +diff --git a/pylsp/plugins/pylint_lint.py b/pylsp/plugins/pylint_lint.py +index 452f45b..222cdb8 100644 +--- a/pylsp/plugins/pylint_lint.py ++++ b/pylsp/plugins/pylint_lint.py +@@ -85,7 +85,7 @@ class PylintLinter: + return cls.last_diags[document.path] + + cmd = [ +- 'python', ++ sys.executable, + '-c', + 'import sys; from pylint.lint import Run; Run(sys.argv[1:])', + '-f', diff --git a/python-python-lsp-server.changes b/python-python-lsp-server.changes index f4009f4..2c317fd 100644 --- a/python-python-lsp-server.changes +++ b/python-python-lsp-server.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Dec 30 09:46:15 UTC 2022 - Ben Greiner + +- Update to 1.7.0 + * Add a new plugin to provide autoimport functionality (disabled + by default). + * Add progress reporting. + * Make jedi_definition plugin follow definitions to pyi files. + * Add support for flake8 version 6. + * Add support for Yapf ignore patterns. + * Add mccabe setting to flake8 plugin. +- Drop python-lsp-server-pr316-flake8v6.patch upstreamed + * gh#python-lsp/python-lsp-server#316 +- Add python-lsp-server-pr327-sys-executable.patch + * gh#python-lsp/python-lsp-server#327 + ------------------------------------------------------------------- Mon Dec 19 21:37:19 UTC 2022 - Ben Greiner diff --git a/python-python-lsp-server.spec b/python-python-lsp-server.spec index 8c242a2..956fbd9 100644 --- a/python-python-lsp-server.spec +++ b/python-python-lsp-server.spec @@ -1,7 +1,7 @@ # # spec file for package python-python-lsp-server # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,14 @@ Name: python-python-lsp-server -Version: 1.6.0 +Version: 1.7.0 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 python-lsp-server-pr316-flake8v6.patch gh#python-lsp/python-lsp-server#316 -Patch0: python-lsp-server-pr316-flake8v6.patch +# PATCH-FIX-UPSTREAM python-lsp-server-pr327-sys-executable.patch gh#python-lsp/python-lsp-server#327 +Patch1: python-lsp-server-pr327-sys-executable.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 61.2} @@ -47,7 +47,7 @@ BuildRequires: %{python_module pydocstyle >= 2.0.0} BuildRequires: %{python_module pylint >= 2.5.0} BuildRequires: %{python_module pytest} BuildRequires: %{python_module python-lsp-jsonrpc >= 1.0.0} -BuildRequires: %{python_module rope >= 0.10.5} +BuildRequires: %{python_module rope >= 1.2.0} BuildRequires: %{python_module ujson >= 3.0.0} BuildRequires: %{python_module whatthepatch} BuildRequires: %{python_module yapf} @@ -63,7 +63,7 @@ Suggests: python-autopep8 >= 1.6.0 Conflicts: python-autopep8 >= 1.7.0 Suggests: python-pydocstyle >= 2.0.0 Suggests: python-pylint >= 2.5.0 -Suggests: python-rope >= 0.10.5 +Suggests: python-rope >= 1.2.0 Suggests: python-yapf Suggests: python-whatthepatch # SECTION flake8 pins @@ -125,6 +125,6 @@ sed -i '/addopts/d' pyproject.toml %license LICENSE %python_alternative %{_bindir}/pylsp %{python_sitelib}/pylsp -%{python_sitelib}/python_lsp_server-%{version}*-info +%{python_sitelib}/python_lsp_server-%{version}.dist-info %changelog