1
0

Accepting request 1154412 from devel:languages:python

- Add python-lsp-black-pr56-black24.2.patch
  gh#python-lsp/python-lsp-black#56 (forwarded request 1154411 from bnavigator)

OBS-URL: https://build.opensuse.org/request/show/1154412
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-python-lsp-black?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2024-03-03 19:19:42 +00:00 committed by Git OBS Bridge
commit 2b4d0a9d48
3 changed files with 69 additions and 1 deletions

View File

@ -0,0 +1,60 @@
From d43b41431379f9c9bb05fab158c4d97e6d515f8f Mon Sep 17 00:00:00 2001
From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
Date: Tue, 20 Feb 2024 07:44:20 +0100
Subject: [PATCH] Make tests work with black 24.2.0
Closes: #55
---
setup.cfg | 2 ++
tests/test_plugin.py | 18 ++++++++++++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/setup.cfg b/setup.cfg
index a4fefd3..5103bcb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,6 +22,8 @@ install_requires =
python-lsp-server>=1.4.0
black>=23.11.0
tomli; python_version<'3.11'
+tests_require =
+ black>=24.2.0
python_requires = >= 3.8
[options.entry_points]
diff --git a/tests/test_plugin.py b/tests/test_plugin.py
index 0a51767..2ae8088 100644
--- a/tests/test_plugin.py
+++ b/tests/test_plugin.py
@@ -281,7 +281,14 @@ def test_load_config_defaults(config):
assert config == {
"line_length": 88,
- "target_version": set(),
+ "target_version": set(
+ [
+ black.TargetVersion.PY38,
+ black.TargetVersion.PY39,
+ black.TargetVersion.PY310,
+ black.TargetVersion.PY311,
+ ]
+ ),
"pyi": False,
"fast": False,
"skip_magic_trailing_comma": False,
@@ -297,7 +304,14 @@ def test_load_config_with_skip_options(config_with_skip_options):
assert config == {
"line_length": 88,
- "target_version": set(),
+ "target_version": set(
+ [
+ black.TargetVersion.PY38,
+ black.TargetVersion.PY39,
+ black.TargetVersion.PY310,
+ black.TargetVersion.PY311,
+ ]
+ ),
"pyi": False,
"fast": False,
"skip_magic_trailing_comma": True,

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Mar 3 11:20:47 UTC 2024 - Ben Greiner <code@bnavigator.de>
- Add python-lsp-black-pr56-black24.2.patch
gh#python-lsp/python-lsp-black#56
-------------------------------------------------------------------
Fri Jan 5 18:15:23 UTC 2024 - Dirk Müller <dmueller@suse.com>

View File

@ -24,6 +24,8 @@ Summary: Black plugin for the Python LSP Server
License: MIT
URL: https://github.com/python-lsp/python-lsp-black
Source: https://github.com/python-lsp/python-lsp-black/archive/refs/tags/v%{version}.tar.gz#/python-lsp-black-%{version}-gh.tar.gz
# PATCH-FIX-UPSTREAM python-lsp-black-pr56-black24.2.patch gh#python-lsp/python-lsp-black#56
Patch0: https://github.com/python-lsp/python-lsp-black/pull/56.patch#/python-lsp-black-pr56-black24.2.patch
BuildRequires: %{python_module base >= 3.8}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools}
@ -56,7 +58,7 @@ To avoid unexpected results you should make sure yapf and autopep8 are not insta
- python-lsp-black will use your project's pyproject.toml if it has one.
%prep
%setup -q -n python-lsp-black-%{version}
%autosetup -p1 -n python-lsp-black-%{version}
%build
%pyproject_wheel