diff --git a/python-lsp-server-pr510-flake8-7.patch b/python-lsp-server-pr510-flake8-7.patch new file mode 100644 index 0000000..6bcc377 --- /dev/null +++ b/python-lsp-server-pr510-flake8-7.patch @@ -0,0 +1,31 @@ +Index: python-lsp-server-1.9.0/pyproject.toml +=================================================================== +--- python-lsp-server-1.9.0.orig/pyproject.toml ++++ python-lsp-server-1.9.0/pyproject.toml +@@ -28,22 +28,22 @@ Homepage = "https://github.com/python-ls + [project.optional-dependencies] + all = [ + "autopep8>=2.0.4,<2.1.0", +- "flake8>=6.1.0,<7", ++ "flake8>=7,<8", + "mccabe>=0.7.0,<0.8.0", + "pycodestyle>=2.11.0,<2.12.0", + "pydocstyle>=6.3.0,<6.4.0", +- "pyflakes>=3.1.0,<3.2.0", ++ "pyflakes>=3.2.0,<3.3.0", + "pylint>=2.5.0,<3.1", + "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>=6.1.0,<7"] ++flake8 = ["flake8>=7,<8"] + mccabe = ["mccabe>=0.7.0,<0.8.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"] ++pyflakes = ["pyflakes>=3.2.0,<3.3.0"] + pylint = ["pylint>=2.5.0,<3.1"] + rope = ["rope>1.2.0"] + yapf = ["yapf>=0.33.0", "whatthepatch>=1.0.2,<2.0.0"] diff --git a/python-python-lsp-server.changes b/python-python-lsp-server.changes index 387d5df..b765b89 100644 --- a/python-python-lsp-server.changes +++ b/python-python-lsp-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 5 18:37:26 UTC 2024 - Ben Greiner + +- Bump to flake8 v7 gh#python-lsp/python-lsp-server#510 + * python-lsp-server-pr510-flake8-7.patch + ------------------------------------------------------------------- Fri Nov 24 20:13:48 UTC 2023 - Ben Greiner diff --git a/python-python-lsp-server.spec b/python-python-lsp-server.spec index b34b434..b5a6f03 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) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,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-pr510-flake8-7.patch gh#/python-lsp/python-lsp-server#510 +Patch0: python-lsp-server-pr510-flake8-7.patch BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 61.2} @@ -35,7 +37,7 @@ BuildRequires: python-rpm-macros >= 20210628 BuildRequires: %{python_module docstring-to-markdown} 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 flake8 >= 7 with %python-flake8 < 8} 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} @@ -72,14 +74,14 @@ Suggests: python-yapf >= 0.33 Suggests: python-whatthepatch >= 1.0.2 Conflicts: python-whatthepatch >= 2 # SECTION flake8 pins -Suggests: python-flake8 >= 6.1.0 -Conflicts: python-flake8 >= 7 +Suggests: python-flake8 >= 7 +Conflicts: python-flake8 >= 8 Suggests: python-mccabe >= 0.7.0 Conflicts: python-mccabe >= 0.8.0 Suggests: python-pycodestyle >= 2.11.0 Conflicts: python-pycodestyle >= 2.12.0 -Suggests: python-pyflakes >= 3.1.0 -Conflicts: python-pyflakes >= 3.2.0 +Suggests: python-pyflakes >= 3.2.0 +Conflicts: python-pyflakes >= 3.3.0 # /SECTION BuildArch: noarch Requires(post): update-alternatives