229/246: gnu: python-bokeh: Fix build.

[guix-commits]

janneke pushed a commit to branch core-packages-team
in repository guix.

commit b149925a8fa9f32ea616fe432d25695f0e959739
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Sun Dec 15 22:26:24 2024 +0100

    gnu: python-bokeh: Fix build.
    
    * gnu/packages/python-xyz.scm (python-bokeh)[build-system]: Use
    pyproject-build-system.
    [arguments]: Use #:test-flags instead of a custom 'check phase; disable one
    more test.
    [native-inputs]: Add python-setuptools and python-wheel.
    
    Change-Id: I2aaa56ed578490de38685b10430535a819c2f5c5
---
 gnu/packages/python-xyz.scm | 124 +++++++++++++++++++++++---------------------
 1 file changed, 65 insertions(+), 59 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9ef95ad8f2..e19cbe4732 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -20059,65 +20059,69 @@ enhancements to optimization and data fitting 
problems.")
               (sha256
                (base32
                 "00sbhya9vfdv3yi07j6mxwx1x1h9497nhd3smdjrcdxgc48q0czg"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               ;; These require selenium.
-               (delete-file "tests/unit/bokeh/io/test_export.py")
-               (delete-file "tests/unit/bokeh/io/test_webdriver.py")
-               (delete-file "tests/unit/bokeh/embed/test_standalone.py")
-
-               ;; Doesn't find ManagedServerLoop fixture
-               (delete-file "tests/unit/bokeh/test_client_server.py")
-
-               ;; This fails because of the Guix wrapper around pytest
-               (delete-file "tests/unit/bokeh/io/test_util__io.py")
-
-               ;; Fixture ipython not found.
-               (delete-file 
"tests/unit/bokeh/application/handlers/test_notebook__handlers.py")
-               (delete-file 
"tests/unit/bokeh/command/subcommands/test_info.py")
-
-               ;; pd fixture not found.
-               (delete-file "tests/unit/bokeh/models/test_mappers.py")
-               (delete-file "tests/unit/bokeh/models/util/test_structure.py")
-               (delete-file "tests/unit/bokeh/plotting/test__plot.py")
-               (delete-file "tests/unit/bokeh/plotting/test__graph.py")
-               (delete-file "tests/unit/bokeh/plotting/test_figure.py")
-               (delete-file "tests/unit/bokeh/core/test_json_encoder.py")
-               (delete-file "tests/unit/bokeh/core/property/test_bases.py")
-               (delete-file "tests/unit/bokeh/core/property/test_container.py")
-               (delete-file "tests/unit/bokeh/core/property/test_dataspec.py")
-               (delete-file "tests/unit/bokeh/core/property/test_datetime.py")
-               (delete-file "tests/unit/bokeh/core/property/test_pandas.py")
-
-               ;; nx fixture not found.
-               (delete-file "tests/unit/bokeh/plotting/test_graph.py")
-               (delete-file "tests/unit/bokeh/models/test_graphs.py")
-               (delete-file "tests/unit/bokeh/io/test_showing.py")
-               (delete-file 
"tests/unit/bokeh/document/test_events__document.py")
-
-               ;; These tests need external sample data
-               (delete-file-recursively "tests/unit/bokeh/sampledata/")
-
-               ;; Attempts to install something via npm.
-               (delete-file "tests/unit/bokeh/test_ext.py")
-
-               ;; More failures due to set up problems.
-               (delete-file "tests/unit/bokeh/server/test_server__server.py")
-               (delete-file "tests/unit/bokeh/server/test_tornado__server.py")
-               (delete-file "tests/unit/bokeh/util/test_serialization.py")
-               (delete-file "tests/unit/bokeh/util/test_hex.py")
-               (delete-file "tests/unit/bokeh/models/test_sources.py")
-               (delete-file "tests/unit/bokeh/embed/test_bundle.py")
-
-               ;; XXX: This one test transforms a gif of a red box.  It
-               ;; transforms it all right but the base64 doesn't look as
-               ;; expected, probably because of a change in pillow.
-               (invoke "pytest" "-v" "-k" "not test_transform_PIL")))))))
+     (list
+      #:test-flags
+      '(list
+        ;; These require selenium.
+        "--ignore=tests/unit/bokeh/io/test_export.py"
+        "--ignore=tests/unit/bokeh/io/test_webdriver.py"
+        "--ignore=tests/unit/bokeh/embed/test_standalone.py"
+
+        ;; Doesn't find ManagedServerLoop fixture
+        "--ignore=tests/unit/bokeh/test_client_server.py"
+
+        ;; This fails because of the Guix wrapper around pytest
+        "--ignore=tests/unit/bokeh/io/test_util__io.py"
+
+        ;; Fixture ipython not found.
+        
"--ignore=tests/unit/bokeh/application/handlers/test_notebook__handlers.py"
+        "--ignore=tests/unit/bokeh/command/subcommands/test_info.py"
+
+        ;; pd fixture not found.
+        "--ignore=tests/unit/bokeh/models/test_mappers.py"
+        "--ignore=tests/unit/bokeh/models/util/test_structure.py"
+        "--ignore=tests/unit/bokeh/plotting/test__plot.py"
+        "--ignore=tests/unit/bokeh/plotting/test__graph.py"
+        "--ignore=tests/unit/bokeh/plotting/test_figure.py"
+        "--ignore=tests/unit/bokeh/core/test_json_encoder.py"
+        "--ignore=tests/unit/bokeh/core/property/test_bases.py"
+        "--ignore=tests/unit/bokeh/core/property/test_container.py"
+        "--ignore=tests/unit/bokeh/core/property/test_dataspec.py"
+        "--ignore=tests/unit/bokeh/core/property/test_datetime.py"
+        "--ignore=tests/unit/bokeh/core/property/test_pandas.py"
+
+        ;; nx fixture not found.
+        "--ignore=tests/unit/bokeh/plotting/test_graph.py"
+        "--ignore=tests/unit/bokeh/models/test_graphs.py"
+        "--ignore=tests/unit/bokeh/io/test_showing.py"
+        "--ignore=tests/unit/bokeh/document/test_events__document.py"
+
+        ;; These tests need external sample data
+        "--ignore-glob=tests/unit/bokeh/sampledata/*"
+
+        ;; Attempts to install something via npm.
+        "--ignore=tests/unit/bokeh/test_ext.py"
+
+        ;; More failures due to set up problems.
+        "--ignore=tests/unit/bokeh/server/test_server__server.py"
+        "--ignore=tests/unit/bokeh/server/test_tornado__server.py"
+        "--ignore=tests/unit/bokeh/util/test_serialization.py"
+        "--ignore=tests/unit/bokeh/util/test_hex.py"
+        "--ignore=tests/unit/bokeh/models/test_sources.py"
+        "--ignore=tests/unit/bokeh/embed/test_bundle.py"
+
+        "-k"
+        (string-append
+         ;; Fails with: 'called_once_with' is not a valid assertion. [...]
+         ;; Did you mean: 'assert_called_once_with'?
+         "not test_set_from_json"
+
+         ;; XXX: This one test transforms a gif of a red box.  It transforms
+         ;; it all right but the base64 doesn't look as expected, probably
+         ;; because of a change in pillow.
+         " and not test_transform_PIL"))))
     (propagated-inputs
      (list node-lts
            python-jinja2
@@ -20136,7 +20140,9 @@ enhancements to optimization and data fitting 
problems.")
            python-pandas
            python-pytest
            python-pytz
-           python-requests))
+           python-requests
+           python-setuptools
+           python-wheel))
     (home-page "https://github.com/bokeh/bokeh";)
     (synopsis "Interactive plots and applications in the browser from Python")
     (description