3 files changed, 5 insertions(+), 38 deletions(-)

M gnu/local.mk
M gnu/packages/graphviz.scm
D gnu/packages/patches/python-uqbar-python3.10.patch

@@ 1954,7 1954,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-sphobjinv-defer-ssl-import.patch	\
   %D%/packages/patches/python-sphinx-prompt-docutils-0.19.patch	\
   %D%/packages/patches/python-typeguard-python3.10.patch	\
-  %D%/packages/patches/python-uqbar-python3.10.patch	        \
   %D%/packages/patches/python-wxwidgets-type-errors.patch	\
   %D%/packages/patches/qtdeclarative-5-disable-qmlcache.patch	\
   %D%/packages/patches/qtdeclarative-disable-qmlcache.patch	\

@@ 201,7 201,7 @@ structure and layout algorithms.")
 (define-public python-uqbar
   (package
     (name "python-uqbar")
-    (version "0.5.9")
+    (version "0.6.9")
     (source
      (origin
        (method git-fetch)


@@ 210,20 210,11 @@ structure and layout algorithms.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0c573nzpm51qgz2g296f8pw8ys0i3r6daynxk06zagk5l5fgw9ar"))
-       (patches (search-patches "python-uqbar-python3.10.patch"))))
+        (base32 "037qj3rymm6xzdpklddfhmfp2p1bq9fi3jrvxj6gmharphd5z869"))))
     (build-system pyproject-build-system)
-    (arguments
-     (list #:test-flags
-           '(list "tests"
-                  "-k" (string-append
-                        "not test_interpret_code_blocks_02 "
-                        "and not test_find_executable "
-                        "and not test_sphinx_api_1 "
-                        "and not test_sphinx_book_text_cached "
-                        "and not test_sphinx_book_text_uncached "
-                        "and not test_sphinx_book_text_broken_strict"))))
+    (arguments  ; XXX: Disable failing tests.
+     (list #:test-flags '(list "tests" "-k" "not test_find_executable \
+and not test_sphinx_book_text_broken_strict")))
     (native-inputs
      (list graphviz
            python-flake8

@@ 1,23 0,0 @@
-Since Python 3.10 the output of a CLI program created with argparse
-uses "options" instead of "optional arguments". This behaviour breaks
-the tests in python-uqbar.
-
---- a/tests/test_cli.py
-+++ b/tests/test_cli.py
-@@ -84,7 +84,7 @@ def test_call_help():
- 
-         speak like a cat
- 
--        optional arguments:
-+        options:
-           -h, --help  show this help message and exit
-           --version   show program's version number and exit
-           --loud      be adamant
-@@ -101,6 +101,6 @@ def test_help():
-         """
-         usage: vox-aggregator [-h] [--version] {help,list,birds,mammals} ...
- 
--        optional arguments:
-+        options:
-           -h, --help            show this help message and exit
-           --version             show program's version number and exit