diff mbox series

[bug#44017] Fix python2-pandas build failure

Message ID 867drr8lxu.fsf@gmail.com
State Accepted
Headers show
Series [bug#44017] Fix python2-pandas build failure | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job

Commit Message

BonfaceKilz Oct. 15, 2020, 4:59 p.m. UTC
Find attached patches that address a build failure
regarding python2-pandas.

Comments

Xavier lenato Oct. 15, 2020, 5:36 p.m. UTC | #1
On Thu, Oct 15, 2020 at 7:59 PM Bonface M. K. <bonfacemunyoki@gmail.com> wrote:
>
>
> Find attached patches that address a build failure
> regarding python2-pandas.
>
Got it, thanks!
Efraim Flashner Oct. 18, 2020, 11:38 a.m. UTC | #2
I pushed the first patch and also modified python-openpyxl so that it
knows where to find the special python2 variant. With that we don't need
the second patch.

Thanks!
diff mbox series

Patch

From 4081475706ef75c67d705501077a19d74b72d763 Mon Sep 17 00:00:00 2001
From: BonfaceKilz <bonfacemunyoki@gmail.com>
Date: Thu, 15 Oct 2020 19:42:53 +0300
Subject: [PATCH 2/2] gnu: python2-pandas: Fix build by using
 python2-openpyxl-2.6.4

* gnu/packages/python-science.scm: Import srfi-1.
(python-pandas)[propagated-inputs]: Use python2-openpyxyl
---
 gnu/packages/python-science.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 101c8fb640..2c47177a4a 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -10,6 +10,7 @@ 
 ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2020 Kilyungi Bonface Munyoki <bonfacemunyoki@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -45,7 +46,8 @@ 
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
-  #:use-module (guix build-system python))
+  #:use-module (guix build-system python)
+  #:use-module (srfi srfi-1))
 
 (define-public python-scipy
   (package
@@ -407,7 +409,11 @@  doing practical, real world data analysis in Python.")
                     (substitute* "pandas/io/parsers.py"
                       (("if 'NULL byte' in msg:")
                        "if 'NULL byte' in msg or 'line contains NUL' in msg:"))
-                    #t)))))))
+                    #t))))
+      (propagated-inputs
+       `(("python-openpyxl" ,python2-openpyxl)
+         ,@(alist-delete "python-openpyxl"
+                        (package-propagated-inputs pandas)))))))
 
 (define-public python-bottleneck
   (package
-- 
2.28.0