From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 4M9GHVYr6GIEtAAAbAwnHQ (envelope-from ) for ; Mon, 01 Aug 2022 21:36:54 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id oIBUHFYr6GJaZQEAG6o9tA (envelope-from ) for ; Mon, 01 Aug 2022 21:36:54 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1436340291 for ; Mon, 1 Aug 2022 21:36:54 +0200 (CEST) Received: from localhost ([::1]:39510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oIbDh-0005qW-5R for larch@yhetil.org; Mon, 01 Aug 2022 15:36:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIbCt-0005qK-6C for guix-patches@gnu.org; Mon, 01 Aug 2022 15:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51921) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oIbCs-0007Pa-FW for guix-patches@gnu.org; Mon, 01 Aug 2022 15:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oIbCs-0007Y5-8T for guix-patches@gnu.org; Mon, 01 Aug 2022 15:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56186] [PATCH] gnu: Update python-deepdish package definition. References: <20220624125033.5605-1-antero@mailbox.org> In-Reply-To: <20220624125033.5605-1-antero@mailbox.org> Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Aug 2022 19:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56186@debbugs.gnu.org Cc: Antero Mejr , maximedevos@telenet.be Received: via spool by 56186-submit@debbugs.gnu.org id=B56186.165938250328930 (code B ref 56186); Mon, 01 Aug 2022 19:36:02 +0000 Received: (at 56186) by debbugs.gnu.org; 1 Aug 2022 19:35:03 +0000 Received: from localhost ([127.0.0.1]:41670 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIbBv-0007WX-8J for submit@debbugs.gnu.org; Mon, 01 Aug 2022 15:35:03 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]:47004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIbBp-0007Vp-CZ for 56186@debbugs.gnu.org; Mon, 01 Aug 2022 15:35:01 -0400 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4LxSxj4ptTz9sWl; Mon, 1 Aug 2022 21:34:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1659382489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=q+wFg5xpAmAae2ivopBLZZpyVqRWZapWxcNGIhkKXz4=; b=RHLC0gD+0cluQCvtOYwfV5JlJwm4RNiIyPN0GWkjkPjWxD/QLJvE3XYP0amyQjE33IJjUz rCaTq08mNO1hpvNYKKq02VH53JzYyd6Fm1OziVFUNzimLjY1z/BWfrXbaCEXWjJB7nsBcc tg8sqGqgRFrhiWCymugKPZUbT6574QVwPMpImhIz6O+labgoF7LQ5W5fm3rZdBrvUzfkva koZjAI7d5cQoEj949U5r0z5pB8UzEzV7rAdKzIsWJXKDLwlb/rM19B62JelzQf5JAN69JV RD4P1F7cMJKYSet4mxtJ1PdAam2Eoj0ovgomLYItifcZDaWz+fkHLNp3FcjC1Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1659382487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=q+wFg5xpAmAae2ivopBLZZpyVqRWZapWxcNGIhkKXz4=; b=UL8c1CPI8SkbwK8viFwhh2iPmAzwXQgZjrlPB85V+EEyBsVzlUllwsr0mlzS6gkJp4vF94 +8O3j5uInRMgzd+o7jL8zUCqSeMl6TyDc6mfJ8E3HIWGS52m50JwiGWIaYfr+wiTVhfWx9 x0rHRxCaV8XDHVVn3g3sBdD9MQOucBgp5uq0mpWV9dTaM+9VlgkXiXoFCcwE8JGyEo1mbA 3QX7IwCU3khRMxszDZb5Y5n24BajhJsomVjSN1jwLlClgJMszXI/W81VOr+yEFrLm6nO2q ER+GyZmjpssoNG4uTXnw1qluc3ZDHZqBI0f3s6GSwrhIpoQiyf4+RjH4hOsfJw== Date: Mon, 1 Aug 2022 15:34:39 -0400 Message-Id: <20220801193439.2471378-1-antero@mailbox.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MBO-RS-META: h4gak9psd9gzxa4c6sphzayoj8g5ftta X-MBO-RS-ID: 6d90afb91bac0985083 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Antero Mejr X-ACL-Warn: , Antero Mejr via Guix-patches From: Antero Mejr via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1659382614; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=q+wFg5xpAmAae2ivopBLZZpyVqRWZapWxcNGIhkKXz4=; b=Z31kOQ8N8prTxqdeaNc72QkL9hwYXoUbWi/DNpT7pPMUx9P68iX6f/zgEsF1CATuxI+Opi y7DtV+nzMo7KkHP51N37sJPpQ121RcClLtrlh6WFQiucdAwn/TQeXh0hc8i9aMLrh8aMTY QFL54HwcaQudIgWG1dKEOyGRIlR1rViuQ0AkrP1u0oaxfhFuPoKCuE0ZGf8KGcb7/NlJ9n PGDRQeiY+Fdenbq7JAa9VqwDLxjalekdh0cKSwiHy3s0K7iu4KSYB2Pmzxgir2/ISR88tz 2f5NklB5Ck6Ag2f7bglDUDrPAzQxuYETfttuqv3Jyza1UXZCfVFitiYfz6cjUA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1659382614; a=rsa-sha256; cv=none; b=cCTzdZA1rntnibcu9D9nVXNGDgS8iUSdPN91DobArCsIaQkECPsvltIAzdwgDmhHd+bRGd toA8mIt0qQwWIlV1vSjgU0hUJJHBYBs83xi2LBDCUgaswC3ISR7ycn3/Z0r7xXt0NYT8oJ oQtF4DwliraHlsea2ISqszrIZq1Eh7X3ee1S8y1KahQjl0yVOIPGNtOKw8dlpvAUhpaB8p 9FBLMoWoCoEjM8frbSml7dOgZi+c91gEsI1muqw+ve8jxTS4D2iJc/Czmo2EzJBHlhbCDK vjexVHYjBSZ7PCyHHxf03peAqX5wjW9brPmWP3J0d1wArQWKJHQxN5CpnbswuA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mailbox.org header.s=mail20150812 header.b=RHLC0gD+; dkim=fail ("headers rsa verify failed") header.d=mailbox.org header.s=mail20150812 header.b=UL8c1CPI; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mailbox.org header.s=mail20150812 header.b=RHLC0gD+; dkim=fail ("headers rsa verify failed") header.d=mailbox.org header.s=mail20150812 header.b=UL8c1CPI; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 1436340291 X-Spam-Score: -3.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: pBvTf5u9xG8P * gnu/packages/python-science.scm (python-deepdish): Move code patch to source snippet. --- gnu/packages/python-science.scm | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 57c9325f49..905de853e0 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -1377,19 +1377,15 @@ (define-public python-deepdish (uri (pypi-uri "deepdish" version)) (sha256 (base32 - "1wqzwh3y0mjdyba5kfbvlamn561d3afz50zi712c7klkysz3mzva")))) - (arguments - (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'dont-vendor-six - (lambda _ - (delete-file "deepdish/six.py") - (substitute* "deepdish/io/hdf5io.py" - (("from deepdish import six") "import six")) - (substitute* "deepdish/io/ls.py" - (("from deepdish import io, six, __version__") - "from deepdish import io, __version__ -import six -"))))))) + "1wqzwh3y0mjdyba5kfbvlamn561d3afz50zi712c7klkysz3mzva")) + (modules '((guix build utils))) + (snippet #~(begin (delete-file "deepdish/six.py") + (substitute* "deepdish/io/hdf5io.py" + (("from deepdish import six") "import six")) + (substitute* "deepdish/io/ls.py" + (("from deepdish import io, six, __version__") + "from deepdish import io, __version__ +import six")))))) (build-system python-build-system) (native-inputs (list python-pandas)) (propagated-inputs (list python-numpy python-scipy python-six -- 2.37.1