From patchwork Sat Mar 16 03:48:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 1469 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 4F57D16DB1; Sat, 16 Mar 2019 04:04:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id B82C116DB1 for ; Sat, 16 Mar 2019 04:04:09 +0000 (GMT) Received: from localhost ([127.0.0.1]:36895 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h50YL-0006fp-2o for patchwork@mira.cbaines.net; Sat, 16 Mar 2019 00:04:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h50YH-0006fj-U4 for guix-patches@gnu.org; Sat, 16 Mar 2019 00:04:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h50YF-0005iy-LP for guix-patches@gnu.org; Sat, 16 Mar 2019 00:04:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60416) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h50YF-0005iU-8U for guix-patches@gnu.org; Sat, 16 Mar 2019 00:04:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h50YE-00075d-UZ for guix-patches@gnu.org; Sat, 16 Mar 2019 00:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#34882] [PATCH] Update to Pandas, enable Excel writer support Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Mar 2019 04:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34882@debbugs.gnu.org X-Debbugs-Original-To: guix-patches Received: via spool by submit@debbugs.gnu.org id=B.155270903227232 (code B ref -1); Sat, 16 Mar 2019 04:04:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Mar 2019 04:03:52 +0000 Received: from localhost ([127.0.0.1]:45727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h50Xw-000752-PG for submit@debbugs.gnu.org; Sat, 16 Mar 2019 00:03:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59277) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h50Xn-00074h-Rt for submit@debbugs.gnu.org; Sat, 16 Mar 2019 00:03:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:43384) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h50Xi-0005Ul-Dx for submit@debbugs.gnu.org; Sat, 16 Mar 2019 00:03:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h50Xf-0006Hj-9x for guix-patches@gnu.org; Sat, 16 Mar 2019 00:03:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h50JM-0005wF-KF for guix-patches@gnu.org; Fri, 15 Mar 2019 23:48:44 -0400 Received: from mail-qk1-x72a.google.com ([2607:f8b0:4864:20::72a]:34876) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h50JJ-0005rC-3z for guix-patches@gnu.org; Fri, 15 Mar 2019 23:48:39 -0400 Received: by mail-qk1-x72a.google.com with SMTP id z13so6768003qki.2 for ; Fri, 15 Mar 2019 20:48:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=VkhjKvWVtd12ZkFDiPuOC5n1Stl7J/ZtDaH0EYaq/48=; b=d9bqY/F5Qv1u4LL+g4V1tIm9WKIcgeYJS1r127d/gQP4qHwkBHJ7pfX8xW94T1GWMG jQZCCoGXe43wc3sh9kd7k76iHwozmT4r/bZzVz5SdZ4str9DPyeEm2W4DMEOyFqwIsKX 24sJdWwD5xM2nHsXwATceuHn98rtElxDO5ClwG684iqs1v4F42tzmlNQ2SW8Y+tv/yHM CcnMLwf3GRhe8UgGYRDQnqkP8nA4lQYlAH9jefPbwEbM1yWUM8WTwbjXt4Xg/660jyWA OYe1V5qsLo3+9rYqnGGp+aMcoAdXwnQDv+NZ429csNL+womW4vO4OPKjN3SC5xLURVrK mJtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=VkhjKvWVtd12ZkFDiPuOC5n1Stl7J/ZtDaH0EYaq/48=; b=jRy4yXiVI0pmsMFp1cLYovm4mffLNMqFWrK84wG1T+xaOIzmvHYl+cL5hWzUAfs/0B C+jaCDWb3/EyVlzhwcDjwIYZJEHvzuUpXqegzxW1McKqUNY0TkOn7Ypn5GIlg3UPWe6W fxJPw1HtflgVhp0RO3AskK0GiFgiIAhi5OI5hVQ9eQSAD7sUmr3dSGg8xFpAR6tm6i8V 7eV1P3ArK9nL75ezb2jOiMlUo3QkGlIsezVL98tdEvnhoqLaDy6kylMfE/rRrB6sGJHZ InTN6G2FSrgLUc3s1Ptqc+CISbhttfOgsuqlyQST6uFwsIVrCN2zy+esoXGXEuimqOs9 f7Jg== X-Gm-Message-State: APjAAAXwWSK+9TO57dndL3f+I0QxYaO0m8/UcoLcEvSAh1FxDmW7u14L QtGU+fMn1jFsxNLRRkjfWEw2HfX9 X-Google-Smtp-Source: APXvYqz0lQze8muXWP+kB6QUwPwV3coZ1S1+xs8jbmb21DHe//j7154ZkeL1x9tNG4OkrPOsKsgVJA== X-Received: by 2002:a37:4bc1:: with SMTP id y184mr54702qka.169.1552708110231; Fri, 15 Mar 2019 20:48:30 -0700 (PDT) Received: from kwak ([216.154.27.64]) by smtp.gmail.com with ESMTPSA id t49sm2637996qte.86.2019.03.15.20.48.28 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Mar 2019 20:48:29 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 15 Mar 2019 23:48:27 -0400 Message-ID: <87k1gzqy2c.fsf@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 From ad1f0efe4a5c3d28ee9d7e2e5da275721af9e172 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 9 Feb 2019 00:25:51 -0500 Subject: [PATCH 5/5] gnu: python-pandas: Update to 0.24.2. * gnu/packages/python-xyz.scm (python-pandas): Update to 0.24.2. [phases]{patch-which}: Add phase. [inputs]: Add WHICH. --- gnu/packages/python-xyz.scm | 65 ++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 321c881f4d..bbf1403758 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1014,56 +1014,67 @@ human-friendly syntax.") (define-public python-pandas (package (name "python-pandas") - (version "0.23.4") + (version "0.24.2") (source (origin (method url-fetch) (uri (pypi-uri "pandas" version)) (sha256 - (base32 "1x54pd7hr3y7qahx6b5bf2wzj54xvl8r3s1h4pl254pnmi3wl92v")))) + (base32 "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag")))) (build-system python-build-system) (arguments `(#:modules ((guix build utils) (guix build python-build-system) (ice-9 ftw) (srfi srfi-26)) - #:phases (modify-phases %standard-phases - (replace 'check - (lambda _ - (let ((build-directory - (string-append - (getcwd) "/build/" - (car (scandir "build" - (cut string-prefix? "lib." <>)))))) - ;; Disable the "strict data files" option which causes - ;; the build to error out if required data files are not - ;; available (as is the case with PyPI archives). - (substitute* "setup.cfg" - (("addopts = --strict-data-files") "addopts = ")) - (with-directory-excursion build-directory - ;; Delete tests that require "moto" which is not yet in Guix. - (for-each delete-file - '("pandas/tests/io/conftest.py" - "pandas/tests/io/json/test_compression.py" - "pandas/tests/io/parser/test_network.py" - "pandas/tests/io/test_parquet.py")) - (invoke "pytest" "-vv" "pandas" "--skip-slow" - "--skip-network" "-k" - ;; XXX: Due to the deleted tests above. - "not test_read_s3_jsonl")))))))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-which + (lambda* (#:key inputs #:allow-other-keys) + (let ((which (assoc-ref inputs "which"))) + (substitute* "pandas/io/clipboard/__init__.py" + (("^CHECK_CMD = .*") + (string-append "CHECK_CMD = \"" which "\"\n")))) + #t)) + (replace 'check + (lambda _ + (let ((build-directory + (string-append + (getcwd) "/build/" + (car (scandir "build" + (cut string-prefix? "lib." <>)))))) + ;; Disable the "strict data files" option which causes + ;; the build to error out if required data files are not + ;; available (as is the case with PyPI archives). + (substitute* "setup.cfg" + (("addopts = --strict-data-files") "addopts = ")) + (with-directory-excursion build-directory + ;; Delete tests that require "moto" which is not yet in Guix. + (for-each delete-file + '("pandas/tests/io/conftest.py" + "pandas/tests/io/json/test_compression.py" + "pandas/tests/io/parser/test_network.py" + "pandas/tests/io/test_parquet.py")) + (invoke "pytest" "-vv" "pandas" "--skip-slow" + "--skip-network" "-k" + ;; XXX: Due to the deleted tests above. + "not test_read_s3_jsonl")))))))) (propagated-inputs `(("python-numpy" ,python-numpy) ("python-openpyxl" ,python-openpyxl) ("python-pytz" ,python-pytz) ("python-dateutil" ,python-dateutil) ("python-xlrd" ,python-xlrd))) + (inputs + `(("which" ,which))) (native-inputs `(("python-cython" ,python-cython) ("python-beautifulsoup4" ,python-beautifulsoup4) ("python-lxml" ,python-lxml) ("python-html5lib" ,python-html5lib) ("python-nose" ,python-nose) - ("python-pytest" ,python-pytest))) + ("python-pytest" ,python-pytest) + ("python-pytest-mock" ,python-pytest-mock))) (home-page "https://pandas.pydata.org") (synopsis "Data structures for data analysis, time series, and statistics") (description -- 2.20.1