Control: tags 1114305 + patch
Control: tags 1114305 + pending

Dear maintainer,

I've prepared an NMU for python-gitlab (versioned as 1:4.9.0-1.1) and 
uploaded it to DELAYED/15. Please feel free to tell me if I should 
cancel it.

cu
Adrian
diffstat for python-gitlab-4.9.0 python-gitlab-4.9.0

 changelog                                                           |    7 +
 patches/0001-chore-upgrade-to-sphinx-8.2.1-and-resolve-issues.patch |   44 ++++++++++
 patches/series                                                      |    1 
 3 files changed, 52 insertions(+)

diff -Nru python-gitlab-4.9.0/debian/changelog python-gitlab-4.9.0/debian/changelog
--- python-gitlab-4.9.0/debian/changelog	2024-08-14 20:36:10.000000000 +0300
+++ python-gitlab-4.9.0/debian/changelog	2025-10-22 21:18:56.000000000 +0300
@@ -1,3 +1,10 @@
+python-gitlab (1:4.9.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport upstream fix for FTBFS with sphinx 8.2 (Closes: #1114305)
+
+ -- Adrian Bunk <[email protected]>  Wed, 22 Oct 2025 21:18:56 +0300
+
 python-gitlab (1:4.9.0-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru python-gitlab-4.9.0/debian/patches/0001-chore-upgrade-to-sphinx-8.2.1-and-resolve-issues.patch python-gitlab-4.9.0/debian/patches/0001-chore-upgrade-to-sphinx-8.2.1-and-resolve-issues.patch
--- python-gitlab-4.9.0/debian/patches/0001-chore-upgrade-to-sphinx-8.2.1-and-resolve-issues.patch	1970-01-01 02:00:00.000000000 +0200
+++ python-gitlab-4.9.0/debian/patches/0001-chore-upgrade-to-sphinx-8.2.1-and-resolve-issues.patch	2025-10-22 21:18:37.000000000 +0300
@@ -0,0 +1,44 @@
+From 6dd3518fb0fec2d2e60d9c5db5cce5af14a6037e Mon Sep 17 00:00:00 2001
+From: "John L. Villalovos" <[email protected]>
+Date: Sat, 1 Mar 2025 11:03:12 -0800
+Subject: chore: upgrade to sphinx 8.2.1 and resolve issues
+
+https://github.com/sphinx-doc/sphinx/commit/7ba762870f83175848ff1cd94a1b783ecde57f9a
+broke us.
+---
+ docs/ext/docstrings.py | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/docs/ext/docstrings.py b/docs/ext/docstrings.py
+index 4d8d02df..f71b68cd 100644
+--- a/docs/ext/docstrings.py
++++ b/docs/ext/docstrings.py
+@@ -1,9 +1,11 @@
+ import inspect
+ import os
++from typing import Sequence
+ 
+ import jinja2
+ import sphinx
+ import sphinx.ext.napoleon as napoleon
++from sphinx.config import _ConfigRebuild
+ from sphinx.ext.napoleon.docstring import GoogleDocstring
+ 
+ 
+@@ -20,9 +22,11 @@ def setup(app):
+     app.connect("autodoc-process-docstring", _process_docstring)
+     app.connect("autodoc-skip-member", napoleon._skip_member)
+ 
+-    conf = napoleon.Config._config_values
++    conf: Sequence[tuple[str, bool | None, _ConfigRebuild, set[type]]] = (
++        napoleon.Config._config_values
++    )
+ 
+-    for name, (default, rebuild) in conf.items():
++    for name, default, rebuild, _ in conf:
+         app.add_config_value(name, default, rebuild)
+     return {"version": sphinx.__display_version__, "parallel_read_safe": True}
+ 
+-- 
+2.30.2
+
diff -Nru python-gitlab-4.9.0/debian/patches/series python-gitlab-4.9.0/debian/patches/series
--- python-gitlab-4.9.0/debian/patches/series	2024-08-14 20:36:10.000000000 +0300
+++ python-gitlab-4.9.0/debian/patches/series	2025-10-22 21:18:56.000000000 +0300
@@ -3,3 +3,4 @@
 003-remove-theme.patch
 004-reproducible-doc.patch
 005-remove-privacy-breaches.patch
+0001-chore-upgrade-to-sphinx-8.2.1-and-resolve-issues.patch

Reply via email to