From patchwork Mon Aug 1 19:34:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antero Mejr X-Patchwork-Id: 41084 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 360AD27BBEA; Mon, 1 Aug 2022 20:36:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 E784027BBE9 for ; Mon, 1 Aug 2022 20:36:42 +0100 (BST) Received: from localhost ([::1]:39510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oIbDV-0005qW-U1 for patchwork@mira.cbaines.net; Mon, 01 Aug 2022 15:36:41 -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 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Antero Mejr X-ACL-Warn: , Antero Mejr via Guix-patches X-Patchwork-Original-From: Antero Mejr via Guix-patches via From: Antero Mejr X-getmail-retrieved-from-mailbox: Patches * 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