From 3ad5d0c98a6727bb0c90e22e74b33a2fa2669afd Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Mon, 28 Jul 2025 13:05:42 +0100
Subject: [PATCH] gnu: python-jupyter-core: Improve package.

* gnu/packages/python-xyz.scm (python-jupyter-core): Use
  G-expressions. Fix indentation.
  [arguments] <test-flags>: Skip test requiring python-pip; refactor
  with STRING-JOIN.
  [native-inputs]: Remove python-pip, python-pre-commit, and
  python-pytest-cov.

Change-Id: I677c0c7dd6e38fde126c5b69bd1b901999f8cfce
---
 gnu/packages/python-xyz.scm | 80 ++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 41 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7d9745bb855..01db53e9d57 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14484,53 +14484,51 @@ container data structures in Python).")
     (arguments
      (list
       #:test-flags
-      '(list "-k"
-             (string-append
-              ;; XXX: These tests fail with "ModuleNotFoundError: No
-              ;; module named 'jupyter_core'".
-              "not test_argv0"
-              " and not test_path_priority "
-              " and not test_not_on_path"
-
-              ;; These fail with: An incompatible sibling of 'AsyncTornadoApp'
-              ;; is already instantiated as singleton: SyncTornadoApp
-              " and not test_async_app"
-              " and not test_async_tornado_app"
-
-              ;; Fails with a deprecation warning
-              " and not test_sync_tornado_run"))
+      #~(list "-k" (string-join
+                    ;; XXX: These tests fail with "ModuleNotFoundError: No
+                    ;; module named 'jupyter_core'".
+                    (list "not test_argv0"
+                          "test_path_priority "
+                          "test_not_on_path"
+                          ;; These fail with: An incompatible sibling of
+                          ;; 'AsyncTornadoApp' is already instantiated as
+                          ;; singleton: SyncTornadoApp
+                          "test_async_app"
+                          "test_async_tornado_app"
+                          ;; Fails with a deprecation warning
+                          "test_sync_tornado_run"
+                          ;; Expecting pip in the PATH.
+                          "test_troubleshoot")
+                    " and not "))
       #:phases
-      '(modify-phases %standard-phases
-         (add-before 'check 'pre-check
-           ;;  Some tests write to $HOME.
-           (lambda _ (setenv "HOME" "/tmp")))
-         ;; Migration is running whenever etc/jupyter exists, but the
-         ;; Guix-managed directory will never contain any migratable IPython
-         ;; config files and cannot be written to anyway, so just pretend we
-         ;; already did that.
-         (add-after 'install 'disable-migration
-           (lambda* (#:key outputs #:allow-other-keys)
-             (mkdir-p (string-append (assoc-ref outputs "out") "/etc/jupyter"))
-             (invoke "touch"
-                     (string-append
-                      (assoc-ref outputs "out")
-                      "/etc/jupyter/migrated")))))))
-    (propagated-inputs (list python-platformdirs python-traitlets))
-    (native-inputs (list python-hatchling
-                         python-pip
-                         python-pre-commit
-                         python-pytest
-                         python-pytest-cov
-                         python-pytest-timeout))
+      #~(modify-phases %standard-phases
+          ;;  Some tests write to $HOME.
+          (add-before 'check 'pre-check
+            (lambda _ (setenv "HOME" "/tmp")))
+          ;; Migration is running whenever etc/jupyter exists, but the
+          ;; Guix-managed directory will never contain any migratable IPython
+          ;; config files and cannot be written to anyway, so just pretend we
+          ;; already did that.
+          (add-after 'install 'disable-migration
+            (lambda _
+              (mkdir-p (string-append #$output "/etc/jupyter"))
+              (invoke "touch" (string-append #$output "/etc/jupyter/migrated")))))))
+    (native-inputs
+     (list python-hatchling
+           python-pytest
+           python-pytest-timeout))
+    (propagated-inputs
+     (list python-platformdirs
+           python-traitlets))
     ;; This package provides the `jupyter` binary and thus also exports the
     ;; search paths.
     (native-search-paths
      (list (search-path-specification
-            (variable "JUPYTER_CONFIG_PATH")
-            (files '("etc/jupyter")))
+             (variable "JUPYTER_CONFIG_PATH")
+             (files '("etc/jupyter")))
            (search-path-specification
-            (variable "JUPYTER_PATH")
-            (files '("share/jupyter")))))
+             (variable "JUPYTER_PATH")
+             (files '("share/jupyter")))))
     (home-page "https://jupyter.org/")
     (synopsis "Jupyter base package")
     (description