From patchwork Wed Jul 21 13:50:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 31554 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 9496327BC78; Wed, 21 Jul 2021 14:51:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DA02C27BC6B for ; Wed, 21 Jul 2021 14:51:47 +0100 (BST) Received: from localhost ([::1]:37144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6CdW-0005Aa-TU for patchwork@mira.cbaines.net; Wed, 21 Jul 2021 09:51:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6Ccr-00045L-5W for guix-patches@gnu.org; Wed, 21 Jul 2021 09:51:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53276) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6Ccq-000692-BW for guix-patches@gnu.org; Wed, 21 Jul 2021 09:51:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m6Ccq-00017U-Al for guix-patches@gnu.org; Wed, 21 Jul 2021 09:51:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49678] [PATCH 08/12] gnu: python-agate: Update to 1.6.3. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Jul 2021 13:51:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49678 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49678@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 49678-submit@debbugs.gnu.org id=B49678.16268754504205 (code B ref 49678); Wed, 21 Jul 2021 13:51:04 +0000 Received: (at 49678) by debbugs.gnu.org; 21 Jul 2021 13:50:50 +0000 Received: from localhost ([127.0.0.1]:36572 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6Ccb-00015d-QM for submit@debbugs.gnu.org; Wed, 21 Jul 2021 09:50:50 -0400 Received: from mout.gmx.net ([212.227.15.19]:56041) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6CcN-00013K-Oy for 49678@debbugs.gnu.org; Wed, 21 Jul 2021 09:50:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1626875430; bh=KRnslhJIDv7MBg4cZJZA+vF8OpjBdySiQA4LVuRh0hA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Irv7mHdx4QSs9wvjesZbdHVqYAPKCXxrHfUOqTR5+ldGn4dFSR3PdjPlUH7vQUNXv iOt9diqBDdVwyAwnpVFwjmgk7MT7rh1GxGSJz70YT0woLzll43JjJ0BQghh+8Pv5YS rRaROLqeoLK6rgcQ/SPPemX728jujBWGwKYBjyi4= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1Mzyya-1lCsF93ooA-00x7Q9; Wed, 21 Jul 2021 15:50:30 +0200 From: Pierre Langlois Date: Wed, 21 Jul 2021 14:50:22 +0100 Message-Id: <20210721135026.32581-8-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210721135026.32581-1-pierre.langlois@gmx.com> References: <87wnpjrddp.fsf@gmx.com> <20210721135026.32581-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:oWGZXNPJtJ/SUylF3TnBBX6gLH8kqjk2gSW9KrJpmeTCSgCyfL/ IuUw11dP1LUY5CZRu3WpTCEoXZ0/lCq40gJFCaTYdzNjoQB7TtPkqhMOjzMN8myVRRjX4rk b82v4awjpmq884RRzjDTeKq7wfLmCn0Tr7PeOPwiG4dqTPDlm9pDCMV1Y9bBacuy+TOdQGi Ig8g+5PMB1maxbVxWr57g== X-UI-Out-Filterresults: notjunk:1;V03:K0:0UcbEWc9Jy4=:p7jtFRbAMq8ght6rGhMfUH 1AGc7+6B49jUPaZ3Zi+CljLsql8GoDONyui+kVHXiSPSLLxXiNmRVtGTG4FtRwh/i+3+JHla4 31cyk1wAMNSKjahdjNRZU5sMkLg5Y7H29K32vm9Vjd91EalhwL4EYT5D2FDmOeXJAv3xnD9Vg sqGjDkXZ7Sl4LY7cBrzyznSmbjCZY7HO6HHufwJxfaxxRpqiDoSj5xc1C4CfcFAraXfcZxbXT OXAxN7RPp8EyqCRiKRrAKw5ZvDSFmH6r16joGE9qOhNHQvL7yjR+CWwUjt1KPj8wLJs+6HQJ8 hoYwfJXWC6UEGJBN60KX4FTakPHPBwpQeK8ILpnPKzgONFMH9Nb07zmqFTOSeMwMzfWbwq2EB Ai7t8bS5JJf/MgQdNRTvm1UUGEC4pUubcJeH5Tn+xbj8VPQ6bEYk+f43BLgGTzwbo6Qu8Df3Q 3/VHDaQzR2a7FJPW8sfUXscVx2xci0OuOmXJyomzPCcbpPPeJ84SKd2PgL+9S4JyMPBlkkErh 8LDV7mRestoWBMk5UUUEkH5SPXUb7twSUWVfZjnL5MSQkzb2fsZIlZw9YVz/5xGQPDJ77Qdf2 GQd7dI4s09VcHTtSLdSvRLNc9vGhL9JI4ZUdANedozDX8WIvpuR59OfLAGfBv+Izfz0uan/+X 2WcnzJE/K0TuFixT14jaVPrsiJoVqVLcvAAjUAaddDSq5r+asoKq/rxgVGd6YD9MOHWmIETKm xJh54kg6dluGh0iLSYc/5yVXua+NcN4s6x7RMp9Qcu8kipi1iGovTp4xWmPuXy/aSocZOw7wU Sp4d/GfoHOt1dxoQE5pDWdxx2jiBrbtdwR633Rnx+UoQE5KDeTbzMPQWSyG36lMF8ezxgrISr FnlFFNGyRganhs79OD3DyYL1EKjm3HLTIAZb5gKcEmkSXrTa+XUhweTAclH0zL0A6Lp88QDIN Xl1ARxD7FEkjVI/CnXlo8b82pu6neuH9u2HT57Y5F2ilgPFyEr/N8TUJVThuONPBrB+GD/sbp 4dLxWzj5V3XsvLlD4s5maduuuk/wT6RWqApNEVctrRUa6UEneb/EMXl4ANs0ICXMCwoQEvAGy qu36Orj54TI4HlBrBiwzO5zHbWj7l+TGxTCOt+lCoyqpJmZarP1blhDlg== 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/wireservice.scm (python-agate): Update to 1.6.3. Rewrite package definition to inherit from a base variable. [arguments]: Add a 'set-guixlocpath phases. --- gnu/packages/wireservice.scm | 74 +++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 30 deletions(-) -- 2.32.0 diff --git a/gnu/packages/wireservice.scm b/gnu/packages/wireservice.scm index 915e346dde..9811469082 100644 --- a/gnu/packages/wireservice.scm +++ b/gnu/packages/wireservice.scm @@ -24,7 +24,9 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages databases) #:use-module (gnu packages python-web) @@ -89,37 +91,49 @@ charts now and don't care if they're perfect."))) (define-public python-agate - (wireservice-package - (name "python-agate") - (version "1.6.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/wireservice/agate") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "077zj8xad8hsa3nqywvf7ircirmx3krxdipl8wr3dynv3l3khcpl")))) - (native-inputs - `(("python-nose" ,python-nose) - ("python-sphinx" ,python-sphinx) - ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) - ("python-csselect" ,python-cssselect) - ("python-lxml" ,python-lxml))) - (propagated-inputs - `(("python-babel" ,python-babel) - ("python-isodate" ,python-isodate) - ("python-leather" ,python-leather) - ("python-parsedatetime" ,python-parsedatetime) - ("python-pytimeparse" ,python-pytimeparse) - ("python-six" ,python-six) - ("python-slugify" ,python-slugify))) - (home-page "https://agate.rtfd.org") - (synopsis "Data analysis library") - (description "Agate is a Python data analysis library. It is an + (let ((base (wireservice-package + (name "python-agate") + (version "1.6.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wireservice/agate") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12ramldv75mlhwz2f3w7yv6k88q7bq6q7hcl7k4822gdzhp2irdn")))) + (native-inputs + `(("glibc-locales" ,glibc-locales) ; for tests + ("python-nose" ,python-nose) + ("python-sphinx" ,python-sphinx) + ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) + ("python-csselect" ,python-cssselect) + ("python-lxml" ,python-lxml))) + (propagated-inputs + `(("python-babel" ,python-babel) + ("python-isodate" ,python-isodate) + ("python-leather" ,python-leather) + ("python-parsedatetime" ,python-parsedatetime) + ("python-pytimeparse" ,python-pytimeparse) + ("python-six" ,python-six) + ("python-slugify" ,python-slugify))) + (home-page "https://agate.rtfd.org") + (synopsis "Data analysis library") + (description "Agate is a Python data analysis library. It is an alternative to numpy and pandas that solves real-world problems with readable -code. Agate was previously known as journalism."))) +code. Agate was previously known as journalism.")))) + (package (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + ;; The tests run setlocale. + (add-before 'check 'set-guixlocpath + (lambda* (#:key inputs #:allow-other-keys) + (setenv "GUIX_LOCPATH" + (string-append (assoc-ref inputs "glibc-locales") + "/lib/locale"))))))))))) (define-public python-agate-sql (wireservice-package