[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/15: gnu: python2-pandas: Fix build with Python 2.7.17.
From: |
guix-commits |
Subject: |
04/15: gnu: python2-pandas: Fix build with Python 2.7.17. |
Date: |
Sun, 15 Mar 2020 10:11:09 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 3987715415532aea14c179650bac331ec436882c
Author: Marius Bakke <address@hidden>
AuthorDate: Sun Mar 15 13:30:11 2020 +0100
gnu: python2-pandas: Fix build with Python 2.7.17.
While at it, fix the inheritance.
* gnu/packages/python-science.scm (python2-pandas): Use INHERIT instead of
PACKAGE/INHERIT.
[source](modules, snippet): New fields.
---
gnu/packages/python-science.scm | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 8dcc6e7..4b3db6d 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2016 Ben Woodcroft <address@hidden>
;;; Copyright © 2016 Hartmut Goebel <address@hidden>
;;; Copyright © 2016 Efraim Flashner <address@hidden>
-;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <address@hidden>
+;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke <address@hidden>
;;; Copyright © 2019 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2019 Maxim Cournoyer <address@hidden>
;;; Copyright © 2019 Giacomo Leidi <address@hidden>
@@ -277,12 +277,21 @@ doing practical, real world data analysis in Python.")
(define-public python2-pandas
(let ((pandas (package-with-python2
(strip-python2-variant python-pandas))))
- (package/inherit
- pandas
- (version "0.24.2")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "pandas" version))
- (sha256
- (base32
- "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag")))))))
+ (package
+ (inherit pandas)
+ (version "0.24.2")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "pandas" version))
+ (sha256
+ (base32
+ "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Adjust for renamed error message in Python 2.7.17.
Taken
+ ;; from <https://github.com/pandas-dev/pandas/pull/29294>.
+ (substitute* "pandas/io/parsers.py"
+ (("if 'NULL byte' in msg:")
+ "if 'NULL byte' in msg or 'line contains NUL' in msg:"))
+ #t)))))))
- 07/15: gnu: python-joblib: Update to 0.14.1., (continued)
- 07/15: gnu: python-joblib: Update to 0.14.1., guix-commits, 2020/03/15
- 06/15: gnu: python-networkx: Update to 2.4., guix-commits, 2020/03/15
- 01/15: gnu: python-pyside: Update to 5.12.6., guix-commits, 2020/03/15
- 05/15: gnu: python-pyrsistent: Update to 0.15.7., guix-commits, 2020/03/15
- 11/15: gnu: python-sqlalchemy: Update to 1.3.15., guix-commits, 2020/03/15
- 12/15: gnu: python-psycopg2: Update to 2.8.4., guix-commits, 2020/03/15
- 03/15: gnu: python2-scikit-learn: Downgrade to 0.20.4., guix-commits, 2020/03/15
- 10/15: gnu: python-parso: Update to 0.6.2., guix-commits, 2020/03/15
- 08/15: gnu: Update python-seaborn to 0.10.0, python2-seaborn to 0.9.1., guix-commits, 2020/03/15
- 09/15: gnu: Update python-natsort to 7.0.1, python2-natsort to 6.2.1., guix-commits, 2020/03/15
- 04/15: gnu: python2-pandas: Fix build with Python 2.7.17.,
guix-commits <=
- 14/15: gnu: python-editor: Update to 1.0.4., guix-commits, 2020/03/15
- 13/15: gnu: python-jedi: Update to 0.16., guix-commits, 2020/03/15
- 15/15: gnu: python-alembic: Update to 1.4.1., guix-commits, 2020/03/15