Sync from SUSE:SLFO:1.1 python-exceptiongroup revision 551a0cdf199271149f09f08d12385e7c

python-exceptiongroup.changes

@@ -1,48 +1,3 @@
--------------------------------------------------------------------
-Fri Jul 26 11:42:55 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
-
-- Update to 1.2.2
-  * Removed an ``assert`` in ``exceptiongroup._formatting``
-    that caused compatibility issues with Sentry (#123)
-
--------------------------------------------------------------------
-Sat Apr 20 14:08:38 UTC 2024 - Dirk Müller <dmueller@suse.com>
-
-- update to 1.2.1:
-  * Updated the copying of __notes__ to match CPython behavior
-  * Corrected the type annotation of the exception handler
-    callback to accept a BaseExceptionGroup instead of
-    BaseException
-  * Fixed type errors on Python < 3.10 and the type annotation of
-    suppress()
-
--------------------------------------------------------------------
-Mon Nov 27 15:43:56 UTC 2023 - Dirk Müller <dmueller@suse.com>
-
-- update to 1.2.0:
-  * Added special monkeypatching if `Apport
-    <https://github.com/canonical/apport>`_ has
-    overridden ``sys.excepthook`` so it will format exception
-    groups correctly
-  * Added a backport of ``contextlib.suppress()`` from Python
-    3.12.1 which also handles suppressing exceptions inside
-    exception groups
-  * Fixed bare ``raise`` in a handler reraising the original
-    naked exception rather than an exception group which is what
-    is raised when you do a ``raise`` in an ``except*`` handler
-  * ``catch()`` now raises a ``TypeError`` if passed an async
-    exception handler instead of just giving a ``RuntimeWarning``
-    about the coroutine never being awaited.
-  * Fixed plain ``raise`` statement in an exception handler
-    callback to work like a ``raise`` in an ``except*`` block
-  * Fixed new exception group not being chained to the original
-    exception when raising an exception group from exceptions
-    raised in handler callbacks
-  * Fixed type annotations of the ``derive()``, ``subgroup()``
-    and ``split()`` methods to match the ones in typeshed
-- drop skip-test_catch_handler_raises-for-older-311.patch
-  (upstream)
-
 -------------------------------------------------------------------
 Tue Jul  4 22:32:27 UTC 2023 - Matej Cepl <mcepl@suse.com>
 

python-exceptiongroup.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package python-exceptiongroup
+# spec file
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,12 +29,15 @@
 
 %{?sle15_python_module_pythons}
 Name:           python-exceptiongroup%{psuffix}
-Version:        1.2.2
+Version:        1.1.2
 Release:        0
 Summary:        Backport of PEP 654 (exception groups)
 License:        MIT AND Python-2.0
 URL:            https://github.com/agronholm/exceptiongroup
 Source:         https://github.com/agronholm/exceptiongroup/archive/refs/tags/%{version}.tar.gz#/exceptiongroup-%{version}-gh.tar.gz
+# PATCH-FIX-UPSTREAM skip-test_catch_handler_raises-for-older-311.patch gh#agronholm/exceptiongroup#64 mcepl@suse.com
+# Skip test_catch_handler_raises() on Python 3.11 if the Python version is less than 3.11.4
+Patch0:         skip-test_catch_handler_raises-for-older-311.patch
 BuildRequires:  %{python_module base >= 3.7}
 BuildRequires:  %{python_module flit-scm}
 BuildRequires:  %{python_module pip}

skip-test_catch_handler_raises-for-older-311.patch

@@ -0,0 +1,31 @@
+From 452ba0946347b4e0df950763213f162704bc1eed Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
+Date: Wed, 5 Jul 2023 12:28:15 +0300
+Subject: [PATCH] Skip test_catch_handler_raises() on Python 3.11 if the Python
+ version is too low
+
+---
+ tests/test_catch_py311.py | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/tests/test_catch_py311.py b/tests/test_catch_py311.py
+index 4351be8..5880f0a 100644
+--- a/tests/test_catch_py311.py
++++ b/tests/test_catch_py311.py
+@@ -1,3 +1,5 @@
++import sys
++
+ import pytest
+ 
+ from exceptiongroup import ExceptionGroup
+@@ -121,6 +123,10 @@ def test_catch_full_match():
+         pass
+ 
+ 
++@pytest.mark.skipif(
++    sys.version_info < (3, 11, 4),
++    reason="Behavior was changed in 3.11.4",
++)
+ def test_catch_handler_raises():
+     with pytest.raises(RuntimeError, match="new"):
+         try: