Compare commits

...

10 Commits

Author SHA1 Message Date
Troy Dawson
64f3e4444c Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
2024-10-29 09:05:27 -07:00
George Pantelakis
6d921f2ce3 add gating for RHEL-10 2024-07-04 14:47:23 +02:00
Troy Dawson
6e64ee27cb Bump release for June 2024 mass rebuild 2024-06-24 09:16:51 -07:00
Fedora Release Engineering
d9d3865f94 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-26 02:13:56 +00:00
Fedora Release Engineering
cf7bdbd022 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-21 23:57:46 +00:00
Sérgio M. Basto
cc76bbe20e Fix for Sphinx 7.2 compatlble with older Sphinx 2024-01-11 23:16:59 +00:00
Sérgio M. Basto
df448efc33 Fix the build for f39 and rawhide
Remove -W from SPHINXOPTS
since Python 3.10 we should use mkdir instead makedirs
2024-01-11 19:01:59 +00:00
Dmitry Belyavskiy
00b7ecb082 migrated to SPDX license 2023-08-04 14:47:12 +02:00
Fedora Release Engineering
1b980ce894 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-21 08:06:29 +00:00
Python Maint
91959df4de Rebuilt for Python 3.12 2023-06-29 23:31:26 +02:00
8 changed files with 95 additions and 41 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

View File

@ -1,38 +0,0 @@
From de3504c81c7cefc87c8229743f93232ca00a685d Mon Sep 17 00:00:00 2001
From: Daniel Garcia Moreno <daniel.garcia@suse.com>
Date: Fri, 28 Oct 2022 08:45:33 +0200
Subject: [PATCH 1/2] Fix tests for Sphinx 5.3.0
Fix https://github.com/breathe-doc/breathe/issues/863
---
tests/test_renderer.py | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/tests/test_renderer.py b/tests/test_renderer.py
index 16889818..a858c65d 100644
--- a/tests/test_renderer.py
+++ b/tests/test_renderer.py
@@ -109,6 +109,12 @@ def __init__(self, **kwargs):
WrappedDoxygenNode.__init__(self, compounddefTypeSub, **kwargs)
+class MockMemo:
+ def __init__(self):
+ self.title_styles = ""
+ self.section_level = ""
+
+
class MockState:
def __init__(self, app):
from breathe.project import ProjectInfoFactory
@@ -123,7 +129,11 @@ def __init__(self, app):
settings.env = env
self.document = utils.new_document("", settings)
- def nested_parse(self, content, content_offset, contentnode):
+ # In sphinx 5.3.0 the method state.nested_parse is not called directly
+ # so this memo object should exists here
+ self.memo = MockMemo()
+
+ def nested_parse(self, content, content_offset, contentnode, match_titles=1):
pass

27
956.patch Normal file
View File

