From patchwork Thu Dec 19 15:57:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 35046 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5FCEC27BBE9; Thu, 19 Dec 2024 16:07:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CC8E127BBE2 for ; Thu, 19 Dec 2024 16:07:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOJ36-0008Q5-2K; Thu, 19 Dec 2024 11:06:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tOIud-0007Pw-D8 for guix-patches@gnu.org; Thu, 19 Dec 2024 10:58:07 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tOIud-0007kw-30; Thu, 19 Dec 2024 10:58:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=References:Mime-Version:Date:From:To:Subject; bh=ekEO5Paqa438ttOjEnKtk3ESoCgIFLJj2+wnuH7qeQQ=; b=mJWjD9TEmxIcRyNjIsWqlgHG0NYPM1GTUOkLtQhNOygxfr8Mjx5K/VXlSpEYDLTo1P03F2v7DMbh6yvHCbL8TY+pH2d0q96czYZY3Bsoba3V0mdygOIz6RMg0fn7NGui0UXM9sNZascEEhDylkteuGEjTbLMjp5gMr4P7Qggfr5wHUcDB3GBEvBJbN9nHGscPEAgPHIquaXIZPElOMGcTp5U1MEcQBw7VUnH2XiJdLhIVNvq/VCNL4s+kMCSxM0hrnKMZ0L5u91kbh9qru5AbCKDBbDhviRvssAsURV6RGgeoTm5G4RxPg9GCRRtSKDDC1w4wCfHVbcUUnWOScrVDQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOIuY-00075W-An; Thu, 19 Dec 2024 10:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74974] [PATCH] gnu: python-pyvista: Update to 0.44.2. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Thu, 19 Dec 2024 15:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74974 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74974@debbugs.gnu.org Cc: reza , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by submit@debbugs.gnu.org id=B.173462384927201 (code B ref -1); Thu, 19 Dec 2024 15:58:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Dec 2024 15:57:29 +0000 Received: from localhost ([127.0.0.1]:39757 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOIu0-00074e-Iw for submit@debbugs.gnu.org; Thu, 19 Dec 2024 10:57:29 -0500 Received: from lists.gnu.org ([209.51.188.17]:41894) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <01020193dfa340c5-5d9be2f8-5b55-40a2-be94-02f31f7d3cc0-000000@mail.housseini.me>) id 1tOItx-00074U-By for submit@debbugs.gnu.org; Thu, 19 Dec 2024 10:57:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <01020193dfa340c5-5d9be2f8-5b55-40a2-be94-02f31f7d3cc0-000000@mail.housseini.me>) id 1tOItw-0007Nq-F7 for guix-patches@gnu.org; Thu, 19 Dec 2024 10:57:24 -0500 Received: from a2-94.smtp-out.eu-west-1.amazonses.com ([54.240.2.94]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.90_1) (envelope-from <01020193dfa340c5-5d9be2f8-5b55-40a2-be94-02f31f7d3cc0-000000@mail.housseini.me>) id 1tOItu-0007h8-5V for guix-patches@gnu.org; Thu, 19 Dec 2024 10:57:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=tsl3ypnlx3orlf3fv2rkjjc5b3u22mve; d=housseini.me; t=1734623838; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id; bh=5ugufU2n7lOkF+Rek2T6Lr4rVOfiM+dDNWFf4wVHl0c=; b=WozmhmsaeSyfR6Jf2LqL51TiLrMPkMuJIeyCk+VKSoy1xeaHNw3nCrnYGYZ2r1Ar IBBWUSjLqPH6CB0LDsSDUhlq0DwmhLSJY+SlqIB5F0qZMJL1qBzAxqYtJvFJbCp94rQ HF0DqjFneia2KWzka93GIkdt9tdV6jow7/8MxbRY= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=uku4taia5b5tsbglxyj6zym32efj7xqv; d=amazonses.com; t=1734623838; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id:Feedback-ID; bh=5ugufU2n7lOkF+Rek2T6Lr4rVOfiM+dDNWFf4wVHl0c=; b=CxluR9hBMkyUVeQTgQxl1z0Yp/uN87z5/jwQfD5VNWPr/nO7fjU3+3dSgbgbiRQj xQsHCf//oWIMkuKqwdLqdgCY9V5L8EGy7sU2zDD/8wlV1zX7My2fT/1mOKGOzCxuWLx CGJKedNjgw63DxObJskzi0DNyZQqA/A+ywM1kW1U= Date: Thu, 19 Dec 2024 15:57:18 +0000 Mime-Version: 1.0 References: X-Mailer: Amazon WorkMail Thread-Index: AQHbUi6t1j+RxePeQ2GSYxVOo0AgKQ== Thread-Topic: [PATCH] gnu: python-pyvista: Update to 0.44.2. X-Wm-Sent-Timestamp: 1734623837 X-Original-Mailer: git-send-email 2.46.0 Message-ID: <01020193dfa340c5-5d9be2f8-5b55-40a2-be94-02f31f7d3cc0-000000@eu-west-1.amazonses.com> Feedback-ID: ::1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2024.12.19-54.240.2.94 Received-SPF: pass client-ip=54.240.2.94; envelope-from=01020193dfa340c5-5d9be2f8-5b55-40a2-be94-02f31f7d3cc0-000000@mail.housseini.me; helo=a2-94.smtp-out.eu-west-1.amazonses.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: reza X-ACL-Warn: , reza via Guix-patches X-Patchwork-Original-From: reza via Guix-patches via From: reza Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-science.scm (python-pyvista): Update to 0.44.2 [origin]: Update to 0.44.2 [build-system]: Change to pyproject-build-system. [native-inputs]: Add native-inputs for testing. [modify-phases]: Enable sanity-check and check phase, disable failing tests and vtk dependency check and redirect $HOME variable. Change-Id: I4293e99be12d096e639e47b8066116ba519909a8 --- gnu/packages/python-science.scm | 133 +++++++++++++++++++++++++++++--- 1 file changed, 121 insertions(+), 12 deletions(-) base-commit: 20b1613484f512649f919d89285e981998592497 -- 2.46.0 diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index fe146717ce..5326284ce4 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -2759,10 +2759,8 @@ (define-public python-plotnine (define-public python-pyvista (package (name "python-pyvista") - (version "0.42.3") + (version "0.44.2") (source - ;; The PyPI tarball does not contain the tests. - ;; (However, we don't yet actually run the tests.) (origin (method git-fetch) (uri (git-reference @@ -2770,8 +2768,8 @@ (define-public python-pyvista (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1qxq0y0hc72hb60w3qq48fma8l6ffz7bdm75ymn1020bvfqrm1s4")))) - (build-system python-build-system) + (base32 "0lnh4cvf6wld7hm293015d80ny0vnsk96ckfvc2crzd1b79ch1v5")))) + (build-system pyproject-build-system) (propagated-inputs (list python-imageio python-matplotlib @@ -2781,16 +2779,127 @@ (define-public python-pyvista python-pooch python-scooby vtk)) + ;; packages needed for testing + (native-inputs (list python-pytest + python-scipy + python-ipython + python-trimesh + python-tqdm)) (arguments '(#:phases (modify-phases %standard-phases - ;; Disable tests for now because they require several modules - ;; currently unpackaged in Guix. - (delete 'check) - ;; Disable the sanity check, which fails with the following error: - ;; - ;; ...checking requirements: ERROR: pyvista==0.42.3 DistributionNotFound(Requirement.parse('vtk'), {'pyvista'}) - (delete 'sanity-check)))) + ;; vtk check fails in sanity-check, comment out + (add-after 'unpack 'patch-pyproject + (lambda _ + (substitute* "pyproject.toml" + (("'vtk<9\\.4\\.0'," all) (string-append "#" all))))) + (add-after 'unpack 'fix-failing-tests + (lambda _ + (rename-file "tests/plotting/test_charts.py" "tests/plotting/_test_charts.py") + (rename-file "tests/examples/test_download_files.py" "tests/examples/_test_download_files.py") + (rename-file "tests/examples/test_downloads.py" "tests/examples/_test_downloads.py") + (rename-file "tests/plotting/test_texture.py" "tests/plotting/_test_texture.py") + (substitute* "tests/plotting/test_plotting.py" + (("\"\"\"Determine if using mesa.\"\"\"" all) + (string-append all "\n return False"))) + (substitute* "tests/test_meshio.py" + (("cow = .*$" all) (string-append "#" all "\n")) + ((", cow") "")) + (substitute* "tests/core/test_dataset.py" + (("test_partition") "_test_partition")) + (substitute* "tests/core/test_composite.py" + (("test_ensight_multi_block_io") "_test_ensight_multi_block_io")) + (substitute* "tests/core/test_dataset_filters.py" + (("test_connectivity_.*$" all) (string-append "_" all)) + (("test_compute_boundary_mesh_quality") "_test_compute_boundary_mesh_quality")) + (substitute* "tests/core/test_polydata_filters.py" + (("test_protein_ribbon") "_test_protein_ribbon")) + (substitute* "tests/core/test_validation.py" + (("test_cast_to_numpy_raises") "_test_cast_to_numpy_raises")) + (substitute* "tests/plotting/test_actor.py" + (("test_actor_texture") "_test_actor_texture")) + (substitute* "tests/plotting/test_lookup_table.py" + (("test_init_cmap") "_test_init_cmap") + (("test_repr") "_test_repr")) + (substitute* "tests/plotting/test_plotter.py" + (("test_add_multiple") "_test_add_multiple") + (("test_plot_return_img_without_cpos") "_test_plot_return_img_without_cpos") + (("test_plot_return_img_with_cpos") "_test_plot_return_img_with_cpos") + (("test_only_screenshots_flag") "_test_only_screenshots_flag")) + (substitute* "tests/plotting/test_plotting_utilities.py" + (("test_gif_reader") "_test_gif_reader")) + (substitute* "tests/plotting/test_render_window_interactor.py" + (("test_timer") "_test_timer") + (("test_add_timer_event") "_test_add_timer_event") + (("test_interpolate") "_test_interpolate")) + (substitute* "tests/plotting/test_renderer.py" + (("test_legend_.*$" all) (string-append "_" all))) + (substitute* "tests/plotting/test_theme.py" + (("test_box_axes") "_test_box_axes") + (("test_load_theme") "_test_load_theme") + (("test_save_before_close_callback") "_test_save_before_close_callback") + (("test_user_logo") "_test_user_logo")) + (substitute* "tests/core/test_geometric_sources.py" + (("test_translate_direction_collinear") "_test_translate_direction_collinear")) + (substitute* "tests/examples/test_dataset_loader.py" + (("test_dataset_loader_one_file") "_test_dataset_loader_one_file") + (("test_dataset_loader_two_files_one_loadable") "_test_dataset_loader_two_files_one_loadable") + (("test_dataset_loader_two_files_both_loadable") "_test_dataset_loader_two_files_both_loadable") + (("test_dataset_loader_cubemap") "_test_dataset_loader_cubemap") + (("test_dataset_loader_dicom") "_test_dataset_loader_dicom") + (("test_dataset_loader_from_nested_files_and_directory") "_test_dataset_loader_from_nested_files_and_directory") + (("test_dataset_loader_from_nested_multiblock") "_test_dataset_loader_from_nested_multiblock") + (("test_load_dataset_no_reader") "_test_load_dataset_no_reader")) + (substitute* "tests/core/test_reader.py" + (("test_ensightreader_arrays") "_test_ensightreader_arrays") + (("test_ensightreader_timepoints") "_test_ensightreader_timepoints") + (("test_ensightreader_time_sets") "_test_ensightreader_time_sets") + (("test_dcmreader") "_test_dcmreader") + (("test_objreader") "_test_objreader") + (("test_stlreader") "_test_stlreader") + (("test_tecplotreader") "_test_tecplotreader") + (("test_byureader") "_test_byureader") + (("test_facetreader") "_test_facetreader") + (("test_plot3dmetareader") "_test_plot3dmetareader") + (("test_multiblockplot3dreader") "_test_multiblockplot3dreader") + (("test_binarymarchingcubesreader") "_test_binarymarchingcubesreader") + (("test_pvdreader") "_test_pvdreader") + (("test_pvdreader_no_time_group") "_test_pvdreader_no_time_group") + (("test_pvdreader_no_part_group") "_test_pvdreader_no_part_group") + (("test_openfoamreader_arrays_time") "_test_openfoamreader_arrays_time") + (("test_openfoamreader_active_time") "_test_openfoamreader_active_time") + (("test_openfoamreader_read_data_time_value") "_test_openfoamreader_read_data_time_value") + (("test_openfoamreader_read_data_time_point") "_test_openfoamreader_read_data_time_point") + (("test_openfoam_skip_zero_time") "_test_openfoam_skip_zero_time") + (("test_openfoam_cell_to_point_default") "_test_openfoam_cell_to_point_default") + (("test_openfoam_patch_arrays") "_test_openfoam_patch_arrays") + (("test_openfoam_case_type") "_test_openfoam_case_type") + (("test_read_cgns") "_test_read_cgns") + (("test_bmpreader") "_test_bmpreader") + (("test_demreader") "_test_demreader") + (("test_jpegreader") "_test_jpegreader") + (("test_meta_image_reader") "_test_meta_image_reader") + (("test_nifti_reader") "_test_nifti_reader") + (("test_nrrd_reader") "_test_nrrd_reader") + (("test_png_reader") "_test_png_reader") + (("test_pnm_reader") "_test_pnm_reader") + (("test_slc_reader") "_test_slc_reader") + (("test_tiff_reader") "_test_tiff_reader") + (("test_hdr_reader") "_test_hdr_reader") + (("test_avsucd_reader") "_test_avsucd_reader") + (("test_hdf_reader") "_test_hdf_reader") + (("test_xdmf_reader") "_test_xdmf_reader") + (("test_fluentcffreader") "_test_fluentcffreader") + (("test_gambitreader") "_test_gambitreader") + (("test_gaussian_cubes_reader") "_test_gaussian_cubes_reader") + (("test_gesignareader") "_test_gesignareader") + (("test_pdbreader") "_test_pdbreader") + (("test_particle_reader") "_test_particle_reader") + (("test_prostar_reader") "_test_prostar_reader")))) + ;; test phase writes files to $HOME + (add-before 'check 'redirect-HOME + (lambda _ + (setenv "HOME" "/tmp")))))) (home-page "https://docs.pyvista.org/") (synopsis "3D plotting and mesh analysis through VTK") (description