From 33cbd21ff51824f52aeca58d494ae648af86fffc330fdcdd44db81fb1bfb7f2b Mon Sep 17 00:00:00 2001
From: Benjamin Greiner <code@bnavigator.de>
Date: Fri, 25 Mar 2022 13:28:25 +0000
Subject: [PATCH] Accepting request 964860 from
 home:bnavigator:branches:devel:languages:python

- Update to 1.4.0
  * Support pycodestyle indent-size option
  * Add DiagnosticTag constants from LSP 3.15
  * Drop support for Python 3.6

OBS-URL: https://build.opensuse.org/request/show/964860
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-lsp-server?expand=0&rev=16
---
 python-lsp-server-1.3.3.tar.gz   |  3 ---
 python-lsp-server-1.4.0.tar.gz   |  3 +++
 python-python-lsp-server.changes |  8 ++++++++
 python-python-lsp-server.spec    | 19 +++++++++----------
 4 files changed, 20 insertions(+), 13 deletions(-)
 delete mode 100644 python-lsp-server-1.3.3.tar.gz
 create mode 100644 python-lsp-server-1.4.0.tar.gz

diff --git a/python-lsp-server-1.3.3.tar.gz b/python-lsp-server-1.3.3.tar.gz
deleted file mode 100644
index e8f6521..0000000
--- a/python-lsp-server-1.3.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1b48ccd8b70103522e8a8b9cb9ae1be2b27a5db0dfd661e7e44e6253ebefdc40
-size 62604
diff --git a/python-lsp-server-1.4.0.tar.gz b/python-lsp-server-1.4.0.tar.gz
new file mode 100644
index 0000000..ad35eeb
--- /dev/null
+++ b/python-lsp-server-1.4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:769142c07573f6b66e930cbd7c588b826082550bef6267bb0aec63e7b6260009
+size 75443
diff --git a/python-python-lsp-server.changes b/python-python-lsp-server.changes
index 3537d21..edd88ae 100644
--- a/python-python-lsp-server.changes
+++ b/python-python-lsp-server.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Mar 25 12:44:22 UTC 2022 - Ben Greiner <code@bnavigator.de>
+
+- Update to 1.4.0 
+  * Support pycodestyle indent-size option
+  * Add DiagnosticTag constants from LSP 3.15
+  * Drop support for Python 3.6
+
 -------------------------------------------------------------------
 Sat Jan  8 21:37:57 UTC 2022 - Benjamin Greiner <code@bnavigator.de>
 
diff --git a/python-python-lsp-server.spec b/python-python-lsp-server.spec
index 82fe391..cb0f8d7 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) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,16 @@
 %{?!python_module:%define python_module() python3-%{**}}
 %define skip_python2 1
 Name:           python-python-lsp-server
-Version:        1.3.3
+Version:        1.4.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
-BuildRequires:  %{python_module setuptools >= 39.0.0}
+BuildRequires:  %{python_module setuptools >= 44}
+BuildRequires:  %{python_module setuptools_scm >= 3.4.3}
+BuildRequires:  %{python_module tomli}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  python-rpm-macros >= 20210628
 # SECTION test requirements
 BuildRequires:  %{python_module jedi >= 0.17.2}
@@ -47,11 +50,10 @@ BuildRequires:  %{python_module python-lsp-jsonrpc >= 1.0.0}
 BuildRequires:  %{python_module rope >= 0.10.5}
 BuildRequires:  %{python_module ujson >= 3.0.0}
 BuildRequires:  %{python_module yapf}
-
 # /SECTION
 BuildRequires:  fdupes
 Requires:       python-jedi >= 0.17.2
-Requires:       python-pluggy
+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
@@ -60,6 +62,7 @@ Conflicts:      python-autopep8 >= 1.7.0
 Suggests:       python-flake8 >= 4.0.0
 Conflicts:      python-flake8 >= 4.1.0
 Suggests:       python-mccabe >= 0.6.0
+Conflicts:      python-mccabe >= 0.7.0
 Suggests:       python-pycodestyle >= 2.8.0
 Conflicts:      python-pycodestyle >= 2.9.0
 Suggests:       python-pydocstyle >= 2.0.0
@@ -109,11 +112,7 @@ ln -s %{_bindir}/pylint-%{$python_bin_suffix} build/testbin/pylint
 export PATH="$PWD/build/testbin:$PATH"
 # Remove pytest addopts
 rm setup.cfg
-%if 0%{?sle_version} >= 150000 && 0%{?is_opensuse}
-  # Test failure on Leap 15 due to mock hiccup
-  donttest+=" or test_flake8_config_param or test_flake8_executable_param"
-%endif
-%pytest -ra -k "not (dummy_k_expr_start ${donttest} ${$python_donttest})" -vv
+%pytest
 
 %post
 %python_install_alternative pylsp