From 051dcd72643b040a4e8bec0fde45966819e66737496f35916d704a8a53d907e1 Mon Sep 17 00:00:00 2001
From: Benjamin Greiner <code@bnavigator.de>
Date: Wed, 27 Oct 2021 19:54:40 +0000
Subject: [PATCH] Accepting request 927779 from
 home:bnavigator:branches:devel:languages:python

- Update to version 1.2.4
  * Pin flake8 to be less than version 4.
  * Fix a pylint test when PyLsp is not installed.

OBS-URL: https://build.opensuse.org/request/show/927779
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-lsp-server?expand=0&rev=6
---
 python-lsp-server-1.2.2.tar.gz   | 3 ---
 python-lsp-server-1.2.4.tar.gz   | 3 +++
 python-python-lsp-server.changes | 7 +++++++
 python-python-lsp-server.spec    | 8 ++++----
 4 files changed, 14 insertions(+), 7 deletions(-)
 delete mode 100644 python-lsp-server-1.2.2.tar.gz
 create mode 100644 python-lsp-server-1.2.4.tar.gz

diff --git a/python-lsp-server-1.2.2.tar.gz b/python-lsp-server-1.2.2.tar.gz
deleted file mode 100644
index 96649d6..0000000
--- a/python-lsp-server-1.2.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c3e8ff5ff076f1aed8db5f14041e76d19ebd09ba1867e3f5f2f6740423ce0e3
-size 61742
diff --git a/python-lsp-server-1.2.4.tar.gz b/python-lsp-server-1.2.4.tar.gz
new file mode 100644
index 0000000..1b96d33
--- /dev/null
+++ b/python-lsp-server-1.2.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:007278c4419339bd3a61ca6d7eb8648ead28b5f1b9eba3b6bae8540046116335
+size 62073
diff --git a/python-python-lsp-server.changes b/python-python-lsp-server.changes
index 79e4bf5..10cdc6a 100644
--- a/python-python-lsp-server.changes
+++ b/python-python-lsp-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 27 13:16:45 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Update to version 1.2.4
+  * Pin flake8 to be less than version 4.
+  * Fix a pylint test when PyLsp is not installed.
+
 -------------------------------------------------------------------
 Sun Oct  3 18:50:53 UTC 2021 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-python-lsp-server.spec b/python-python-lsp-server.spec
index 45de01a..73acfaf 100644
--- a/python-python-lsp-server.spec
+++ b/python-python-lsp-server.spec
@@ -19,7 +19,7 @@
 %{?!python_module:%define python_module() python3-%{**}}
 %define skip_python2 1
 Name:           python-python-lsp-server
-Version:        1.2.2
+Version:        1.2.4
 Release:        0
 Summary:        Python Language Server for the Language Server Protocol
 License:        MIT
@@ -31,7 +31,7 @@ BuildRequires:  python-rpm-macros >= 20210628
 BuildRequires:  %{python_module jedi >= 0.17.2}
 BuildRequires:  %{python_module PyQt5}
 BuildRequires:  %{python_module autopep8}
-BuildRequires:  %{python_module flake8 >= 3.8.0}
+BuildRequires:  %{python_module flake8 >= 3.8.0 with %python-flake8 < 4}
 BuildRequires:  %{python_module flaky}
 BuildRequires:  %{python_module mccabe >= 0.6.0}
 BuildRequires:  %{python_module pluggy}
@@ -55,7 +55,7 @@ Requires:       python-python-lsp-jsonrpc >= 1.0.0
 Requires:       python-setuptools >= 39.0.0
 Requires:       python-ujson >= 3.0.0
 Suggests:       python-autopep8
-Suggests:       python-flake8 >= 3.8.0
+Suggests:       (python-flake8 >= 3.8.0 with python-flake8 < 4)
 Suggests:       python-mccabe >= 0.6.0
 Suggests:       python-pycodestyle >= 2.7.0
 Suggests:       python-pydocstyle >= 2.0.0
@@ -88,7 +88,7 @@ will be enabled:
 %prep
 %setup -q -n python-lsp-server-%{version}
 # the only relevant changes from https://github.com/python-lsp/python-lsp-server/pull/94
-sed -i 's/pylint>=2.5.0,<2.10.0/pylint>=2.5.0/' setup.cfg
+sed -i 's/pylint>=2.5.0,<2.10.0/pylint>=2.5.0/' setup.py
 sed -i "s/open(document.path, 'w')/open(document.path, 'w', encoding='utf-8')/" test/plugins/test_pylint_lint.py
 
 %build