3 files changed, 10 insertions(+), 50 deletions(-)

M gnu/local.mk
D gnu/packages/patches/python-pdoc3-tests.patch
M gnu/packages/python-xyz.scm

@@ 2125,7 2125,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch	\
   %D%/packages/patches/python-hiredis-use-system-hiredis.patch	\
   %D%/packages/patches/python-online-judge-api-client-tests.patch \
-  %D%/packages/patches/python-pdoc3-tests.patch			\
   %D%/packages/patches/python-peachpy-determinism.patch	\
   %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \
   %D%/packages/patches/python-piexif-fix-tests-with-pillow-7.2.patch	\

@@ 1,42 0,0 @@
-Taken from upstream: https://github.com/pdoc3/pdoc/commit/4aa70de2221a34a3003a7e5f52a9b91965f0e359.patch.
-
-From 4aa70de2221a34a3003a7e5f52a9b91965f0e359 Mon Sep 17 00:00:00 2001
-From: Spencer Baugh <sbaugh@catern.com>
-Date: Thu, 23 Sep 2021 09:00:25 -0400
-Subject: [PATCH] TST: use explicit ClassWithNew instead of typing.Generic
-
-typing.Generic doesn't have a __new__ method in 3.9.
-
-Fixes https://github.com/pdoc3/pdoc/issues/355
----
- pdoc/test/__init__.py | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/pdoc/test/__init__.py b/pdoc/test/__init__.py
-index e8c3d94..8b67ab7 100644
---- a/pdoc/test/__init__.py
-+++ b/pdoc/test/__init__.py
-@@ -1043,16 +1043,20 @@ class C2:
- 
-         self.assertEqual(pdoc.Class('C2', mod, C2).params(), ['a', 'b', 'c=None', '*', 'd=1', 'e'])
- 
--        class G(typing.Generic[T]):
-+        class ClassWithNew:
-+            def __new__(self, arg):
-+                pass
-+
-+        class G(ClassWithNew):
-             def __init__(self, a, b, c=100):
-                 pass
- 
-         self.assertEqual(pdoc.Class('G', mod, G).params(), ['a', 'b', 'c=100'])
- 
--        class G2(typing.Generic[T]):
-+        class G2(ClassWithNew):
-             pass
- 
--        self.assertEqual(pdoc.Class('G2', mod, G2).params(), ['*args', '**kwds'])
-+        self.assertEqual(pdoc.Class('G2', mod, G2).params(), ['arg'])
- 
-     def test_url(self):
-         mod = pdoc.Module(EXAMPLE_MODULE)

@@ 38062,19 38062,22 @@ keyboard-friendly package.")
 (define-public python-pdoc3
   (package
     (name "python-pdoc3")
-    (version "0.10.0")
+    (version "0.11.6")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pdoc3" version))
        (sha256
-        (base32 "1dz4hw10ngidzg9cjvflc8nlrwrjbb3ijhmaw4w6f039p6yff8jz"))
-       (patches
-        (search-patches "python-pdoc3-tests.patch"))))
-    (build-system python-build-system)
+        (base32 "11z318lnvd7nxkpw2556hh6hvid6gi8mxgv4zf8x2m57hx5yi98y"))))
+    (build-system pyproject-build-system)
     (native-inputs
-     (list python-setuptools-git python-setuptools-scm))
-    (propagated-inputs (list python-mako python-markdown))
+     (list python-setuptools-git
+           python-setuptools
+           python-setuptools-scm
+           python-wheel))
+    (propagated-inputs
+     (list python-mako
+           python-markdown))
     (home-page "https://pdoc3.github.io/pdoc/")
     (synopsis "Auto-generate API documentation for Python projects")
     (description