gnu: python-jupyter-client: Update to 7.2.2.

* gnu/packages/python-xyz.scm (python-jupyter-client-bootstrap): Make the base
package definition, moving most fields.  Update to 7.2.2.
[propagated-inputs]: Add python-entrypoints and python-nest-asyncio.
(python-jupyter-client): Inherit from python-jupyter-client-bootstrap,
adjusting accordingly.
[native-inputs]: Add python-pytest-asyncio.

gnu/packages/python-xyz.scm

@@ -9020,47 +9020,41 @@ without using the configuration machinery.")
      "Jupyter core is the base package on which Jupyter projects rely.")
     (license license:bsd-3)))
 
-(define-public python-jupyter-client
+;; Bootstrap variant of jupyter-client, which breaks the loop between ipykernel
+;; and jupyter-client by removing the former from its native-inputs and
+;; disabling tests.
+(define-public python-jupyter-client-bootstrap
+  (hidden-package
    (package
-    (name "python-jupyter-client")
+     (name "python-jupyter-client-bootstrap")
-    (version "6.1.12")
+     (version "7.2.2")
      (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "jupyter_client" version))
         (sha256
          (base32
-         "10p7fcgvv9hvz9zical9wk68ks5ssak2ykbzx65wm1k1hk8a3g64"))))
+          "12pbp177bfb3710y1a5598mwn8ffhyzmpll67m0nmalb98savnwg"))))
      (build-system python-build-system)
      (arguments
-     `(#:phases
+      (list
-       (modify-phases %standard-phases
+       #:tests? #f
+       #:phases
+       #~(modify-phases %standard-phases
            (add-after 'unpack 'set-tool-file-names
              (lambda* (#:key inputs #:allow-other-keys)
-             (let ((iproute (assoc-ref inputs "iproute")))
                (substitute* "jupyter_client/localinterfaces.py"
                  (("'ip'")
-                  (string-append "'" iproute "/sbin/ip'")))
+                  (format #f "'~a'" (search-input-file inputs "sbin/ip")))))))))
-               #t)))
+     (inputs (list iproute))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               ;; Some tests try to write to $HOME.
-               (setenv "HOME" "/tmp")
-               (invoke "pytest" "-vv")))))))
-    (inputs
-     `(("iproute" ,iproute)))
      (propagated-inputs
-     (list python-dateutil python-jupyter-core python-pyzmq
+      (list python-dateutil
-           python-tornado-6 python-traitlets))
+            python-entrypoints
-    (native-inputs
+            python-jupyter-core
-     `(("python-pytest" ,python-pytest)
+            python-nest-asyncio
-       ("python-pytest-timeout" ,python-pytest-timeout)
+            python-pyzmq
-       ("python-async-generator" ,python-async-generator)
+            python-tornado-6
-       ("python-mock" ,python-mock)
+            python-traitlets))
-       ("python-msgpack" ,python-msgpack)
-       ("python-ipython" ,python-ipython)
-       ("python-ipykernel" ,python-ipykernel-bootstrap)))
      (home-page "https://jupyter.org/")
      (synopsis "Jupyter protocol implementation and client libraries")
      (description
@@ -9068,21 +9062,33 @@ without using the configuration machinery.")
 of the Jupyter protocol.  It also provides client and kernel management APIs
 for working with kernels, and the @code{jupyter kernelspec} entrypoint for
 installing @code{kernelspec}s for use with Jupyter frontends.")
-    (license license:bsd-3)))
+     (license license:bsd-3))))
 
-;; Bootstrap variant of jupyter-client, which breaks the loop between ipykernel
+(define-public python-jupyter-client
-;; and jupyter-client by removing the former from its native-inputs and
+  (let ((base python-jupyter-client-bootstrap))
-;; disabling tests.
-(define-public python-jupyter-client-bootstrap
-  (let ((base python-jupyter-client))
-    (hidden-package
     (package
       (inherit base)
-        (name "python-jupyter-client-bootstrap")
+      (name "python-jupyter-client")
       (arguments
-          `(#:tests? #f
+       (substitute-keyword-arguments (package-arguments base)
-            ,@(package-arguments base)))
+         ((#:tests? _ #f)
-        (native-inputs `())))))
+          #t)
+         ((#:phases phases #~%standard-phases)
+          #~(modify-phases #$phases
+              (replace 'check
+                (lambda* (#:key tests? #:allow-other-keys)
+                  (when tests?
+                    ;; Some tests try to write to $HOME.
+                    (setenv "HOME" "/tmp")
+                    (invoke "pytest" "-vv"))))))))
+      (native-inputs
+       (list python-pytest
+             python-pytest-asyncio
+             python-pytest-timeout
+             python-async-generator
+             python-ipython
+             python-ipykernel-bootstrap))
+      (properties (alist-delete 'hidden? (package-properties base))))))
 
 (define-public python-ipykernel
   (package