@ -0,0 +1,27 @@
From 46abd77157a2a57e81586e4f8765ae8f1a09d167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=C3=A9ta?= <meggy.calabkova@gmail.com>
Date: Wed, 4 Oct 2023 15:53:59 +0200
Subject: [PATCH] support Sphinx 7.2
---
breathe/project.py | 2 +-
tests/test_renderer.py | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/test_renderer.py b/tests/test_renderer.py
index a858c65d..73a29e4e 100644
--- a/tests/test_renderer.py
+++ b/tests/test_renderer.py
@@ -35,7 +35,11 @@ def app(test_params, app_params, make_app, shared_result):
"""
args, kwargs = app_params
assert "srcdir" in kwargs
- kwargs["srcdir"].makedirs(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_

25
964.patch Normal file
View File

@ -0,0 +1,25 @@
From e487d63ca45304fc9e4c0b27de163302aa91ed35 Mon Sep 17 00:00:00 2001
From: Scott Main <scottamain@gmail.com>
Date: Fri, 8 Dec 2023 10:41:12 -0800
Subject: [PATCH] Fix PosixPath issue with Sphinx 7.2
Just need to cast the path to a string.
Fixes https://github.com/breathe-doc/breathe/issues/944
---
breathe/project.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/breathe/project.py b/breathe/project.py
index 865236e8..f5b780a4 100644
--- a/breathe/project.py
+++ b/breathe/project.py
@@ -113,7 +113,7 @@ def __init__(self, app: Sphinx):
# Assume general build directory is the doctree directory without the last component.
# We strip off any trailing slashes so that dirname correctly drops the last part.
# This can be overridden with the breathe_build_directory config variable
- self._default_build_dir = os.path.dirname(app.doctreedir.rstrip(os.sep))
+ self._default_build_dir = os.path.dirname(str(app.doctreedir).rstrip(os.sep))
self.project_count = 0
self.project_info_store: Dict[str, ProjectInfo] = {}
self.project_info_for_auto_store: Dict[str, AutoProjectInfo] = {}

1
ci.fmf Normal file
View File

@ -0,0 +1 @@
resultsdb-testcase: separate

7
gating.yaml Normal file
View File

@ -0,0 +1,7 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-buildroot-disabled.functional}
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-buildroot-enabled.functional}

26
plans/ci.fmf Normal file
View File

@ -0,0 +1,26 @@
/fips-disabled-buildroot-disabled:
plan:
import:
url: https://pkgs.devel.redhat.com/git/tests/libfido2
name: /plans/ci/fips-disabled-buildroot-disabled
/fips-disabled-buildroot-enabled:
plan:
import:
url: https://pkgs.devel.redhat.com/git/tests/libfido2
name: /plans/ci/fips-disabled-buildroot-enabled
/fips-enaled-buildroot-disabled:
plan:
import:
url: https://pkgs.devel.redhat.com/git/tests/libfido2
name: /plans/ci/fips-enabled-buildroot-disabled
/fips-enaled-buildroot-enabled:
plan:
import:
url: https://pkgs.devel.redhat.com/git/tests/libfido2
name: /plans/ci/fips-enabled-buildroot-enabled

View File

@ -12,11 +12,15 @@ Version: 4.35.0
Release: %autorelease Release: %autorelease
Summary: Adds support for Doxygen xml output to reStructuredText and Sphinx Summary: Adds support for Doxygen xml output to reStructuredText and Sphinx
License: BSD License: BSD-3-Clause
URL: https://github.com/%{owner}/%{srcname} URL: https://github.com/%{owner}/%{srcname}
Source0: %{URL}/archive/v%{version}.tar.gz Source0: %{URL}/archive/v%{version}.tar.gz
Source1: %{URL}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.sig Source1: %{URL}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.sig
Source2: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x8aed58021feacdd5f27ba0e6a72f627716ea9d96#./vermware.key Source2: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x8aed58021feacdd5f27ba0e6a72f627716ea9d96#./vermware.key
# Patch1 first hunk was truncated
Patch1: https://github.com/breathe-doc/breathe/pull/956.patch
# Patch2 is a better fix of first hunk of Path1
Patch2: https://github.com/breathe-doc/breathe/pull/964.patch
BuildArch: noarch BuildArch: noarch
@ -61,7 +65,7 @@ Requires: doxygen >= 1.8.4
%package doc %package doc
Summary: Documentation files for %{srcname} Summary: Documentation files for %{srcname}
# tinyxml uses zlib license # tinyxml uses zlib license
License: BSD and zlib License: BSD-3-Clause AND Zlib
%description doc %description doc
This package contains documentation for developer documentation for %{srcname}. This package contains documentation for developer documentation for %{srcname}.
@ -74,7 +78,8 @@ This package contains documentation for developer documentation for %{srcname}.
%py3_build %py3_build
%if %{with doc} %if %{with doc}
# Build the documentation # Build the documentation
%make_build DOXYGEN=$(which doxygen) PYTHONPATH=$(pwd) html # Remove -W (turn warnings into errors) from SPHINXOPTS to fix the build for f39
%make_build SPHINXOPTS="-v -E" DOXYGEN=$(which doxygen) PYTHONPATH=$(pwd) html
# Remove temporary build files # Remove temporary build files
rm documentation/build/html/.buildinfo rm documentation/build/html/.buildinfo
%endif %endif