[gentoo-commits] repo/gentoo:master commit in: dev-python/breathe/, dev-python/breathe/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/breathe/, dev-python/breathe/files/

[Michał Górny]

commit:     397592b19dc3350bfb70423f573ce9a40de7d013
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 11:20:20 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 11:24:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=397592b1

dev-python/breathe: Backport fix for testing w/ Sphinx 5.3.0

Closes: https://bugs.gentoo.org/887853
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/breathe/breathe-4.34.0.ebuild           |  4 ++
 .../files/breathe-4.34.0-sphinx-5.3.0.patch        | 43 ++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/dev-python/breathe/breathe-4.34.0.ebuild b/dev-python/breathe/breathe-4.34.0.ebuild
index 653ebdf4f02d..dbc0627c69cd 100644
--- a/dev-python/breathe/breathe-4.34.0.ebuild
+++ b/dev-python/breathe/breathe-4.34.0.ebuild
@@ -34,3 +34,7 @@ RDEPEND="
 "
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sphinx-5.3.0.patch
+)

diff --git a/dev-python/breathe/files/breathe-4.34.0-sphinx-5.3.0.patch b/dev-python/breathe/files/breathe-4.34.0-sphinx-5.3.0.patch
new file mode 100644
index 000000000000..52c65b99ec4a
--- /dev/null
+++ b/dev-python/breathe/files/breathe-4.34.0-sphinx-5.3.0.patch
@@ -0,0 +1,43 @@
+From 877d88e5aecd1d39978a46fe7f3df35474d7cd8d 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] 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 1688981..a858c65 100644
+--- a/tests/test_renderer.py
++++ b/tests/test_renderer.py
+@@ -109,6 +109,12 @@ class WrappedCompoundDef(compounddefTypeSub, WrappedDoxygenNode):
+         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 @@ class MockState:
+         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
+ 
+ 
+-- 
+2.39.0
+

[gentoo-commits] repo/gentoo:master commit in: dev-python/breathe/, dev-python/breathe/files/

[Michał Górny]

commit:     8ccab891cfe12fd35101f52e9b667964df5e883f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  5 08:19:04 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr  5 08:19:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ccab891

dev-python/breathe: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/breathe/Manifest                        |  1 -
 dev-python/breathe/breathe-4.34.0.ebuild           | 41 ---------------------
 .../files/breathe-4.34.0-sphinx-5.3.0.patch        | 43 ----------------------
 3 files changed, 85 deletions(-)

diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index f25583217989..a14e4d4d735f 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,2 +1 @@
-DIST breathe-4.34.0.gh.tar.gz 206989 BLAKE2B 1c899165ae30de373f90c0fd0b3428d7f4d74e3f66720731c2d02bc2a8bd9c6e5bbd81909b8ab186304975f877d276ed0170c611105335032bee3b689cadef73 SHA512 7f3134575f1b8c4d7c96ebc735e33f656b5c6046de3fa2aee95d5e895fb33f0a83fb4b1c64dd69b9deca20b785868b42d6b1d5e39741500ff5f9d82bf3f130b4
 DIST breathe-4.35.0.gh.tar.gz 212932 BLAKE2B 9423cc99cd1dc45fa1c93f1e2adfe59be4f3398842d3c6f98ee7a17285e108de4eb88e149c4ee179fa1008e30b69c8fa4f3934506aa53892c2eb612fa7652ba3 SHA512 76e36fceb89c21e2c62471a37b856f8e7077f946ca8ebffdd068297d7d447ba4f42f8f9d91e231f7a181d7dba2cb8650479f35f8bef342184e5ccbd3dd951f91

diff --git a/dev-python/breathe/breathe-4.34.0.ebuild b/dev-python/breathe/breathe-4.34.0.ebuild
deleted file mode 100644
index f5520f4e516f..000000000000
--- a/dev-python/breathe/breathe-4.34.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx Doxygen renderer"
-HOMEPAGE="
-	https://breathe.readthedocs.io/en/latest/
-	https://github.com/breathe-doc/breathe/
-	https://pypi.org/project/breathe/
-"
-SRC_URI="
-	https://github.com/breathe-doc/breathe/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-4.0.0[${PYTHON_USEDEP}]
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sphinx-5.3.0.patch
-)

diff --git a/dev-python/breathe/files/breathe-4.34.0-sphinx-5.3.0.patch b/dev-python/breathe/files/breathe-4.34.0-sphinx-5.3.0.patch
deleted file mode 100644
index 52c65b99ec4a..000000000000
--- a/dev-python/breathe/files/breathe-4.34.0-sphinx-5.3.0.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 877d88e5aecd1d39978a46fe7f3df35474d7cd8d 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] 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 1688981..a858c65 100644
---- a/tests/test_renderer.py
-+++ b/tests/test_renderer.py
-@@ -109,6 +109,12 @@ class WrappedCompoundDef(compounddefTypeSub, WrappedDoxygenNode):
-         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 @@ class MockState:
-         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
- 
- 
--- 
-2.39.0
-

[gentoo-commits] repo/gentoo:master commit in: dev-python/breathe/, dev-python/breathe/files/

[Michał Górny]

commit:     97bf9dbde04260bf1357232e3b11a124574c68a5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 11:48:56 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 12:10:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97bf9dbd

dev-python/breathe: Pull a sphinx-7.2 fix

Closes: https://bugs.gentoo.org/922997
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 ...athe-4.35.0.ebuild => breathe-4.35.0-r1.ebuild} |  5 +++
 .../breathe/files/breathe-4.35.0-sphinx-7.2.patch  | 40 ++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/dev-python/breathe/breathe-4.35.0.ebuild b/dev-python/breathe/breathe-4.35.0-r1.ebuild
similarity index 89%
rename from dev-python/breathe/breathe-4.35.0.ebuild
rename to dev-python/breathe/breathe-4.35.0-r1.ebuild
index 4c6e3cd4c57d..16719afdb406 100644
--- a/dev-python/breathe/breathe-4.35.0.ebuild
+++ b/dev-python/breathe/breathe-4.35.0-r1.ebuild
@@ -35,3 +35,8 @@ RDEPEND="
 "
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/breathe-doc/breathe/pull/956
+	"${FILESDIR}/${P}-sphinx-7.2.patch"
+)

diff --git a/dev-python/breathe/files/breathe-4.35.0-sphinx-7.2.patch b/dev-python/breathe/files/breathe-4.35.0-sphinx-7.2.patch
new file mode 100644
index 000000000000..b81eddc6a6e3
--- /dev/null
+++ b/dev-python/breathe/files/breathe-4.35.0-sphinx-7.2.patch
@@ -0,0 +1,40 @@
+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/breathe/project.py b/breathe/project.py
+index 865236e8..9716cb59 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 = app.doctreedir.parent
+         self.project_count = 0
+         self.project_info_store: Dict[str, ProjectInfo] = {}
+         self.project_info_for_auto_store: Dict[str, AutoProjectInfo] = {}
+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_