unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / Atom feed
* [bug#44017] [PATCH] Fix python2-pandas build failure
@ 2020-10-15 16:54 Bonface M. K.
  2020-10-15 16:59 ` Bonface M. K.
  0 siblings, 1 reply; 4+ messages in thread
From: Bonface M. K. @ 2020-10-15 16:54 UTC (permalink / raw)
  To: 44017

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

Will send a patch series here.
-- 
Bonface M. K. <https://www.bonfacemunyoki.com> 
Chief Emacs Mchochezi / Rieng ya software sare
Curator of <https://upbookclub.com> / Twitter: @BonfaceKilz
GPG Key: D4F09EB110177E03C28E2FE1F5BBAE1E0392253F

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 869 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#44017] [PATCH] Fix python2-pandas build failure
  2020-10-15 16:54 [bug#44017] [PATCH] Fix python2-pandas build failure Bonface M. K.
@ 2020-10-15 16:59 ` Bonface M. K.
  2020-10-15 17:36   ` Xavier lenato
  2020-10-18 11:38   ` bug#44017: " Efraim Flashner
  0 siblings, 2 replies; 4+ messages in thread
From: Bonface M. K. @ 2020-10-15 16:59 UTC (permalink / raw)
  To: 44017


[-- Attachment #1.1: Type: text/plain, Size: 79 bytes --]


Find attached patches that address a build failure
regarding python2-pandas.


[-- Attachment #1.2: 0001-gnu-Add-python2-openpyxl.patch --]
[-- Type: text/x-patch, Size: 1757 bytes --]

From ef440e6fe40d707050d4fd057e61535a4e54f3c6 Mon Sep 17 00:00:00 2001
From: BonfaceKilz <bonfacemunyoki@gmail.com>
Date: Thu, 15 Oct 2020 19:39:38 +0300
Subject: [PATCH 1/2] gnu: Add python2-openpyxl.

* gnu/packages/python-xyz.scm (python2-openpyxl): New package.
---
 gnu/packages/python-xyz.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 56c7bb84ab..000061f0a3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -85,6 +85,7 @@
 ;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
 ;;; Copyright © 2020 Hendursaga <hendursaga@yahoo.com>
 ;;; Copyright © 2020 Malte Frank Gerdes <malte.f.gerdes@gmail.com>
+;;; Copyright © 2020 Kilyungi Bonface Munyoki <bonfacemunyoki@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1666,6 +1667,23 @@ XLTX and XLTM file formats that are defined by the Office Open XML (OOXML)
 standard.")
     (license license:expat)))
 
+(define-public python2-openpyxl
+  (let ((base (package-with-python2
+               (strip-python2-variant python-openpyxl))))
+    (package (inherit base)
+             ;; This is the latest version that has python2 support
+             (version "2.6.4")
+             (arguments
+              ;; Has no tests
+              '(#:tests? #f))
+             (source
+              (origin
+                (method url-fetch)
+                (uri (pypi-uri "openpyxl" version))
+                (sha256
+                 (base32
+                  "1qzjj8nwj4dn0mhq1j64f136afiqqb81lvqiikipz3g1g0b80lqx")))))))
+
 (define-public python-eventlet
   (package
     (name "python-eventlet")
-- 
2.28.0


[-- Attachment #1.3: 0002-gnu-python2-pandas-Fix-build-by-using-python2-openpy.patch --]
[-- Type: text/x-patch, Size: 1860 bytes --]

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


[-- Attachment #1.4: Type: text/plain, Size: 216 bytes --]


-- 
Bonface M. K. <https://www.bonfacemunyoki.com> 
Chief Emacs Mchochezi / Rieng ya software sare
Curator of <https://upbookclub.com> / Twitter: @BonfaceKilz
GPG Key: D4F09EB110177E03C28E2FE1F5BBAE1E0392253F

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 869 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#44017] [PATCH] Fix python2-pandas build failure
  2020-10-15 16:59 ` Bonface M. K.
@ 2020-10-15 17:36   ` Xavier lenato
  2020-10-18 11:38   ` bug#44017: " Efraim Flashner
  1 sibling, 0 replies; 4+ messages in thread
From: Xavier lenato @ 2020-10-15 17:36 UTC (permalink / raw)
  To: Bonface M. K.; +Cc: 44017

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!




^ permalink raw reply	[flat|nested] 4+ messages in thread

* bug#44017: [PATCH] Fix python2-pandas build failure
  2020-10-15 16:59 ` Bonface M. K.
  2020-10-15 17:36   ` Xavier lenato
@ 2020-10-18 11:38   ` Efraim Flashner
  1 sibling, 0 replies; 4+ messages in thread
From: Efraim Flashner @ 2020-10-18 11:38 UTC (permalink / raw)
  To: Bonface M. K.; +Cc: 44017-done

[-- Attachment #1: Type: text/plain, Size: 390 bytes --]

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!


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-10-18 11:39 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-15 16:54 [bug#44017] [PATCH] Fix python2-pandas build failure Bonface M. K.
2020-10-15 16:59 ` Bonface M. K.
2020-10-15 17:36   ` Xavier lenato
2020-10-18 11:38   ` bug#44017: " Efraim Flashner

unofficial mirror of guix-patches@gnu.org 

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/guix-patches/1 guix-patches/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 guix-patches guix-patches/ https://yhetil.org/guix-patches \
		guix-patches@gnu.org
	public-inbox-index guix-patches

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://news.yhetil.org/yhetil.gnu.guix.patches


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git