Hi Yogeswaran,
Glad you could reproduce the issue. I'm sending you the patch as the
corresponding commit formatted with `git format-patch`. It's a bit messy
since the branch I was working on also contained the commit I had made
for the 15.0.0 upstream release. If this is no good and you would like
it for me to submit it in any another way please tell me and I will
amend it accordingly.
Cheers,
Joaquin.
On 10/21/24 7:46 PM, Yogeswaran Umasankar wrote:
Got it! I was able to reproduce the issue after manually installing six
into the environment. Thanks Emmanuel.
Joaquin, if you prefer, feel free to email the patch.
Cheers!
--
Joaquín Torres
HPC Cluster SysAdmin
e-mail: joaquintor...@integra.cnea.gob.ar
Laboratorio de Simulación, Modelado y Diseño Computacional
Centro Atómico Constituyentes, Comisión Nacional de Energía Atómica
Av. Gral. Paz 1499, B1650 Villa Maipú
Provincia de Buenos Aires
From 0abc7f4ee46079d8ac3db689e5ffb79016c788d6 Mon Sep 17 00:00:00 2001
From: Joaquin Torres <joaquintor...@integra.cnea.gob.ar>
Date: Sat, 19 Oct 2024 18:42:42 +0000
Subject: [PATCH] d/patches/0001-Avoid-six-dependency-in-test_smoke.py.patch:
Add patches to fix six dependency (Closes: #1082245)
---
debian/changelog | 2 ++
...void-six-dependency-in-test_smoke.py.patch | 23 +++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 26 insertions(+)
create mode 100644 debian/patches/0001-Avoid-six-dependency-in-test_smoke.py.patch
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index 2c14e27..2fa9c3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
python-pdoc (15.0.0-1) UNRELEASED; urgency=medium
* New upstream version 15.0.0
+ * d/patches/0001-Avoid-six-dependency-in-test_smoke.py.patch: Add patches to
+ fix six dependency (Closes: #1082245)
-- Joaquin Torres <joaquintor...@integra.cnea.gob.ar> Sat, 19 Oct 2024 18:36:45 +0000
diff --git a/debian/patches/0001-Avoid-six-dependency-in-test_smoke.py.patch b/debian/patches/0001-Avoid-six-dependency-in-test_smoke.py.patch
new file mode 100644
index 0000000..1d01eec
--- /dev/null
+++ b/debian/patches/0001-Avoid-six-dependency-in-test_smoke.py.patch
@@ -0,0 +1,23 @@
+From: Joaquin Torres <joaquintor...@integra.cnea.gob.ar>
+Date: Sat, 19 Oct 2024 18:06:44 +0000
+Subject: Avoid six dependency in test_smoke.py
+
+As reported on https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1082245
+, upstream no longer uses tkinter.tix/six in their test environment.
+---
+ test/test_smoke.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test_smoke.py b/test/test_smoke.py
+index 60f1041..31c93a1 100644
+--- a/test/test_smoke.py
++++ b/test/test_smoke.py
+@@ -11,7 +11,7 @@ import pdoc
+ modules = [
+ m.name
+ for m in pkgutil.iter_modules()
+- if not m.name.startswith("_") and m.name not in ("test", "idlelib", "py")
++ if not m.name.startswith("_") and m.name not in ("test", "idlelib", "py", "six")
+ ]
+
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..074084e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Avoid-six-dependency-in-test_smoke.py.patch
--
2.47.0
