From patchwork Tue Jan 23 11:53:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 59341 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 BD0A627BBEA; Tue, 23 Jan 2024 11:54:24 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=ham 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 B059127BBE2 for ; Tue, 23 Jan 2024 11:54:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSFLv-000825-HP; Tue, 23 Jan 2024 06:54:03 -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 1rSFLt-00081S-7A for guix-patches@gnu.org; Tue, 23 Jan 2024 06:54:01 -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 1rSFLs-0004ja-Ub; Tue, 23 Jan 2024 06:54:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSFLu-000133-F6; Tue, 23 Jan 2024 06:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68672] [PATCH 1/2] gnu: python-trimesh: Update to 4.0.10. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Tue, 23 Jan 2024 11:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68672 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68672@debbugs.gnu.org Cc: Sharlatan Hellseher , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , jgart Received: via spool by 68672-submit@debbugs.gnu.org id=B68672.17060108083979 (code B ref 68672); Tue, 23 Jan 2024 11:54:02 +0000 Received: (at 68672) by debbugs.gnu.org; 23 Jan 2024 11:53:28 +0000 Received: from localhost ([127.0.0.1]:42355 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSFLM-000126-4T for submit@debbugs.gnu.org; Tue, 23 Jan 2024 06:53:28 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:51288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSFLJ-00011h-Na for 68672@debbugs.gnu.org; Tue, 23 Jan 2024 06:53:26 -0500 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3368abe1093so3541151f8f.2 for <68672@debbugs.gnu.org>; Tue, 23 Jan 2024 03:53:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706010795; x=1706615595; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KQNduBsvj9BCwYIXHurmNx+RiYDFQknfAP3f8h7gMLE=; b=FU/suKqB71cyH/OaTdgBmGIcAPHADGPdCqseyPlUPGIHlir/Fgk78lbRcMlbK5tYAk EBCMTG+DWzawh+Nb0qGKMMlr/IAXX1KGZBrVvlC5o4iblsisgJhBZGpEx60zDccH2YdZ rUhmtdU6h3lDx8PtY8+eg19YHkM6kS0GRCIqw0sLejrq7NjEqMZK+6G70EPdca+WC1oW Jlkl0bu1J+WDKLLs6N6MumlP/wv9QIbjMx6ot8DtPC/Jl9dYRRWSBe4p+BYCIb9hEw5x yqCRTHxyBqPNHvHd5K9z87Dyx3RzsN0UP29QoTGci5TnoABHXtqOL7KJ6yU+VUzwwm5z AElA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706010795; x=1706615595; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KQNduBsvj9BCwYIXHurmNx+RiYDFQknfAP3f8h7gMLE=; b=ws/wWMyOl4K2ULVxVM0/dZDQXtiinAcOpU/Sc/aPFMc5zSiHDA3GAoI4XEOhMherQN 6+jjDX7NoXCGMQLX5s+6aUs7jkDi0mlGK77ylul37v3EuPz+SobtruJgmxSJ5Pd4KCp1 LFq2HbtHhZWA5aPrf3SkOcGfUYPdH5s0BMO7ulws+pv0njijZ6r3wq9UL5iLG/yGalm9 xdcW724z+XWj8g2V/oSpTqjoC6NdrF4pmjy7QKx6pI2oy97uZQhOzpWgAeZ/ICOX1EpI Pi9nhRWfEw7ri42HAVa8E3h5239fJTauVijvu2O0XDMvDqP65W3ad1VdcI6dikg/8SnK 0Smg== X-Gm-Message-State: AOJu0YwbvODLqH06A9t8C4wMxg702KGwcKZ/CwL9zhfcG4Wwj9OWcgCh CLBfFdKcEhLOUEBtHQQXjBs5srBVq6gYuWGm2b3TZQyKuFC7as/ezg6mv9L4lOk= X-Google-Smtp-Source: AGHT+IHNq9M+3CkrpyF6xe91sXt8j+mE1L3tgdryRofEhD6NmAW9UVZIBhIb13rbKgGQsl7fj0JgdQ== X-Received: by 2002:a05:6000:1089:b0:336:dd9a:b8a3 with SMTP id y9-20020a056000108900b00336dd9ab8a3mr3612252wrw.74.1706010794942; Tue, 23 Jan 2024 03:53:14 -0800 (PST) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id h5-20020adf9cc5000000b003368849129dsm16069129wre.15.2024.01.23.03.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 03:53:14 -0800 (PST) From: Sharlatan Hellseher Date: Tue, 23 Jan 2024 11:53:11 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: , 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-trimesh): Update to 4.0.10. [build-system]: Swap to pyproject-build-system. Change-Id: I757b4c27db9969d42021434883a057debbbc83fd --- gnu/packages/python-science.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index ef65ed537a..7212cafe16 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -393,14 +393,14 @@ (define-public python-tdda (define-public python-trimesh (package (name "python-trimesh") - (version "3.23.5") + (version "4.0.10") (source (origin (method url-fetch) (uri (pypi-uri "trimesh" version)) (sha256 - (base32 "08967axlnmfv98n05dhrkynyrmcc814hl8184gzzmcy4rjg6dzdx")))) - (build-system python-build-system) + (base32 "1p3cnkajh2zmp6zwn23q3c73jcjlkq61h3r53ys0bmg58l8kpqrn")))) + (build-system pyproject-build-system) (propagated-inputs (list python-numpy)) (native-inputs From patchwork Tue Jan 23 11:53:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 59340 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 9EB4F27BBEA; Tue, 23 Jan 2024 11:54:16 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=ham 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 4649027BBE2 for ; Tue, 23 Jan 2024 11:54:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSFLu-00081e-9L; Tue, 23 Jan 2024 06:54:02 -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 1rSFLs-00081K-4I for guix-patches@gnu.org; Tue, 23 Jan 2024 06:54:00 -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 1rSFLr-0004jQ-Rs; Tue, 23 Jan 2024 06:53:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSFLu-000139-UO; Tue, 23 Jan 2024 06:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68672] [PATCH 2/2] gnu: python-trimesh: Enable tests. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Tue, 23 Jan 2024 11:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68672 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68672@debbugs.gnu.org Cc: Sharlatan Hellseher , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , jgart Received: via spool by 68672-submit@debbugs.gnu.org id=B68672.17060108083986 (code B ref 68672); Tue, 23 Jan 2024 11:54:02 +0000 Received: (at 68672) by debbugs.gnu.org; 23 Jan 2024 11:53:28 +0000 Received: from localhost ([127.0.0.1]:42357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSFLM-000128-DQ for submit@debbugs.gnu.org; Tue, 23 Jan 2024 06:53:28 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:53647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSFLL-00011l-1q for 68672@debbugs.gnu.org; Tue, 23 Jan 2024 06:53:27 -0500 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-337d05b8942so4843170f8f.3 for <68672@debbugs.gnu.org>; Tue, 23 Jan 2024 03:53:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706010796; x=1706615596; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Yqd7H/Qe4VcNnG5xbTMQekiyS83bdDRweJBKZqyeTRQ=; b=a1m2Pye/5OyAqkmS6+vwxtPy+D385d1KpYXyCtXt+oK494Mf4Hh2/P9KVx/Yvz79e7 ZHD3ry+/a1BiAFRGkOw0yHd/d05EWUGm/XqNEM7nZWSpiP83OWs80b07Ws2zyx2G2po0 llJOnVQo5i84MYJRijEXlpcmfExaWasWjOufWnHo75qjgGjjmjYrvbwvbleTLeR2csWI SxX8+Mqjun4q6nPFkoLe2ZnP6rVfehPyJO04vos+wF5cIE7hkp4F2GVnUtJmx0tLpBBx /3epoxxX2e1Ew5r76/+mULoNyj+QETeCbiXkSw48Xygwjd2FnJZ3Llww+99ULHBJhm4t H5ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706010796; x=1706615596; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Yqd7H/Qe4VcNnG5xbTMQekiyS83bdDRweJBKZqyeTRQ=; b=sHo65135sR50IdtEQhZMjniWx9DadCbMl320LV4VZwCBQ93NLt1DklZ5hDlVn69MtJ DJ9zga53rXDOUpJqMv6B31TCU+SR3ldvCnyuJRr9tYzD3rMKDcbYA15SwDdKCj5FTIii 6hCinQE34d17ZFk5q1Y8G1SAzpStjxfPICV067osZbPN1I7bjH37jblZhUDMOBKJNWKP PFfdBBNLg/kFgkxK5HGFE1uXhjERmbKftP2HZWkmXI2e75f1ocDDijShLDdEIft9Ego3 IJfTWoqV7RIyxcPhuKWBTYuhEB3IC7JWSm3LzSMDzxBbmoCw3HMsdz4dRGTYtxsJWsaI rxrw== X-Gm-Message-State: AOJu0YzyQIOZJirQgIA4h8byRyMAIrAZSdT1fJ0tuBBL5Emz4SWs/pBT /p2ic2xfBZyHv/rglGTjUzPI26ERpRTTZWtQDjL9qWFd/jFESunaH33Jh9kx2KU= X-Google-Smtp-Source: AGHT+IGxyGiNAJxLU07FPmrr/nROxvX/nSKqEbZGfaHaHFoJ25RoLt2AnGqfQf4hiT3ifJLS2+ovxQ== X-Received: by 2002:a5d:40c4:0:b0:339:48da:a15 with SMTP id b4-20020a5d40c4000000b0033948da0a15mr220053wrq.76.1706010796389; Tue, 23 Jan 2024 03:53:16 -0800 (PST) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id h5-20020adf9cc5000000b003368849129dsm16069129wre.15.2024.01.23.03.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 03:53:16 -0800 (PST) From: Sharlatan Hellseher Date: Tue, 23 Jan 2024 11:53:12 +0000 Message-ID: <0d36a93b30f85ad0e77ce00ab5b480b53e830a1a.1706010234.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: , 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-trimesh): Enable tests and apply new package style. [source]: Use git checkout which has working test suit. [arguments]<#:test-flags>: Disable tests requiring optional Python modules. [propagated-inputs]: Add python-chardet, python-colorlog python-httpx python-jsonschema python-lxml python-networkx python-pillow python-requests python-rtree python-scipy python-setuptools python-shapely python-sympy and python-xxhash. Change-Id: I1aa363053c2d736bc44b8f9071c637256cc2d952 --- gnu/packages/python-science.scm | 68 +++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 15 deletions(-) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 7212cafe16..50b59b7daa 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -50,6 +50,7 @@ (define-module (gnu packages python-science) #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages databases) + #:use-module (gnu packages digest) #:use-module (gnu packages gcc) #:use-module (gnu packages geo) #:use-module (gnu packages image) @@ -396,28 +397,65 @@ (define-public python-trimesh (version "4.0.10") (source (origin - (method url-fetch) - (uri (pypi-uri "trimesh" version)) + (method git-fetch) ; no tests in PyPI + (uri (git-reference + (url "https://github.com/mikedh/trimesh") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1p3cnkajh2zmp6zwn23q3c73jcjlkq61h3r53ys0bmg58l8kpqrn")))) + (base32 "0ry04qaw0pb3hkxv4gmna87jwk97aqangd21wbr2dr4xshmkbyyb")))) (build-system pyproject-build-system) - (propagated-inputs - (list python-numpy)) + (arguments + (list + #:test-flags + #~(list "-k" (string-append + ;; XXX: When more optional modules are available review + ;; disabled tests once again. + ;; + ;; Disable tests requiring optional, not packed modules. + "not test_material_round" + " and not test_bezier_example" + " and not test_discrete" + " and not test_dxf" + " and not test_layer" + " and not test_multi_nodupe" + " and not test_obj_roundtrip" + " and not test_roundtrip" + " and not test_scene" + " and not test_slice_onplane" + " and not test_svg" + " and not test_svg")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-build + (lambda _ + (substitute* "trimesh/resources/templates/blender_boolean.py.tmpl" + (("\\$MESH_PRE") + "'$MESH_PRE'"))))))) (native-inputs (list python-coveralls python-pyinstrument python-pytest python-pytest-cov)) - (arguments - `(;; TODO: Get tests to work. - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-build - (lambda _ - (substitute* "trimesh/resources/templates/blender_boolean.py.tmpl" - (("\\$MESH_PRE") - "'$MESH_PRE'"))))))) + (propagated-inputs + (list python-chardet + python-colorlog + python-httpx + python-jsonschema + python-lxml + python-networkx + python-numpy + python-pillow + ;; python-pycollada ; not packed yet, optional + ;; python-pyglet ; not packed yet, optional + python-requests + python-rtree + python-scipy + python-setuptools + python-shapely + ;; python-svg-path ; not packed yet, optional + python-sympy + python-xxhash)) (home-page "https://github.com/mikedh/trimesh") (synopsis "Python library for loading and using triangular meshes") (description