public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Simone Tollardo <dev@tollsimy.net>
To: git-commits@fedoraproject.org
Subject: [rpms/python-black] rawhide: Update python-black to 26.5.1
Date: Fri, 10 Jul 2026 10:41:46 GMT	[thread overview]
Message-ID: <178368010617.1.5290768213800364914.rpms-python-black-dd2dba4285d4@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/python-black
            Branch : rawhide
            Commit : dd2dba4285d47069d90c46b23bbe88ade7f18350
            Author : Simone Tollardo <dev@tollsimy.net>
            Date   : 2026-07-09T15:49:48+02:00
            Stats  : +2/-185 in 6 file(s)
            URL    : https://src.fedoraproject.org/rpms/python-black/c/dd2dba4285d47069d90c46b23bbe88ade7f18350?branch=rawhide

            Log:
            Update python-black to 26.5.1

- Fixes: rhbz#2396612

Remove patches that are already merged upstream.

Signed-off-by: Simone Tollardo <dev@tollsimy.net>

---
diff --git a/14e1de805a.patch b/14e1de805a.patch
deleted file mode 100644
index 076ba4f..0000000
--- a/14e1de805a.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 14e1de805a5d66744a08742cad32d1660bf7617a Mon Sep 17 00:00:00 2001
-From: MeggyCal <MeggyCal@users.noreply.github.com>
-Date: Tue, 18 Feb 2025 16:30:11 +0100
-Subject: [PATCH] mix_stderr parameter was removed from click 8.2.0 (#4577)
-
----
- tests/test_black.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_black.py b/tests/test_black.py
-index 31bc34d4b89..4bdbdbba5cf 100644
---- a/tests/test_black.py
-+++ b/tests/test_black.py
-@@ -14,6 +14,7 @@
- from concurrent.futures import ThreadPoolExecutor
- from contextlib import contextmanager, redirect_stderr
- from dataclasses import fields, replace
-+from importlib.metadata import version as imp_version
- from io import BytesIO
- from pathlib import Path, WindowsPath
- from platform import system
-@@ -25,6 +26,7 @@
- import pytest
- from click import unstyle
- from click.testing import CliRunner
-+from packaging.version import Version
- from pathspec import PathSpec
- 
- import black
-@@ -114,7 +116,10 @@ class BlackRunner(CliRunner):
-     """Make sure STDOUT and STDERR are kept separate when testing Black via its CLI."""
- 
-     def __init__(self) -> None:
--        super().__init__(mix_stderr=False)
-+        if Version(imp_version("click")) >= Version("8.2.0"):
-+            super().__init__()
-+        else:
-+            super().__init__(mix_stderr=False)
- 
- 
- def invokeBlack(

diff --git a/5977532781.patch b/5977532781.patch
deleted file mode 100644
index 3476867..0000000
--- a/5977532781.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 59775327810403b7324c68cd74eef370ef570381 Mon Sep 17 00:00:00 2001
-From: GiGaGon <107241144+MeGaGiGaGon@users.noreply.github.com>
-Date: Wed, 11 Jun 2025 12:05:27 -0700
-Subject: [PATCH] Fix f-string format spec CI failure (#4690)
-
-Update pep_701.py
----
- tests/data/cases/pep_701.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/data/cases/pep_701.py b/tests/data/cases/pep_701.py
-index 9acee951e71..6f86988f0fb 100644
---- a/tests/data/cases/pep_701.py
-+++ b/tests/data/cases/pep_701.py
-@@ -74,9 +74,9 @@
- x = f"a{2+2:=^{foo(x+y**2):something else}one more}b"
- f'{(abc:=10)}'
- 
--f"This is a really long string, but just make sure that you reflow fstrings {
-+f"""This is a really long string, but just make sure that you reflow fstrings {
-     2+2:d
--}"
-+}"""
- f"This is a really long string, but just make sure that you reflow fstrings correctly {2+2:d}"
- 
- f"{2+2=}"
-@@ -213,9 +213,9 @@
- x = f"a{2+2:=^{foo(x+y**2):something else}one more}b"
- f"{(abc:=10)}"
- 
--f"This is a really long string, but just make sure that you reflow fstrings {
-+f"""This is a really long string, but just make sure that you reflow fstrings {
-     2+2:d
--}"
-+}"""
- f"This is a really long string, but just make sure that you reflow fstrings correctly {2+2:d}"
- 
- f"{2+2=}"

diff --git a/b0f36f5b42.patch b/b0f36f5b42.patch
deleted file mode 100644
index 403a63c..0000000
--- a/b0f36f5b42.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From b0f36f5b4233ef4cf613daca0adc3896d5424159 Mon Sep 17 00:00:00 2001
-From: danigm <daniel.garcia@suse.com>
-Date: Thu, 15 May 2025 14:04:00 +0200
-Subject: [PATCH] Update test_code_option_safe to work with click 8.2.0 (#4666)
-
----
- tests/test_black.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_black.py b/tests/test_black.py
-index acafb521619..f5c950244ef 100644
---- a/tests/test_black.py
-+++ b/tests/test_black.py
-@@ -1907,7 +1907,8 @@ def test_code_option_safe(self) -> None:
-             args = ["--safe", "--code", code]
-             result = CliRunner().invoke(black.main, args)
- 
--            self.compare_results(result, error_msg, 123)
-+            assert error_msg == result.output
-+            assert result.exit_code == 123
- 
-     def test_code_option_fast(self) -> None:
-         """Test that the code option ignores errors when the sanity checks fail."""

diff --git a/ed64d89faa.patch b/ed64d89faa.patch
deleted file mode 100644
index d3ffa3d..0000000
--- a/ed64d89faa.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From ed64d89faa7c738c4ba0006710f7e387174478af Mon Sep 17 00:00:00 2001
-From: "Michael R. Crusoe" <1330696+mr-c@users.noreply.github.com>
-Date: Thu, 27 Feb 2025 17:46:59 +0100
-Subject: [PATCH] additional fix for click 8.2.0 (#4591)
-
----
- tests/test_black.py | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/tests/test_black.py b/tests/test_black.py
-index 4bdbdbba5cf..ca19c17678b 100644
---- a/tests/test_black.py
-+++ b/tests/test_black.py
-@@ -192,10 +192,10 @@ def test_piping(self) -> None:
-             input=BytesIO(source.encode("utf-8")),
-         )
-         self.assertEqual(result.exit_code, 0)
--        self.assertFormatEqual(expected, result.output)
--        if source != result.output:
--            black.assert_equivalent(source, result.output)
--            black.assert_stable(source, result.output, DEFAULT_MODE)
-+        self.assertFormatEqual(expected, result.stdout)
-+        if source != result.stdout:
-+            black.assert_equivalent(source, result.stdout)
-+            black.assert_stable(source, result.stdout, DEFAULT_MODE)
- 
-     def test_piping_diff(self) -> None:
-         diff_header = re.compile(
-@@ -215,7 +215,7 @@ def test_piping_diff(self) -> None:
-             black.main, args, input=BytesIO(source.encode("utf-8"))
-         )
-         self.assertEqual(result.exit_code, 0)
--        actual = diff_header.sub(DETERMINISTIC_HEADER, result.output)
-+        actual = diff_header.sub(DETERMINISTIC_HEADER, result.stdout)
-         actual = actual.rstrip() + "\n"  # the diff output has a trailing space
-         self.assertEqual(expected, actual)
- 
-@@ -300,7 +300,7 @@ def test_expression_diff(self) -> None:
-             self.assertEqual(result.exit_code, 0)
-         finally:
-             os.unlink(tmp_file)
--        actual = result.output
-+        actual = result.stdout
-         actual = diff_header.sub(DETERMINISTIC_HEADER, actual)
-         if expected != actual:
-             dump = black.dump_to_file(actual)
-@@ -409,7 +409,7 @@ def test_skip_magic_trailing_comma(self) -> None:
-             self.assertEqual(result.exit_code, 0)
-         finally:
-             os.unlink(tmp_file)
--        actual = result.output
-+        actual = result.stdout
-         actual = diff_header.sub(DETERMINISTIC_HEADER, actual)
-         actual = actual.rstrip() + "\n"  # the diff output has a trailing space
-         if expected != actual:
-@@ -1831,7 +1831,7 @@ def test_bpo_2142_workaround(self) -> None:
-             self.assertEqual(result.exit_code, 0)
-         finally:
-             os.unlink(tmp_file)
--        actual = result.output
-+        actual = result.stdout
-         actual = diff_header.sub(DETERMINISTIC_HEADER, actual)
-         self.assertEqual(actual, expected)
- 
-@@ -1841,7 +1841,7 @@ def compare_results(
-     ) -> None:
-         """Helper method to test the value and exit code of a click Result."""
-         assert (
--            result.output == expected_value
-+            result.stdout == expected_value
-         ), "The output did not match the expected value."
-         assert result.exit_code == expected_exit_code, "The exit code is incorrect."
- 

diff --git a/python-black.spec b/python-black.spec
index 2304d2a..7ba04b7 100644
--- a/python-black.spec
+++ b/python-black.spec
@@ -1,19 +1,11 @@
 Name:           python-black
-Version:        25.1.0
+Version:        26.5.1
 Release:        %autorelease
 Summary:        The uncompromising code formatter
 License:        MIT
 URL:            https://github.com/psf/black
 Source:         %{pypi_source black}
 
-# Fix f-string format test failure with Python 3.14 and 3.13.4+
-Patch:          https://github.com/psf/black/commit/5977532781.patch
-
-# Upstream fixes for click 8.2+
-Patch:          https://github.com/psf/black/commit/14e1de805a.patch
-Patch:          https://github.com/psf/black/commit/ed64d89faa.patch
-Patch:          https://github.com/psf/black/commit/b0f36f5b42.patch
-
 BuildArch:      noarch
 
 BuildRequires:  python3-devel

diff --git a/sources b/sources
index 4776ce5..4fb2005 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (black-25.1.0.tar.gz) = 57281a678d322aaf0f2b7059aa59ad65055cb6999b8fc22ead115011d1b2e607d5cc91880369ee93a438bc266d7ebd371cd046f12d41a83383577f36a6211844
+SHA512 (black-26.5.1.tar.gz) = 8e17234aeffb5f7a66f1d9d9e2672796ec8ef0c660a3a8c0668061632591aee626a5f8a1a5210900c154ef2ae63919a690512e2d8fe789ac6bcf5d6eaaa055f0

                 reply	other threads:[~2026-07-10 10:41 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178368010617.1.5290768213800364914.rpms-python-black-dd2dba4285d4@fedoraproject.org \
    --to=dev@tollsimy.net \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox