From 40795da6ad8ce0666040e2bd94ed35f265774a10eb3e72497f6ed82824094f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de> Date: Fri, 13 Dec 2024 11:14:27 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main python-breathe revision 88eddb896f92a1f2f553d4593fa16c5f --- python-breathe.changes | 11 +++++++++++ python-breathe.spec | 7 ++++--- support-sphinx-7.2.patch | 8 ++++++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/python-breathe.changes b/python-breathe.changes index 427a089..c7a13da 100644 --- a/python-breathe.changes +++ b/python-breathe.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Jul 20 01:45:43 UTC 2024 - Matej Cepl <mcepl@cepl.eu> + +- Skip test suite because of gh#breathe-doc/breathe#987 + +------------------------------------------------------------------- +Wed Oct 4 13:47:35 UTC 2023 - Markéta Machová <mmachova@suse.com> + +- Make support-sphinx-7.2.patch backwards-compatible + * and sent upstream: https://github.com/breathe-doc/breathe/pull/956 + ------------------------------------------------------------------- Tue Aug 29 02:48:53 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com> diff --git a/python-breathe.spec b/python-breathe.spec index b8d4775..5e4d1f6 100644 --- a/python-breathe.spec +++ b/python-breathe.spec @@ -1,7 +1,7 @@ # # spec file for package python-breathe # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,7 +37,7 @@ BuildRequires: python-rpm-macros Requires: python-Sphinx >= 4.0 Requires: python-docutils >= 0.12 Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives Provides: python-sphinxcontrib-breathe = %{version} Obsoletes: python-sphinxcontrib-breathe < %{version} BuildArch: noarch @@ -54,7 +54,8 @@ able to read and render Doxygen xml output. %pyproject_wheel %check -%pytest +# Tests fail because of gh#breathe-doc/breathe#987 +# %%pytest %install %pyproject_install diff --git a/support-sphinx-7.2.patch b/support-sphinx-7.2.patch index 8c8e6a8..8159a75 100644 --- a/support-sphinx-7.2.patch +++ b/support-sphinx-7.2.patch @@ -2,12 +2,16 @@ Index: breathe-4.35.0/tests/test_renderer.py =================================================================== --- breathe-4.35.0.orig/tests/test_renderer.py +++ breathe-4.35.0/tests/test_renderer.py -@@ -35,7 +35,7 @@ def app(test_params, app_params, make_ap +@@ -35,7 +35,11 @@ def app(test_params, app_params, make_ap """ args, kwargs = app_params assert "srcdir" in kwargs - kwargs["srcdir"].makedirs(exist_ok=True) -+ kwargs["srcdir"].mkdir(parents=True, exist_ok=True) ++ try: ++ kwargs["srcdir"].mkdir(parents=True, exist_ok=True) ++ except AttributeError: ++ # old version of Sphinx ++ kwargs["srcdir"].makedirs(exist_ok=True) (kwargs["srcdir"] / "conf.py").write_text("") app_ = make_app(*args, **kwargs) yield app_